Rename KApplication to TDEApplication to avoid conflicts with KDE4

14 files changed, 16 insertions, 16 deletions

diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 85ce92ed7..fa9e9b528 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -43,7 +43,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   // Create a new dialog with the same name as the above checking code.
   KAutoConfigDialog *dialog = new KAutoConfigDialog(0, "settings");
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index bb3bd3947..183b4f267 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   ExamplePrefsBase *prefs = ExamplePrefsBase::self();
 
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index 442914508..eae6d49a6 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -208,7 +208,7 @@ namespace Komposer
     void slotShutdownTimeout();
 
     /**
-     * Common entry point to deref() the KApplication. Used both by the clean
+     * Common entry point to deref() the TDEApplication. Used both by the clean
      * shutdown and the timeout condition of slotShutdownTimeout()
      */
     void slotShutdownDone();
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 2d394a228..80bf8fc95 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -42,7 +42,7 @@ int main( int argc, char** argv )
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     Q_UNUSED( args );
diff --git a/libtdepim/komposer/core/tests/testkomposer.cpp b/libtdepim/komposer/core/tests/testkomposer.cpp
index 31462a7e3..efacb460f 100644
--- a/libtdepim/komposer/core/tests/testkomposer.cpp
+++ b/libtdepim/komposer/core/tests/testkomposer.cpp
@@ -8,7 +8,7 @@
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   Komposer::Core *core = new Komposer::Core();
   app.setMainWidget( core );
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a9b06171d..b883997f3 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -45,7 +45,7 @@ void TestManager::slotPluginLoaded( Plugin *plugin )
 int main( int argc, char **argv )
 {
   TDECmdLineArgs::init( argc, argv, "test", "test", "test", "0.1" );
-  KApplication app;
+  TDEApplication app;
 
   TestManager manager( &app );
 
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index f61b633ca..2a2347edc 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -224,7 +224,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption,
 
   TQToolButton *clearButton = new TQToolButton( page );
   clearButton->setIconSet( KGlobal::iconLoader()->loadIconSet(
-              KApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
+              TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", KIcon::Small, 0 ) );
   filterEdit = new KLineEdit(page);
   TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page);
   connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) );
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index 201a1128d..b02998397 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* argv[])
   KAboutData aboutData("testaddresseelineedit","Test AddresseeLineEdit","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   KPIM::AddresseeLineEdit *kale = new KPIM::AddresseeLineEdit(0);
   kale->resize( 400, 20 );
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 7f1ae17d4..af5a1dd4f 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
   KAboutData aboutData( "testaddresseeseletor", "Test AddresseeSelector", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   KPIM::AddresseeEmailSelection selection;
 
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 97f8408ab..612aca177 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -56,7 +56,7 @@ int main(int argc,char **argv)
   KAboutData aboutData( "testdateedit", "Test KDateEdit", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   DateEdit dateEdit;
   app.setMainWidget( &dateEdit );
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index ae27b0547..7572c8478 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -46,9 +46,9 @@ int main(int argc, char *argv[])
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KApplication::disableAutoDcopRegistration();
+    TDEApplication::disableAutoDcopRegistration();
     TDECmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);
-    KApplication app( false, false );
+    TDEApplication app( false, false );
 
     TestDistrList test;
     test.setup();
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index eea14019e..539508253 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -32,7 +32,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, "testkincidencechooser", 0,
                       "KIncidenceChooserTest", "1.0",
                       "kincidencechooser test app" );
-  KApplication app;
+  TDEApplication app;
   KIncidenceChooser *chooser = new KIncidenceChooser();
 
   Event event;
diff --git a/libtdepim/tests/testlinklocator.cpp b/libtdepim/tests/testlinklocator.cpp
index 1744904dd..0ed3f1f95 100644
--- a/libtdepim/tests/testlinklocator.cpp
+++ b/libtdepim/tests/testlinklocator.cpp
@@ -59,9 +59,9 @@ static bool checkGetEmailAddress( const TQString & input,
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init( argc, argv, "testlinklocator", 0, 0, 0, 0 );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   // empty input
   checkGetEmailAddress( TQString(), 0, TQString(), true );
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 236636995..03ee4ac43 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -87,7 +87,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();