From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/partcontroller.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/partcontroller.cpp') diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 05ffc087..0bd2e404 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -277,7 +277,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } // Make sure the URL exists - if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) ) + if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) ) { bool done = false; @@ -289,7 +289,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, relURL.addPath( url.url() ); kdDebug() << k_funcinfo << "Looking for file in project dir: " << API::getInstance()->project()->projectDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl; - if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) { + if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) { url = relURL; done = true; } @@ -297,7 +297,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, KURL relURL(API::getInstance()->project()->buildDirectory()); relURL.addPath( url.url() ); kdDebug() << k_funcinfo << "Looking for file in build dir: " << API::getInstance()->project()->buildDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl; - if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) { + if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) { url = relURL; done = true; } @@ -307,7 +307,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if (!done) { url = findURLInProject(url); - if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) ) + if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) ) // See if this url is relative to the current project's directory url = API::getInstance()->project()->projectDirectory() + "/" + url.path(); @@ -316,7 +316,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } } - if ( !done && ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) )) + if ( !done && ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) )) { // Not found - prompt the user to find it? kdDebug(9000) << "cannot find URL: " << url.url() << endl; @@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = true; } - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); // we don't trust KDE with designer files, let's handle it ourselves @@ -547,7 +547,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { if ( dlg.always_open_as_text->isChecked() ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); texttypeslist << MimeType->name(); @@ -1282,7 +1282,7 @@ void PartController::slotOpenFile() if ( DefaultEncoding.isEmpty() ) { // have a peek at katepart's settings: - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup("Kate Document Defaults"); DefaultEncoding = config->readEntry("Encoding", TQString() ); } @@ -1460,7 +1460,7 @@ bool PartController::isDirty( KURL const & url ) bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Editor"); TQString dirtyAction = config->readEntry( "DirtyAction" ); -- cgit v1.2.1