Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 7 insertions, 7 deletions

diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index e11ca2ab1..10e750c7f 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -42,7 +42,7 @@ using namespace std;
 
 int main( int argc, char** argv ) {
 
-  KAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
+  TDEAboutData aboutData( "test_cryptoconfig", "CryptoConfig Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app( false, false );
 
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 35a350ad3..dd94b8d6e 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -119,7 +119,7 @@ int main( int argc, char** argv ) {
     kdDebug() << "Need at least two arguments" << endl;
     return 1;
   }
-  KAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
+  TDEAboutData aboutData( "test_gnupgprocessbase", "GnuPGProcessBase Test", "0.1" );
   TDECmdLineArgs::init( &aboutData );
   TDEApplication app;
 
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index 92aaf9b42..5c2c8606d 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -100,7 +100,7 @@ int main( int argc, char** argv ) {
     protocol = argv[1];
     argc = 1; // hide from KDE
   }
-  KAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
+  TDEAboutData aboutData( "test_jobs", "Signing Job Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index 4ec5c29ea..e0406e801 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -146,7 +146,7 @@ int main( int argc, char** argv ) {
     protocol = argv[1];
     argc = 1; // hide from KDE
   }
-  KAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
+  TDEAboutData aboutData( "test_keygen", "KeyGenerationJob Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 904671fbe..78d09bc20 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -130,7 +130,7 @@ void CertListView::slotStart() {
 
 int main( int argc, char** argv ) {
 
-  KAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
+  TDEAboutData aboutData( "test_keylister", "KeyLister Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index eacbb5f63..e74c18d84 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -44,7 +44,7 @@
 #include <vector>
 
 int main( int argc, char ** argv ) {
-  KAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
+  TDEAboutData aboutData( "test_keyselectiondialog", "KeySelectionDialog Test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 469d18952..85a1b32f1 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -53,7 +53,7 @@ int main( int argc, char **argv )
   setenv("LC_ALL", "C", 1);
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-unit-test" ), 1);
 
-  KAboutData aboutData( "test_verify", "verify job test", "0.1" );
+  TDEAboutData aboutData( "test_verify", "verify job test", "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app( false, false );