From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:20:05 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kio/tests/kfiltertest.cpp       | 2 +-
 kio/tests/kiopassdlgtest.cpp    | 2 +-
 kio/tests/kmfitest.cpp          | 2 +-
 kio/tests/kmimemagictest.cpp    | 2 +-
 kio/tests/kmimetypetest.cpp     | 2 +-
 kio/tests/kpropsdlgtest.cpp     | 2 +-
 kio/tests/kprotocolinfotest.cpp | 2 +-
 kio/tests/ktartest.cpp          | 2 +-
 kio/tests/kurifiltertest.cpp    | 2 +-
 kio/tests/kziptest.cpp          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kio/tests')

diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp
index e070418e4..1922e207e 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/kio/tests/kfiltertest.cpp
@@ -88,7 +88,7 @@ void test_textstream(  const TQString & fileName )
 
 int main()
 {
-    KInstance instance("kfiltertest");
+    TDEInstance instance("kfiltertest");
 
     char currentdir[PATH_MAX+1];
     getcwd( currentdir, PATH_MAX );
diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp
index 099ce468b..2bbdaa658 100644
--- a/kio/tests/kiopassdlgtest.cpp
+++ b/kio/tests/kiopassdlgtest.cpp
@@ -8,7 +8,7 @@
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication app;
 
diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp
index df37df997..40530184d 100644
--- a/kio/tests/kmfitest.cpp
+++ b/kio/tests/kmfitest.cpp
@@ -8,7 +8,7 @@
 
 int main (int argc, char **argv)
 {
-	KInstance ins("kmfitest");
+	TDEInstance ins("kmfitest");
 
 	if (argc < 2) {
 		printf("usage: %s <file>\n", argv[0]);
diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp
index eb01137c9..00c545c3c 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/kio/tests/kmimemagictest.cpp
@@ -30,7 +30,7 @@ int main( int argc, char** argv )
              "Usage : ./kmimemagictest file\n");
       return 1;
   }
-  KInstance blah("kmimemagictest");
+  TDEInstance blah("kmimemagictest");
 
   TQString file = TQString::fromLocal8Bit( argv[1] );
 
diff --git a/kio/tests/kmimetypetest.cpp b/kio/tests/kmimetypetest.cpp
index 5802a4084..5d963c81c 100644
--- a/kio/tests/kmimetypetest.cpp
+++ b/kio/tests/kmimetypetest.cpp
@@ -38,7 +38,7 @@ static void checkIcon( const KURL& url, const TQString& expectedIcon )
 
 int main( int argc, char** argv )
 {
-  KInstance blah("kmimetypetest");
+  TDEInstance blah("kmimetypetest");
 
   // Obviously those tests will need to be fixed if we ever change the name of the icons
   // but at least they unit-test KMimeType::iconForURL.
diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp
index 02a4b6f37..66b02bae0 100644
--- a/kio/tests/kpropsdlgtest.cpp
+++ b/kio/tests/kpropsdlgtest.cpp
@@ -13,7 +13,7 @@ static KCmdLineOptions options[] =
 
 int main ( int argc, char** argv )
 {
-    KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index 1f4dc95c6..03bbbdac6 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 int main(int argc, char **argv) {
-    KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
+    TDEAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test",
                         "1.0");
 
     TDECmdLineArgs::init(argc, argv, &aboutData);
diff --git a/kio/tests/ktartest.cpp b/kio/tests/ktartest.cpp
index 5fe4a4f1f..2c470f6e4 100644
--- a/kio/tests/ktartest.cpp
+++ b/kio/tests/ktartest.cpp
@@ -50,7 +50,7 @@ int main( int argc, char** argv )
  " ./ktartest iodevice /path/to/existing_file.tar.gz   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("ktartest");
+  TDEInstance instance("ktartest");
   TQString command = argv[1];
   if ( command == "list" )
   {
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 3dbd8c648..9f4e09013 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
-    KAboutData aboutData(appName, programName, version, description);
+    TDEAboutData aboutData(appName, programName, version, description);
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kio/tests/kziptest.cpp b/kio/tests/kziptest.cpp
index 5b784c40b..84d38d134 100644
--- a/kio/tests/kziptest.cpp
+++ b/kio/tests/kziptest.cpp
@@ -98,7 +98,7 @@ int main( int argc, char** argv )
  " ./kziptest iodevice /path/to/existing_file.zip   tests KArchiveFile::device()\n");
     return 1;
   }
-  KInstance instance("kziptest");
+  TDEInstance instance("kziptest");
   TQString command = argv[1];
   if ( command == "list" )
   {
-- 
cgit v1.2.1