Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

6 files changed, 15 insertions, 15 deletions

diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h
index 6f34ed4c..c7548b59 100644
--- a/vcs/cvsservice/bufferedstringreader.h
+++ b/vcs/cvsservice/bufferedstringreader.h
@@ -15,7 +15,7 @@
 #include <tqstringlist.h>
 
 class CvsServicePart;
-class KConfig;
+class TDEConfig;
 class KDevProject;
 
 /* This class helps when we have to collect a string list from a text
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index be20d977..07745c5c 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -89,7 +89,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
 	// Grab the entries from $HOME/.cvspass
 	fetchUserCvsRepositories();
 	// And suggest to use the default projects dir set in KDevelop's preferences
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
     TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 	setWorkDir( defaultProjectsDir );
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 43add3be..723ad9d5 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -54,7 +54,7 @@ CvsOptions::CvsOptions()
 {
     kdDebug( 9006 ) << " **** CvsOptions instance CREATED!" << endl;
     // We share some configuration data with cvsservice
-    m_serviceConfig = new KConfig( "cvsservicerc" );
+    m_serviceConfig = new TDEConfig( "cvsservicerc" );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h
index 857b47e4..c4daf301 100644
--- a/vcs/cvsservice/cvsoptions.h
+++ b/vcs/cvsservice/cvsoptions.h
@@ -16,7 +16,7 @@
 #include <tqdom.h>
 
 class CvsServicePart;
-class KConfig;
+class TDEConfig;
 class KDevProject;
 
 /* This class represents the command line options for the used cvs commands.
@@ -92,7 +92,7 @@ private:
     unsigned int m_compressionLevel;
     unsigned int m_contextLines;
     //! So we can access cvssservice configuration (repositories first of all)
-    KConfig *m_serviceConfig;
+    TDEConfig *m_serviceConfig;
 
     static CvsOptions *m_instance;
     CvsOptions();
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 8d7e9641..d4a2dc55 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -41,7 +41,7 @@ TQStringList KDiffTextEdit::extPartsTranslated;
 
 KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup( "Diff" );
   _highlight = config->readBoolEntry( "Highlight", true );
 
@@ -50,7 +50,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit(
 
 KDiffTextEdit::~KDiffTextEdit()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
 
   config->setGroup( "Diff" );
   config->writeEntry( "Highlight", _highlight );
@@ -248,7 +248,7 @@ void DiffWidget::slotAppend( const TQString& str )
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba )
+void DiffWidget::slotAppend( TDEIO::Job*, const TQByteArray& ba )
 {
   slotAppend( TQString( ba ) );
 }
@@ -297,13 +297,13 @@ void DiffWidget::openURL( const KURL& url )
   if ( job )
     job->kill();
 
-  KIO::TransferJob* job = KIO::get( url );
+  TDEIO::TransferJob* job = TDEIO::get( url );
   if ( !job )
     return;
 
-  connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )),
-           this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
+  connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )),
+           this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
            this, TQT_SLOT(slotFinished()) );
 }
 
diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h
index 25594f40..4bab139e 100644
--- a/vcs/cvsservice/diffwidget.h
+++ b/vcs/cvsservice/diffwidget.h
@@ -20,7 +20,7 @@
 
 class KTempFile;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -79,7 +79,7 @@ private slots:
     /** appends a piece of "diff" */
     void slotAppend( const TQString& str );
     /** overloaded for convenience */
-    void slotAppend( KIO::Job*, const TQByteArray& ba );
+    void slotAppend( TDEIO::Job*, const TQByteArray& ba );
     /** call this when the whole "diff" has been sent.
      *  Don't call slotAppend afterwards!
      */
@@ -97,7 +97,7 @@ private:
 
 private:
     KDiffTextEdit* te;
-    KIO::Job* job;
+    TDEIO::Job* job;
     KParts::ReadOnlyPart* extPart;
     KTempFile* tempFile;
 };