From d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:23:08 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 libtdepim/tests/testaddresseelineedit.cpp | 2 +-
 libtdepim/tests/testaddresseeselector.cpp | 2 +-
 libtdepim/tests/testdateedit.cpp          | 2 +-
 libtdepim/tests/testdistrlist.cpp         | 4 ++--
 libtdepim/tests/testkincidencechooser.cpp | 2 +-
 libtdepim/tests/testlinklocator.cpp       | 4 ++--
 libtdepim/tests/testwizard.cpp            | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libtdepim/tests')

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();
 
-- 
cgit v1.2.1