Rename KInstance and KAboutData to avoid conflicts with KDE4

9 files changed, 11 insertions, 11 deletions

diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 6c5e135dc..53bb0f9f3 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -28,7 +28,7 @@
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kapptest", "kapptest", "version");
+   TDEAboutData about("kapptest", "kapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
 
    TDEApplication a;
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 086cae304..62b14aa7a 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -32,8 +32,8 @@ int main(int argc, char **argv) {
 	TQDate date;
 	TQString calType, option;
 	
-        KAboutData aboutData( "kcalendartest", "KCalendarTest" ,
-                        "0.1", description, KAboutData::License_GPL,
+        TDEAboutData aboutData( "kcalendartest", "KCalendarTest" ,
+                        "0.1", description, TDEAboutData::License_GPL,
                         "(c) 2002, Carlos Moro", 0, 0,
                         "cfmoro@correo.uniovi.es");
   	aboutData.addAuthor("Carlos Moro",0, "cfmoro@correo.uniovi.es");
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index ee49127ea..cc85b4554 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -26,7 +26,7 @@ public:
     kdDebug(2 == 2) << "this is right " << perror << endl;
     kdDebug() << "Before instance creation" << endl;
     kdDebug(1202) << "Before instance creation" << endl;
-    KInstance i("kdebugtest");
+    TDEInstance i("kdebugtest");
     kdDebug(1) << "kDebugInfo with inexisting area number" << endl;
     kdDebug(1202) << "This number has a value of " << 5 << endl;
     // kdDebug() << "This number should come out as appname " << 5 << " " << "test" << endl;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index ca5afe0eb..c5640dc09 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -410,7 +410,7 @@ int TestApp::newInstance(TQValueList<TQCString> /*params*/)
 
 int main(int argc, char **argv)
 {
-  KAboutData about("socktest2", "SockTest", "1.0");
+  TDEAboutData about("socktest2", "SockTest", "1.0");
   TDECmdLineArgs::init(argc, argv, &about);
   KUniqueApplication::addCmdLineOptions();
 
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index c599c4570..48420acfc 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -57,7 +57,7 @@ bool check(TQString txt, TQString a, TQString b)
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("socktest", "SockTest", "version");
+   TDEAboutData about("socktest", "SockTest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
    TDEApplication::addCmdLineOptions();
 
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 650cc0512..729c88bb6 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -5,7 +5,7 @@
 
 int main(int argc, char *argv[]) 
 {
-  KInstance instance("ktimezonestest");
+  TDEInstance instance("ktimezonestest");
 
   if ((argc==2) && (strcmp(argv[1], "local")==0))
   {
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index f696711a5..053956715 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -43,7 +43,7 @@ TestApp::newInstance( )
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kuniqueapptest", "kuniqueapptest", "version");
+   TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
    KUniqueApplication::addCmdLineOptions();
 
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index ce30a9642..5cccaa3dc 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -27,7 +27,7 @@
 int
 main(int argc, char *argv[])
 {
-   KAboutData about("kapptest", "kapptest", "version");
+   TDEAboutData about("kapptest", "kapptest", "version");
    TDECmdLineArgs::init(argc, argv, &about);
 
    TDEApplication a;
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 56a3e943d..fd73923f2 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
   {
     tqDebug("argv[%d] = %s", i, argv[i]);
   }
-  KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
-    "1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
+  TDEAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
+    "1.0", I18N_NOOP("testqtargs"), TDEAboutData::License_GPL,
     "", "", "", "");
 
   TDECmdLineArgs::init(argc, argv, &aboutData);