From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- libtdepim/tests/testdistrlist.cpp | 4 ++-- libtdepim/tests/testwizard.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libtdepim/tests') diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index 7572c847..b6962d51 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 4e3dec28..1e404165 100644 --- a/libtdepim/tests/testwizard.cpp +++ b/libtdepim/tests/testwizard.cpp @@ -32,11 +32,11 @@ #include #include -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 ); -- cgit v1.2.3