Rename KInstance and KAboutData to avoid conflicts with KDE4

8 files changed, 14 insertions, 14 deletions

diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index a5e018ba1..349c0c6e5 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -20,7 +20,7 @@ int main( int argc, char* argv[] )
     {
     if( argc != 2 )
         return 1;
-    KInstance inst( "twin_update_default_rules" );
+    TDEInstance inst( "twin_update_default_rules" );
     TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
     if( file.isEmpty())
         {
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index a82e26492..0cbd28353 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -155,7 +155,7 @@ void writeRules( KConfig& cfg )
 
 int main()
     {
-    KInstance inst( "twin_update_window_settings" );
+    TDEInstance inst( "twin_update_window_settings" );
     KConfig src_cfg( "twinrc" );
     KConfig dest_cfg( "twinrulesrc" );
     loadFakeSessionInfo( &src_cfg );
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 14d45cf80..4f9c82a21 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -378,10 +378,10 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	// Allow twin dcop signal to update our selection list
 	connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
 	
-	KAboutData *about =
-		new KAboutData(I18N_NOOP("kcmtwindecoration"),
+	TDEAboutData *about =
+		new TDEAboutData(I18N_NOOP("kcmtwindecoration"),
 				I18N_NOOP("Window Decoration Control Module"),
-				0, 0, KAboutData::License_GPL,
+				0, 0, TDEAboutData::License_GPL,
 				I18N_NOOP("(c) 2001 Karol Szwed"));
 	about->addAuthor("Karol Szwed", 0, "gallium@kde.org");
 	setAboutData(about);
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index a10269eca..5b193ed5f 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -122,9 +122,9 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
   tab->addTab(mTranslucency, i18n("&Translucency"));
   connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
     
-  KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
-                  0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors"));
 
   about->addAuthor("Matthias Ettrich",0,"ettrich@kde.org");
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index c7cdc7587..d498a5e71 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -46,9 +46,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
     widget = new KCMRulesList( this );
     layout->addWidget( TQT_TQWIDGET(widget) );
     connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
-    KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ),
+    TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ),
         I18N_NOOP( "Window-Specific Settings Configuration Module" ),
-        0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
+        0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
     about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org");
     setAboutData(about);
     }
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 9fb307458..d02bfc112 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -24,7 +24,7 @@
 #include <kconfig.h>
 
 class KConfig;
-class KAboutData;
+class TDEAboutData;
 
 namespace KWinInternal
 {
diff --git a/twin/main.cpp b/twin/main.cpp
index d53578caf..4a586cce2 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -309,8 +309,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
 
     KGlobal::locale()->setMainCatalogue("twin");
 
-    KAboutData aboutData( "twin", I18N_NOOP("TWin"),
-                          version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "twin", I18N_NOOP("TWin"),
+                          version, description, TDEAboutData::License_GPL,
                           I18N_NOOP("(c) 1999-2005, The KDE Developers"));
     aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
     aboutData.addAuthor("Cristian Tibirna",0, "tibirna@kde.org");
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 4734da33c..8115c3534 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -101,7 +101,7 @@ int main(int argc, char** argv)
 {
 	TQString style = "keramik";
 	// TDEApplication app(argc, argv);
-	KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
+	TDEAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", TDEAboutData::License_LGPL, "(C) 2005 Sandro Giessl");
 	TDECmdLineArgs::init(argc, argv, &about);
 	TDECmdLineArgs::addCmdLineOptions( options );