Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 8 insertions, 8 deletions

diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 8eb998915..e11ca2ab1 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -44,7 +44,7 @@ int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   Kleo::CryptoConfig * config = new QGpgMECryptoConfig();
 
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index c1ac90b96..35a350ad3 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -121,7 +121,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
   TDECmdLineArgs::init( &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   Kleo::GnuPGProcessBase gpg;
   for ( int i = 1 ; i < argc ; ++i )
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index ba07792f8..92aaf9b42 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -102,7 +102,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   testSign();
 }
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index a17404fa3..4ec5c29ea 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -148,7 +148,7 @@ int main( int argc, char** argv ) {
   }
   KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   KeyGenerator * keygen = new KeyGenerator( 0, "KeyGenerator top-level" );
   app.setMainWidget( keygen );
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 1947d1d66..904671fbe 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -132,7 +132,7 @@ int main( int argc, char** argv ) {
 
   KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   CertListView * clv = new CertListView( 0, "CertListView top-level" );
   app.setMainWidget( clv );
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index 1af2184a1..eacbb5f63 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -46,7 +46,7 @@
 int main( int argc, char ** argv ) {
   KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app;
+  TDEApplication app;
 
   KGlobal::iconLoader()->addAppDir( "libkleopatra" );
 
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 15eacfec7..469d18952 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -55,7 +55,7 @@ int main( int argc, char **argv )
 
   KAboutData aboutData( "test_verify", "verify job test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   const TQString sigFileName = TDESRCDIR "/test.data.sig";
   const TQString dataFileName = TDESRCDIR "/test.data";
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 640f2e967..5bd858ffd 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -396,7 +396,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
   le->setText( initialQuery );
   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 ) );
   hlay->addWidget( clearButton );
   hlay->addWidget( new TQLabel( le, i18n("&Search for:"), page ) );
   hlay->addWidget( le, 1 );