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

2 files changed, 5 insertions, 5 deletions

diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 7572c8478..b6962d511 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -152,8 +152,8 @@ void TestDistrList::cleanup()
 
     TQString tdehome = TQFile::decodeName( getenv("TDEHOME") );
     KURL urltdehome; urltdehome.setPath( tdehome );
-    // don't use KIO::NetAccess here since it needs X
-    // KIO::NetAccess::del( urltdehome, 0 )i;
+    // don't use TDEIO::NetAccess here since it needs X
+    // TDEIO::NetAccess::del( urltdehome, 0 )i;
     assert( removeDirAndContentsRecursively( tdehome ) );
 }
 
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 4e3dec288..1e404165e 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -32,11 +32,11 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-class TestConfigWizard : public KConfigWizard
+class TestConfigWizard : public TDEConfigWizard
 {
   public:
     TestConfigWizard() :
-      KConfigWizard( new KConfigPropagator( MyConfig::self(),
+      TDEConfigWizard( new TDEConfigPropagator( MyConfig::self(),
                                             "propagator_test.kcfg" ) )
     {
       TQFrame *page = createWizardPage( "My Wizard Page" );
@@ -83,7 +83,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  TDEAboutData aboutData("testwizard","Test KConfigWizard","0.1");
+  TDEAboutData aboutData("testwizard","Test TDEConfigWizard","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );