Rename KInstance and KAboutData to avoid conflicts with KDE4

51 files changed, 109 insertions, 109 deletions

diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 456e397..77d329b 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -42,12 +42,12 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-KAboutData *ArkPart::createAboutData()
+TDEAboutData *ArkPart::createAboutData()
 {
-    KAboutData *about = new KAboutData("ark", I18N_NOOP("ark"),
+    TDEAboutData *about = new TDEAboutData("ark", I18N_NOOP("ark"),
                                        "1.0",
                                        I18N_NOOP("Ark KParts Component"),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        I18N_NOOP( "(c) 1997-2003, The Various Ark Developers" ));
     about->addAuthor("Robert Palmbos",0, "palm9744@kettering.edu");
     about->addAuthor("Francois-Xavier Duranceau",0, "duranceau@kde.org");
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 1fa6166..5dce97c 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -32,7 +32,7 @@
 
 #include <tqlabel.h>
 
-class KAboutData;
+class TDEAboutData;
 class KPushButton;
 
 class ArkWidget;
@@ -94,7 +94,7 @@ public:
              const char *name, const TQStringList &, bool readWrite );
     virtual ~ArkPart();
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 public slots:
     void fixEnables();//rename to slotFixEnables()...
diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp
index 3e17e7a..b92b4aa 100644
--- a/ark/arkfactory.cpp
+++ b/ark/arkfactory.cpp
@@ -25,8 +25,8 @@
 #include "ark_part.h"
 #include "arkfactory.h"
 
-KInstance* ArkFactory::s_instance = 0L;
-KAboutData* ArkFactory::s_about = 0L;
+TDEInstance* ArkFactory::s_instance = 0L;
+TDEAboutData* ArkFactory::s_about = 0L;
 int ArkFactory::instanceNumber = 0;
 
 K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory )
@@ -55,13 +55,13 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
         return obj;
 }
 
-KInstance* ArkFactory::instance()
+TDEInstance* ArkFactory::instance()
 {
     instanceNumber++;
     if( !s_instance )
     {
         s_about = ArkPart::createAboutData();
-        s_instance = new KInstance( s_about );
+        s_instance = new TDEInstance( s_about );
     }
     return s_instance;
 }
diff --git a/ark/arkfactory.h b/ark/arkfactory.h
index 2b5514b..51b4933 100644
--- a/ark/arkfactory.h
+++ b/ark/arkfactory.h
@@ -33,10 +33,10 @@ public:
         TQObject *parent = 0, const char *name = 0,
         const char *classname = "KParts::Part",
         const TQStringList &args = TQStringList() );
-    static KInstance* instance();
+    static TDEInstance* instance();
    private:
-    static KInstance* s_instance;
-    static KAboutData* s_about;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_about;
     static int instanceNumber;
 };
 
diff --git a/ark/main.cpp b/ark/main.cpp
index 10449c2..f5281c8 100644
--- a/ark/main.cpp
+++ b/ark/main.cpp
@@ -64,9 +64,9 @@ static KCmdLineOptions option[] =
 
 extern "C" KDE_EXPORT int kdemain( int argc, char *argv[]  )
 {
-	KAboutData aboutData( "ark", I18N_NOOP( "Ark" ),
+	TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ),
 	                      "2.6.4", I18N_NOOP( "TDE Archiving tool" ),
-	                      KAboutData::License_GPL,
+	                      TDEAboutData::License_GPL,
 	                      I18N_NOOP( "(c) 1997-2006, The Various Ark Developers" )
 	                    );
 
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 1608b45..4d773f9 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -139,11 +139,11 @@ void CharSelectApplet::preferences()
 void CharSelectApplet::about()
 {
     if(!_aboutData) {
-	_aboutData = new KAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0",
+	_aboutData = new TDEAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0",
                                     I18N_NOOP("A character picker applet.\n"
                                         "Used to copy single characters to the X11 clipboard.\n"
                                         "You can paste them to an application with the middle mouse button."),
-                                    KAboutData::License_BSD, "(c) 2001, Matthias Elter");
+                                    TDEAboutData::License_BSD, "(c) 2001, Matthias Elter");
 	_aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org");
     }
 
diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h
index 4343660..aa23ed3 100644
--- a/charselectapplet/charselectapplet.h
+++ b/charselectapplet/charselectapplet.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TQSpinBox;
 class KLineEdit;
-class KAboutData;
+class TDEAboutData;
 
 class ConfigDialog : public KDialogBase
 {
@@ -111,7 +111,7 @@ public:
 
 private:
     CharTable    *_table;
-    KAboutData   *_aboutData;
+    TDEAboutData   *_aboutData;
     ConfigDialog *_configDialog;
 };
 
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index cbf8218..5242cc4 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -2269,8 +2269,8 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
-                          version, description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
+                          version, description, TDEAboutData::License_GPL,
                           I18N_NOOP("(c) 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n"
 				    "(c) 1996-2000, Bernd Johannes Wuebben\n"
                                     "(c) 2000-2005, The KDE Team"));
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 85f09e4..642acf0 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -18,8 +18,8 @@ static const char description[] =
 /*================================================================*/
 int main(int argc, char **argv)
 {
-  KAboutData aboutData( "kcharselect", I18N_NOOP("KCharSelect"),
-    version, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kcharselect", I18N_NOOP("KCharSelect"),
+    version, description, TDEAboutData::License_GPL,
     "(c) 1999, Reginald Stadlbauer");
   aboutData.addAuthor("Reginald Stadlbauer",0, "reggie@kde.org");
   aboutData.addCredit( "Nadeem Hasan", I18N_NOOP( "GUI cleanup and fixes" ),
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index e99a1c0..f581508 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -53,7 +53,7 @@ class IRKick: public TQObject, public DCOPObject
 	Modes allModes;
 
 	IRKTrayIcon *theTrayIcon;
-	KAboutData *aboutData;
+	TDEAboutData *aboutData;
 	TQTimer *theFlashOff;
 
 	void updateModeIcons();
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 07e947a..43715e9 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -19,7 +19,7 @@
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
-	KAboutData *aboutData = new KAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), KAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org");
+	TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org");
 	aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/");
 	aboutData->addCredit("Malte Starostik", I18N_NOOP("Original LIRC interface code"), "malte.starostik@t-online.de");
 	aboutData->addCredit("Dirk Ziegelmeier", I18N_NOOP("Ideas, concept code"), "dirk@ziegelmeier.net");
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index ccd9d2f..a7dcbae 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
 KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
 {
 	KGlobal::locale()->insertCatalogue( "kcmlirc" );
-	setAboutData(new KAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org"));
+	setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org"));
 	setButtons(KCModule::Help);
 	setQuickHelp(i18n("<h1>Remote Controls</h1><p>This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.</p><p>To view the recognised applications and remote controls, simply select the <em>Loaded Extensions</em> tab.</p>"));
 	bool ok;
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index 159fa64..c1ec230 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -48,9 +48,9 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("kdessh", I18N_NOOP("TDE ssh"),
+    TDEAboutData aboutData("kdessh", I18N_NOOP("TDE ssh"),
 	    VERSION, I18N_NOOP("Runs a program on a remote host"),
-	    KAboutData::License_Artistic,
+	    TDEAboutData::License_Artistic,
 	    "Copyright (c) 2000 Geert Jansen");
     aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"),
 	    "jansen@kde.org", "http://www.stack.nl/~geertj/");
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index f41242b..c2499c6 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -64,8 +64,8 @@ bool KDFTopLevel::queryExit( void )
 /***************************************************************/
 int main(int argc, char **argv)
 {
-  KAboutData aboutData( "kdf", I18N_NOOP("KDiskFree"),
-    version, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kdf", I18N_NOOP("KDiskFree"),
+    version, description, TDEAboutData::License_GPL,
     "(c) 1998-2001, Michael Kropfberger");
   aboutData.addAuthor("Michael Kropfberger",0, "michael.kropfberger@gmx.net");
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 09f3969..efdbbb2 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -321,8 +321,8 @@ int main(int argc, char **argv)
 {
    KLocale::setMainCatalogue( "kdf" );
 
-   KAboutData about("kwikdisk", I18N_NOOP("KwikDisk"), version, description,
-                  KAboutData::License_GPL, "(C) 2004 Stanislav Karchebny",
+   TDEAboutData about("kwikdisk", I18N_NOOP("KwikDisk"), version, description,
+                  TDEAboutData::License_GPL, "(C) 2004 Stanislav Karchebny",
                   0, 0, "Stanislav.Karchebny@kdemail.net");
    about.addAuthor( "Michael Kropfberger", I18N_NOOP("Original author"),
                     "michael.kropfberger@gmx.net" );
diff --git a/kedit/ChangeLog b/kedit/ChangeLog
index 92be832..4c20204 100644
--- a/kedit/ChangeLog
+++ b/kedit/ChangeLog
@@ -7,7 +7,7 @@
 2000-01-29  Charles Samuels  <charles@altair.dhs.org>
 
 	* Bug fixes
-	* KAboutData stuff
+	* TDEAboutData stuff
 
 1999-10-16  Harri Porten  <porten@kde.org>
 
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index 8e77b89..ad1e4de 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -1263,8 +1263,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv)
 {
 	bool have_top_window = false;
 
-	KAboutData aboutData( "kedit", I18N_NOOP("KEdit"),
-		KEDITVERSION, description, KAboutData::License_GPL,
+	TDEAboutData aboutData( "kedit", I18N_NOOP("KEdit"),
+		KEDITVERSION, description, TDEAboutData::License_GPL,
 		"(c) 1997-2000, Bernd Johannes Wuebben");
 	aboutData.addAuthor("Bernd Johannes Wuebben",0, "wuebben@kde.org");
 	TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp
index d7f9935..0fdf949 100644
--- a/kfloppy/main.cpp
+++ b/kfloppy/main.cpp
@@ -41,9 +41,9 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char *argv[] )
 {
-  KAboutData aboutData("kfloppy",
+  TDEAboutData aboutData("kfloppy",
 	I18N_NOOP("KFloppy"),
-    TDE_VERSION_STRING, description, KAboutData::License_GPL,
+    TDE_VERSION_STRING, description, TDEAboutData::License_GPL,
     "(c) 1997, Bernd Johannes Wuebben\n"
     "(c) 2001, Chris Howells\n"
     "(c) 2002, Adriaan de Groot\n"
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h
index 2c3d682..973296b 100644
--- a/kgpg/kgpg.h
+++ b/kgpg/kgpg.h
@@ -35,7 +35,7 @@
 
 class TQPopupMenu;
 class KTempFile;
-class KAboutData;
+class TDEAboutData;
 class KPassivePopup;
 class KgpgWizard;
 class popupPublic;
@@ -58,7 +58,7 @@ public:
 
 private:
         TQPopupMenu *droppopup,*udroppopup;
-        KAboutData   *_aboutData;
+        TDEAboutData   *_aboutData;
         TQStringList customDecrypt;
         KgpgWizard *wiz;
         KPassivePopup *pop;
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index f7715a4..a440b32 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -47,8 +47,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-        KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description,
-                         KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle");
+        TDEAboutData about("kgpg", I18N_NOOP("KGpg"), version, description,
+                         TDEAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle");
         about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" );
         TDECmdLineArgs::init(argc, argv, &about);
         TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 89d8203..0f5e644 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -46,8 +46,8 @@ static uint parseDecimalOrHexadecimal( char *buf );
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"),
-    version, description, KAboutData::License_GPL_V2,
+  TDEAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"),
+    version, description, TDEAboutData::License_GPL_V2,
     "(c) 1999-2000, Espen Sand");
   aboutData.addAuthor("Espen Sand",0, "espensa@online.no",
 		      "http://home.online.no/~espensa/khexedit/" );
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index d3bac6c..4f6cd8f 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -38,8 +38,8 @@ static const char FWHKEmailAddress[] = "Friedrich.W.H@Kossebau.de";
 // static const char FWHKWebAddress[] = "http://www.kossebau.de";
 
 
-KInstance*  KHexEditPartFactory::s_instance = 0L;
-KAboutData* KHexEditPartFactory::s_about = 0L;
+TDEInstance*  KHexEditPartFactory::s_instance = 0L;
+TDEAboutData* KHexEditPartFactory::s_about = 0L;
 
 
 KHexEditPartFactory::KHexEditPartFactory()
@@ -72,14 +72,14 @@ KParts::Part* KHexEditPartFactory::createPartObject( TQWidget *ParentWidget, con
 }
 
 
-KInstance* KHexEditPartFactory::instance()
+TDEInstance* KHexEditPartFactory::instance()
 {
   if( !s_instance )
   {
-    s_about = new KAboutData( PartId, PartName, PartVersion, PartDescription,
-                              KAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress );
+    s_about = new TDEAboutData( PartId, PartName, PartVersion, PartDescription,
+                              TDEAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress );
     s_about->addAuthor( FWHKName, FWHKTask, FWHKEmailAddress );
-    s_instance = new KInstance( s_about );
+    s_instance = new TDEInstance( s_about );
   }
   return s_instance;
 }
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 0883caa..a411acb 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -20,8 +20,8 @@
 
 #include <kparts/factory.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 
 class KHexEditPartFactory : public KParts::Factory
@@ -37,12 +37,12 @@ class KHexEditPartFactory : public KParts::Factory
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
-    static KInstance* instance();
+    static TDEInstance* instance();
 
 
   private:
-    static KInstance* s_instance;
-    static KAboutData* s_about;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_about;
 };
 
 #endif
diff --git a/kjots/main.cpp b/kjots/main.cpp
index e607e13..b8c6f22 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -41,8 +41,8 @@ static const char version[] = "v0.7";
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kjots", I18N_NOOP("KJots"),
-    version, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kjots", I18N_NOOP("KJots"),
+    version, description, TDEAboutData::License_GPL,
     "(c) 1997-2002, Christoph Neerfeld");
   aboutData.addAuthor("Pradeepto K. Bhattacharya", I18N_NOOP("Current maintainer"), "pradeepto@kde.org");
   aboutData.addAuthor("Jaison Lee", 0, "lee.jaison@gmail.com");
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index e082d55..7ca5a55 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -63,7 +63,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
 
     apm = laptop_portable::has_power_management();
     config =  new KConfig("kcmlaptoprc");
-    instance = new KInstance("klaptopdaemon");
+    instance = new TDEInstance("klaptopdaemon");
 
     TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(),
 					       KDialog::spacingHint() );
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index ad6c851..66fb555 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -94,7 +94,7 @@ private:
 	TQPtrList<TQLabel> batt_label_1, batt_label_2, batt_label_3;
 	TQPixmap battery_pm, battery_nopm;
 
-    	KInstance *instance;
+    	TDEInstance *instance;
 };
 
 #endif
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index d907ef2..32d1dfd 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -57,7 +57,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent )
     pdaemon = parent;
     current_code = -1;
     brightness_widget = 0;
-    instance = new KInstance("klaptopdaemon");
+    instance = new TDEInstance("klaptopdaemon");
       // popup menu for right mouse button
     rightPopup = contextMenu();
     SetupPopup();
diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h
index 70b878d..3297bb6 100644
--- a/klaptopdaemon/daemondock.h
+++ b/klaptopdaemon/daemondock.h
@@ -101,7 +101,7 @@ private:
                           _displayActions,
                           _insertActions;
 
-  KInstance 	*instance; 	// handle so we get our pretty icons right
+  TDEInstance 	*instance; 	// handle so we get our pretty icons right
   KPopupMenu 	*rightPopup;
 
 }; 
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 5839720..b3432cb 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -38,8 +38,8 @@ extern void wake_laptop_daemon();
 int
 main(int argc, char **argv)
 {
-    KAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"),
-		            version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"),
+		            version, description, TDEAboutData::License_GPL,
 			            "(c) 2003, Paul Campbell");
     aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com");
     TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 6d30933..9d0f648 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -223,10 +223,10 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
         sony = 0;
   }
   
-  KAboutData* about = 
-  new KAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION,
+  TDEAboutData* about = 
+  new TDEAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION,
        I18N_NOOP("Battery Control Panel Module"),
-      KAboutData::License_GPL,
+      TDEAboutData::License_GPL,
        I18N_NOOP("(c) 1999 Paul Campbell"), 0, 0);
   //about->addAuthor("NAME", 0, "e-mail addy");
   setAboutData( about );
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 7cde9f0..60d1fc0 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -40,10 +40,10 @@
 PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
   : KCModule(parent, name)
 {
-       KAboutData *about =
-       new KAboutData(I18N_NOOP("kcmlaptop"),
+       TDEAboutData *about =
+       new TDEAboutData(I18N_NOOP("kcmlaptop"),
 		   I18N_NOOP("TDE Panel System Information Control Module"),
-		   0, 0, KAboutData::License_GPL,
+		   0, 0, TDEAboutData::License_GPL,
 		   I18N_NOOP("(c) 1999 - 2002 Paul Campbell"));
        about->addAuthor("Paul Campbell", 0, "paul@taniwha.com");
        setAboutData( about );
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index c8c9225..d684d44 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio"))
 KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &)
     : KCModule(KVaioModuleFactory::instance(), parent, name)
 {
-    KAboutData *about =
-        new KAboutData(I18N_NOOP("kcmkvaio"),
+    TDEAboutData *about =
+        new TDEAboutData(I18N_NOOP("kcmkvaio"),
                        I18N_NOOP("TDE Control Module for Sony "
                                  "Vaio Laptop Hardware"),
-                       0, 0, KAboutData::License_GPL,
+                       0, 0, TDEAboutData::License_GPL,
                        "(c) 2003 Mirko Boehm");
 
     about->addAuthor("Mirko Boehm",
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index e4db02b..c418313 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -56,11 +56,11 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad"
 
 KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&)
 	: KCModule(KCMThinkpadModuleFactory::instance(), parent, name) {
-	KAboutData* about =
-		new KAboutData(I18N_NOOP("kcmthinkpad"),
+	TDEAboutData* about =
+		new TDEAboutData(I18N_NOOP("kcmthinkpad"),
 			       I18N_NOOP("TDE Control Module for IBM Thinkpad "
 					 "Laptop Hardware"),
-			       0, 0, KAboutData::License_GPL,
+			       0, 0, TDEAboutData::License_GPL,
 			       "(c) 2004 Jonathan Riddell");
 
 	about->addAuthor("Jonathan Riddell",
diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp
index fe1a317..48b4a0a 100644
--- a/kregexpeditor/main.cpp
+++ b/kregexpeditor/main.cpp
@@ -35,9 +35,9 @@ int main( int argc, char* argv[] )
 #ifdef TQT_ONLY
     TQApplication myapp( argc, argv );
 #else
-    KAboutData aboutData( "kregexpeditor", I18N_NOOP("RegExp Editor"),
+    TDEAboutData aboutData( "kregexpeditor", I18N_NOOP("RegExp Editor"),
                           "1.0", I18N_NOOP("Editor for Regular Expressions"),
-			  KAboutData::License_GPL,
+			  TDEAboutData::License_GPL,
                           "(c) 2002-2003 Jesper K. Pedersen");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication myapp;
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index e7c963d..e74f768 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -55,9 +55,9 @@ KSim::PanelExtension::PanelExtension(const TQString &configFile,
 
   m_dcopClient->registerAs(name, false);
 
-  m_aboutData = new KAboutData(name, I18N_NOOP("KSim"), KSIM_VERSION_STRING,
+  m_aboutData = new TDEAboutData(name, I18N_NOOP("KSim"), KSIM_VERSION_STRING,
      I18N_NOOP("A plugin based system monitor for TDE"),
-     KAboutData::License_GPL, I18N_NOOP("(C) 2001-2003 Robbie Ward\n(C) 2005 Reuben Sutton"));
+     TDEAboutData::License_GPL, I18N_NOOP("(C) 2001-2003 Robbie Ward\n(C) 2005 Reuben Sutton"));
   m_aboutData->addAuthor("Reuben Sutton", I18N_NOOP("Maintainer"),"reuben.sutton@gmail.com");
   m_aboutData->addAuthor("Robbie Ward", I18N_NOOP("Original Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ksim/ksim.h b/ksim/ksim.h
index b50cd01..36903fb 100644
--- a/ksim/ksim.h
+++ b/ksim/ksim.h
@@ -24,8 +24,8 @@
 #include <kpanelextension.h>
 
 class TQBoxLayout;
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class DCOPClient;
 
 namespace KSim
@@ -61,7 +61,7 @@ namespace KSim
     private:
       KSim::MainView * m_view;
       TQBoxLayout * m_layout;
-      KAboutData * m_aboutData;
+      TDEAboutData * m_aboutData;
       DCOPClient * m_dcopClient;
   };
 }
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index fc7ccca..aaed602 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -96,10 +96,10 @@ void CpuPlugin::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim CPU Plugin"), version.latin1(),
      I18N_NOOP("A cpu monitor plugin for KSim"),
-     KAboutData::License_GPL, "(C) 2001 Robbie Ward");
+     TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
 
   aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 7a778fd..cccf0a5 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -92,10 +92,10 @@ void DiskPlugin::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Disk Plugin"), version.latin1(),
      I18N_NOOP("A disk monitor plugin for KSim"),
-     KAboutData::License_GPL, "(C) 2001 Robbie Ward");
+     TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
 
   aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 9b08da9..46edb3c 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -66,10 +66,10 @@ void PluginModule::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim FileSystem Plugin"), version.latin1(),
      I18N_NOOP("A filesystem plugin for KSim"),
-     KAboutData::License_GPL, "(C) 2001 Robbie Ward");
+     TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
 
   aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 46a96e0..211fd4d 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -61,10 +61,10 @@ void I8KPlugin::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim I8K Plugin"), version.latin1(),
      I18N_NOOP("Dell I8K Hardware Monitor plugin"),
-     KAboutData::License_GPL, "(C) 2003 Nadeem Hasan");
+     TDEAboutData::License_GPL, "(C) 2003 Nadeem Hasan");
 
   aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Author"),
      "nhasan@kde.org");
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index eb2614f..c3fcda3 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -60,10 +60,10 @@ void PluginModule::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Sensors Plugin"), version.latin1(),
      I18N_NOOP("An lm_sensors plugin for KSim"),
-     KAboutData::License_GPL, "(C) 2001 Robbie Ward");
+     TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
 
   aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h
index a0c9455..4f66a8b 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.h
+++ b/ksim/monitors/lm_sensors/ksimsensors.h
@@ -26,7 +26,7 @@
 
 class KConfig;
 class SensorList;
-class KInstance;
+class TDEInstance;
 
 /**
  * This class is the lm_sensors monitor plugin
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index fdda6bd..b2903b6 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -57,10 +57,10 @@ KSim::PluginPage* MailPlugin::createConfigPage( const char* name )
 
 void MailPlugin::showAbout()
 {
-	KAboutData about( instanceName(),
+	TDEAboutData about( instanceName(),
 	                  I18N_NOOP( "KSim Mail Plugin" ), "0.1",
 	                  I18N_NOOP( "A mail monitor plugin for KSim" ),
-	                  KAboutData::License_GPL, "(c) 2002 Malte Starostik" );
+	                  TDEAboutData::License_GPL, "(c) 2002 Malte Starostik" );
 	about.addAuthor( "Malte Starostik", I18N_NOOP( "Author" ), "malte@kde.org" );
 
 	KAboutApplication( &about ).exec();
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 140d822..2d3bd9c 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -86,10 +86,10 @@ void NetPlugin::showAbout()
 {
   TQString version = kapp->aboutData()->version();
 
-  KAboutData aboutData(instanceName(),
+  TDEAboutData aboutData(instanceName(),
      I18N_NOOP("KSim Net Plugin"), version.latin1(),
      I18N_NOOP("A net plugin for KSim"),
-     KAboutData::License_GPL, "(C) 2001 Robbie Ward");
+     TDEAboutData::License_GPL, "(C) 2001 Robbie Ward");
 
   aboutData.addAuthor("Robbie Ward", I18N_NOOP("Author"),
      "linuxphreak@gmx.co.uk");
diff --git a/ktimer/main.cpp b/ktimer/main.cpp
index e648d5f..63c3608 100644
--- a/ktimer/main.cpp
+++ b/ktimer/main.cpp
@@ -30,8 +30,8 @@ static const char version[] = "v0.1";
 
 int main( int argc, char **argv )
 {
-    KAboutData aboutData( "ktimer", I18N_NOOP("KTimer"),
-                          version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "ktimer", I18N_NOOP("KTimer"),
+                          version, description, TDEAboutData::License_GPL,
                           "(c) 2001, Stefan Schimanski");
     aboutData.addAuthor("Stefan Schimanski",0, "schimmi@kde.org");
     TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index 44e2844..3506f58 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -43,10 +43,10 @@ K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
 KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
 : KCModule(KWalletFactory::instance(), parent, name) {
 
-	KAboutData *about =
-		new KAboutData(I18N_NOOP("kcmkwallet"),
+	TDEAboutData *about =
+		new TDEAboutData(I18N_NOOP("kcmkwallet"),
 				I18N_NOOP("TDE Wallet Control Module"),
-				0, 0, KAboutData::License_GPL,
+				0, 0, TDEAboutData::License_GPL,
 				I18N_NOOP("(c) 2003 George Staikos"));
 		about->addAuthor("George Staikos", 0, "staikos@kde.org");
 	setAboutData( about );
diff --git a/kwallet/main.cpp b/kwallet/main.cpp
index 19e452d..7503737 100644
--- a/kwallet/main.cpp
+++ b/kwallet/main.cpp
@@ -48,9 +48,9 @@ int main(int argc, char **argv) {
 		KCmdLineLastOption
 	};
 
-	KAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
+	TDEAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
 		I18N_NOOP("TDE Wallet Management Tool"),
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2003,2004 George Staikos"), 0,
 		"http://www.kde.org/");
 
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index f8b2c1b..cd2e77c 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -126,7 +126,7 @@ void KarambaApplication::checkSuperKarambaDir()
   }
 }
 
-void KarambaApplication::setUpSysTray(KAboutData* about)
+void KarambaApplication::setUpSysTray(TDEAboutData* about)
 {
   //kdDebug() << k_funcinfo << endl;
   KAction* action;
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index 30f40e6..d4470aa 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -34,7 +34,7 @@ class TDECmdLineArgs;
 class ThemesDlg;
 class dcopIface_stub;
 class KHelpMenu;
-class KAboutData;
+class TDEAboutData;
 
 class KarambaApplication : public TDEApplication
 {
@@ -65,7 +65,7 @@ class KarambaApplication : public TDEApplication
     TQStringList getKarambas();
     bool themeExists(TQString pretty_name);
     void initDcopStub(TQCString app = "");
-    void setUpSysTray(KAboutData* about);
+    void setUpSysTray(TDEAboutData* about);
     void checkPreviousSession(TDEApplication &app, TQStringList &lst);
     void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
     bool startThemes(TQStringList &lst);
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index 7b31653..b0055cc 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -89,9 +89,9 @@ int main(int argc, char **argv)
 #ifdef KARAMBA_LOG
     tqInstallMsgHandler(karambaMessageOutput);
 #endif
-    KAboutData about("superkaramba", I18N_NOOP("SuperKaramba"),
+    TDEAboutData about("superkaramba", I18N_NOOP("SuperKaramba"),
                      version, description,
-                     KAboutData::License_GPL,
+                     TDEAboutData::License_GPL,
                      "(c) 2003-2006 The SuperKaramba developers");
     about.addAuthor("Adam Geitgey", 0, "adam@rootnode.org");
     about.addAuthor("Hans Karlsson", 0, "karlsson.h@home.se");
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 45f0be2..2c65e2a 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -50,8 +50,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("karamba", I18N_NOOP("karamba"), version, description,
-                     KAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se");
+    TDEAboutData about("karamba", I18N_NOOP("karamba"), version, description,
+                     TDEAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "karlsson.h@home.se");
     about.addAuthor( "Hans Karlsson", 0, "karlsson.h@home.se" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );