Rename KInstance and KAboutData to avoid conflicts with KDE4

13 files changed, 15 insertions, 15 deletions

diff --git a/tdecore/kconfig_compiler/example/autoexample.cpp b/tdecore/kconfig_compiler/example/autoexample.cpp
index eb8f8c4cf..ec71dea71 100644
--- a/tdecore/kconfig_compiler/example/autoexample.cpp
+++ b/tdecore/kconfig_compiler/example/autoexample.cpp
@@ -38,7 +38,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/example/example.cpp b/tdecore/kconfig_compiler/example/example.cpp
index f15b4bb15..cf808c9b2 100644
--- a/tdecore/kconfig_compiler/example/example.cpp
+++ b/tdecore/kconfig_compiler/example/example.cpp
@@ -32,7 +32,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
+  TDEAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index e0b6422a4..91e8c7998 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -952,8 +952,8 @@ TQString indent(TQString text, int spaces)
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
-    I18N_NOOP("KConfig Compiler") , KAboutData::License_LGPL );
+  TDEAboutData aboutData( "kconfig_compiler", I18N_NOOP("TDE .kcfg compiler"), "0.3",
+    I18N_NOOP("KConfig Compiler") , TDEAboutData::License_LGPL );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   aboutData.addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
   aboutData.addAuthor( "Zack Rusin", 0, "zack@kde.org" );
@@ -965,7 +965,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KInstance app( &aboutData );
+  TDEInstance app( &aboutData );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/tdecore/kconfig_compiler/tests/test1main.cpp b/tdecore/kconfig_compiler/tests/test1main.cpp
index 976a7bbd6..79546639f 100644
--- a/tdecore/kconfig_compiler/tests/test1main.cpp
+++ b/tdecore/kconfig_compiler/tests/test1main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test1 *t = new Test1( TQString::null, TQString::null );
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test2main.cpp b/tdecore/kconfig_compiler/tests/test2main.cpp
index 904c57270..5970bf03d 100644
--- a/tdecore/kconfig_compiler/tests/test2main.cpp
+++ b/tdecore/kconfig_compiler/tests/test2main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test2 *t = new Test2();
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test3main.cpp b/tdecore/kconfig_compiler/tests/test3main.cpp
index 9789d697d..f73ae38e3 100644
--- a/tdecore/kconfig_compiler/tests/test3main.cpp
+++ b/tdecore/kconfig_compiler/tests/test3main.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   TestNameSpace::Test3 *t = new TestNameSpace::Test3();
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test4main.cpp b/tdecore/kconfig_compiler/tests/test4main.cpp
index 8b38b3dbd..5229d8a87 100644
--- a/tdecore/kconfig_compiler/tests/test4main.cpp
+++ b/tdecore/kconfig_compiler/tests/test4main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test4 *t = Test4::self();
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test5main.cpp b/tdecore/kconfig_compiler/tests/test5main.cpp
index 57ad5189d..89f28587f 100644
--- a/tdecore/kconfig_compiler/tests/test5main.cpp
+++ b/tdecore/kconfig_compiler/tests/test5main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test5 *t = Test5::self();
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test6main.cpp b/tdecore/kconfig_compiler/tests/test6main.cpp
index 27dff57ff..9b1b7503e 100644
--- a/tdecore/kconfig_compiler/tests/test6main.cpp
+++ b/tdecore/kconfig_compiler/tests/test6main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test6 *t = new Test6(TQString::null);
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test7main.cpp b/tdecore/kconfig_compiler/tests/test7main.cpp
index 9c1ad1931..81cca0184 100644
--- a/tdecore/kconfig_compiler/tests/test7main.cpp
+++ b/tdecore/kconfig_compiler/tests/test7main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test7 *t = new Test7(42);
   delete t;
 }
diff --git a/tdecore/kconfig_compiler/tests/test8main.cpp b/tdecore/kconfig_compiler/tests/test8main.cpp
index b3c242f68..04864a95c 100644
--- a/tdecore/kconfig_compiler/tests/test8main.cpp
+++ b/tdecore/kconfig_compiler/tests/test8main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test8a *config1 = new Test8a( KSharedConfig::openConfig( TQString::null ) );
   Test8a *config2 = new Test8a();
   Test8b::self();
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp
index 39b904af9..8668d8d8c 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/kconfig_compiler/tests/test9main.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   Test9 *t = new Test9( TQString::null, TQString::null );
 
   TQStringList myPathsList2 = t->myPathsList2();
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
index a6c23c8fe..b62ee17af 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
+++ b/tdecore/kconfig_compiler/tests/test_dpointer_main.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 int main( int, char*[] )
 {
-  KInstance i("test");
+  TDEInstance i("test");
   TestDPointer *t = TestDPointer::self();
   delete t;
 }