Rename KInstance and KAboutData to avoid conflicts with KDE4

65 files changed, 154 insertions, 154 deletions

diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 2279c9a78..1e28238a6 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -225,9 +225,9 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   : KCModule(parent, "kcmaccess")
 {
 
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
-                 0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
+                 0, 0, TDEAboutData::License_GPL,
                  I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
 
   about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
@@ -563,7 +563,7 @@ KAccessConfig::~KAccessConfig()
 
 void KAccessConfig::configureKNotify()
 {
-	KAboutData about(I18N_NOOP("kaccess"),
+	TDEAboutData about(I18N_NOOP("kaccess"),
 						  I18N_NOOP("TDE Accessibility Tool"),
 						  0);
 	KNotifyDialog::configure (this, 0, &about);
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 287514343..fac04aef4 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -22,7 +22,7 @@ class TQRadioButton;
 class KColorButton;
 class TQSlider;
 class KNumInput;
-class KAboutData;
+class TDEAboutData;
 
 class ExtendedIntNumInput : public KIntNumInput
 {
diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp
index d57b8228b..9b29f9e6c 100644
--- a/kcontrol/access/main.cpp
+++ b/kcontrol/access/main.cpp
@@ -6,8 +6,8 @@
 
 extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )
 {
-  KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
-                  0, 0, KAboutData::License_GPL,
+  TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
 
   about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp
index eca3880ed..b22df15ff 100644
--- a/kcontrol/accessibility/accessibility.cpp
+++ b/kcontrol/accessibility/accessibility.cpp
@@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib
 AccessibilityConfig::AccessibilityConfig(TQWidget *parent, const char *name, const TQStringList &)
   : AccessibilityConfigWidget( parent, name){
 
-   KAboutData *about =
-   new KAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"),
-                  0, 0, KAboutData::License_GPL,
+   TDEAboutData *about =
+   new TDEAboutData(I18N_NOOP("kcmaccessiblity"), I18N_NOOP("TDE Accessibility Tool"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 2000, Matthias Hoelzer-Kluepfel"));
 
    about->addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org");
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index bbc361cd1..6f6a39cd1 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -242,9 +242,9 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 	connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ),
 			this, TQT_SLOT( slotChanged() ) );
 
-	KAboutData *about =  new KAboutData(I18N_NOOP("kcmarts"),
+	TDEAboutData *about =  new TDEAboutData(I18N_NOOP("kcmarts"),
                   I18N_NOOP("The Sound Server Control Module"),
-                  0, 0, KAboutData::License_GPL,
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 1999 - 2001, Stefan Westerfeld"));
 	about->addAuthor("Stefan Westerfeld",I18N_NOOP("aRts Author") , "stw@kde.org");
 	setAboutData(about);
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index d54cb5e60..aab1f7bba 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -67,9 +67,9 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
 
     connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
-                  0, 0, KAboutData::License_GPL,
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 2009,2010 Timothy Pearson"));
 
     about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index bfdfad35b..eff4eb2aa 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -132,9 +132,9 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
   connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
   connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
   
-  KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
-                  0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 1997 - 2001 Christian Czezatke, Matthias Elter"));
 
   about->addAuthor("Christian Czezatke", I18N_NOOP("Original author"), "e9025461@student.tuwien.ac.at");
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 0d6c398a1..69fece8e3 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -42,9 +42,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock"))
 KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &)
   : KCModule(KlockModuleFactory::instance(), parent, name)
 {
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),
-                  0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   "(c) 1996 - 2001 Luca Montecchiani");
 
   about->addAuthor("Luca Montecchiani", I18N_NOOP("Original author"), "m.luca@usa.net");
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 4212112cc..041be096d 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -279,8 +279,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     load();
 
-    KAboutData* about = new KAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0,
-        KAboutData::License_GPL,
+    TDEAboutData* about = new TDEAboutData("kcmcolors", I18N_NOOP("Colors"), 0, 0,
+        TDEAboutData::License_GPL,
         I18N_NOOP("(c) 1997-2005 Colors Developers"), 0, 0);
     about->addAuthor("Mark Donohoe", 0, 0);
     about->addAuthor("Matthias Hoelzer", 0, 0);
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index 8bf1a026f..fd9401d59 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -30,9 +30,9 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ):
 	connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool)));
 	setButtons( Help | Apply );
 
-	KAboutData *about =
-	new KAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"),
-			0, 0, KAboutData::License_GPL,
+	TDEAboutData *about =
+	new TDEAboutData(I18N_NOOP("kcmcomponentchooser"), I18N_NOOP("Component Chooser"),
+			0, 0, TDEAboutData::License_GPL,
 			I18N_NOOP("(c), 2002 Joseph Wenninger"));
 
 	about->addAuthor("Joseph Wenninger", 0 , "jowenn@kde.org");
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index 72dab21ba..f2c68b3bd 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -20,7 +20,7 @@
 
 #include "componentchooser.h"
 
-class KAboutData;
+class TDEAboutData;
 
 class KCMComponentChooser : public KCModule
 {
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index b4872d1c0..4c9b9967b 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -235,9 +235,9 @@ TQString whatstr;
 
   _signers = new KSSLSigners;
 
-     KAboutData *about =
-     new KAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"),
-                    0, 0, KAboutData::License_GPL,
+     TDEAboutData *about =
+     new TDEAboutData(I18N_NOOP("kcmcrypto"), I18N_NOOP("TDE Crypto Control Module"),
+                    0, 0, TDEAboutData::License_GPL,
                     I18N_NOOP("(c) 2000 - 2001 George Staikos"));
      about->addAuthor("George Staikos", 0, "staikos@kde.org");
      about->addAuthor("Carsten Pfeiffer", 0, "pfeiffer@kde.org");
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 9d38de323..3ca9e8ccc 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -757,9 +757,9 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
 		systemconfig->setFileWriteMode(0644);
 	}
 
-	KAboutData *about =
-		new KAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"),
-			0, 0, KAboutData::License_GPL,
+	TDEAboutData *about =
+		new TDEAboutData(I18N_NOOP("kcmdisplayconfig"), I18N_NOOP("TDE Display Profile Control Module"),
+			0, 0, TDEAboutData::License_GPL,
 			I18N_NOOP("(c) 2011 Timothy Pearson"));
 
 	about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 9210a9295..c8bc0a8ed 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -56,8 +56,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
 KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		: ConfigDialog(parent, name), m_wdchanged(false)
 {
-	setAboutData(new KAboutData(I18N_NOOP("kcm_kdnssd"),
-	                            I18N_NOOP("ZeroConf configuration"),0,0,KAboutData::License_GPL,
+	setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
+	                            I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
 	                            I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
 	setQuickHelp(i18n("Setup services browsing with ZeroConf"));
 	if (geteuid()!=0) tabs->removePage(tab_2); // normal user cannot change wide-area settings
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index dacc1ed7e..2c04835c9 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -75,7 +75,7 @@ private:
     SearchProvider *m_provider;
 };
 
-FilterOptions::FilterOptions(KInstance *instance, TQWidget *parent, const char *name)
+FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name)
               :KCModule(instance, parent, name)
 {
     TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(),
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index e39997995..6352dfea5 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -35,7 +35,7 @@ class FilterOptions : public KCModule
     Q_OBJECT
 
 public:
-    FilterOptions(KInstance *instance, TQWidget *parent = 0, const char *name = 0);
+    FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0);
 
     void load();
     void load( bool useDefaults );
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
index 77e8c8b0f..abf3fe255 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
@@ -27,7 +27,7 @@
 
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
 {
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index eff650902..7ad52849b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -27,7 +27,7 @@
 
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
 {
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index 0c8035d89..b5154cbc6 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -28,7 +28,7 @@
 #include <kurifilter.h>
 #include <tqregexp.h>
 
-class KInstance;
+class TDEInstance;
 class KProcess;
 
 /*
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
index f2bf4654c..db5f9027d 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h
@@ -27,7 +27,7 @@
 #include <kgenericfactory.h>
 #include <kurifilter.h>
 
-class KInstance;
+class TDEInstance;
 
 /**
 * This is short URL filter class.
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 4e9f50121..2750e8aab 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -111,9 +111,9 @@ static KCmdLineOptions options[] =
 int main(int argc, char ** argv)
 {
   KLocale::setMainCatalogue("filetypes");
-  KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
+  TDEAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
                         I18N_NOOP("TDE file type editor - simplified version for editing a single file type"),
-                        KAboutData::License_GPL,
+                        TDEAboutData::License_GPL,
                         I18N_NOOP("(c) 2000, KDE developers") );
   aboutData.addAuthor("Preston Brown",0, "pbrown@kde.org");
   aboutData.addAuthor("David Faure",0, "faure@kde.org");
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 936a8ab38..040433665 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -67,9 +67,9 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 	config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" ));
 	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
 
-	KAboutData *about =
-	new KAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"),
-		0, 0, KAboutData::License_GPL,
+	TDEAboutData *about =
+	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Hardware Device Manager"),
+		0, 0, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2012 Timothy Pearson"));
 	
 	about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index a4c3999d2..56af11adc 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -73,9 +73,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   }
   systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("TDE ICC Profile Control Module"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 2009,2010 Timothy Pearson"));
 
   about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 396a6ee4f..2ced51361 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -51,9 +51,9 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
   tab->addTab(tab2, i18n("Ad&vanced"));
   connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
 
-  KAboutData* about = new KAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
+  TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
 	      I18N_NOOP("Icons Control Panel Module"),
-	      KAboutData::License_GPL,
+	      TDEAboutData::License_GPL,
  	      I18N_NOOP("(c) 2000-2003 Geert Jansen"), 0, 0);
   about->addAuthor("Geert Jansen", 0, "jansen@kde.org");
   about->addAuthor("Antonio Larrosa Jimenez", 0, "larrosa@kde.org");
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index d29ae64f9..017f9477b 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -402,10 +402,10 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     : KCModule(parent, name),
       title(_title)
 {
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcminfo"),
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcminfo"),
 		I18N_NOOP("TDE Panel System Information Control Module"),
-		0, 0, KAboutData::License_GPL,
+		0, 0, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 1998 - 2002 Helge Deller"));
 
     about->addAuthor("Helge Deller", 0, "deller@kde.org");
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index e7acd2856..483f7dd1d 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -91,10 +91,10 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 :  KCModule(parent, name)
 {
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcminfo"),
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcminfo"),
 		I18N_NOOP("TDE Panel Memory Information Control Module"),
-		0, 0, KAboutData::License_GPL,
+		0, 0, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 1998 - 2002 Helge Deller"));
 
     about->addAuthor("Helge Deller", 0, "deller@gmx.de");
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 6f29c2c8b..686772709 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -404,8 +404,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
 
   load();
 
-  KAboutData* about = new KAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0,
-        KAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); 
+  TDEAboutData* about = new TDEAboutData("kcmmouse", I18N_NOOP("Mouse"), 0, 0,
+        TDEAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2005 Mouse developers")); 
   about->addAuthor("Patrick Dowler", 0, 0);
   about->addAuthor("Dirk A. Mueller", 0, 0);
   about->addAuthor("David Faure", 0, 0);
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 935b5903b..a4cd605be 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -82,10 +82,10 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
 
    setButtons(KCModule::Help);
 
-   KAboutData *about =
-   new KAboutData(I18N_NOOP("kcmioslaveinfo"),
+   TDEAboutData *about =
+   new TDEAboutData(I18N_NOOP("kcmioslaveinfo"),
 	I18N_NOOP("TDE Panel System Information Control Module"),
-	0, 0, KAboutData::License_GPL,
+	0, 0, TDEAboutData::License_GPL,
     	I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf"));
 
    about->addAuthor("Alexander Neundorf", 0, "neundorf@kde.org");
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 190e33c7b..9a622c667 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -69,9 +69,9 @@ extern "C"
 joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
   : KCModule(JoystickFactory::instance(), parent, name)
 {
-  setAboutData( new KAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
+  setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0",
                                I18N_NOOP("TDE Control Center Module to test Joysticks"),
-                               KAboutData::License_GPL, "(c) 2004, Martin Koller",
+                               TDEAboutData::License_GPL, "(c) 2004, Martin Koller",
                                0, "m.koller@surfeu.at"));
 
   setQuickHelp( i18n("<h1>Joystick</h1>"
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index e80f0603f..411a95748 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -101,16 +101,16 @@ KControlApp::~KControlApp()
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
   KLocale::setMainCatalogue("kcontrol");
-  KAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), KAboutData::License_GPL,
+  TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"),
+    KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
-  KAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), KAboutData::License_GPL,
+  TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
+    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
   TQCString argv_0 = argv[0];
-  KAboutData *aboutData;
+  TDEAboutData *aboutData;
   if (argv_0.right(11) == "kinfocenter")
   {
      aboutData = &aboutKInfoCenter;
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 5be813dc0..584480837 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -253,7 +253,7 @@ void ConfigModule::embedded()
   _embedStack->raiseWidget(_embedWidget); // put it above the busy label
 }
 
-const KAboutData *ConfigModule::aboutData() const
+const TDEAboutData *ConfigModule::aboutData() const
 {
   if (!_module) return 0;
   return _module->aboutData();
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bcdc7d7e4..fc5406fa6 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -27,7 +27,7 @@
 
 template<class ConfigModule> class TQPtrList;
 class TQStringList;
-class KAboutData;
+class TDEAboutData;
 class KCModule;
 class ProxyWidget;
 class KProcess;
@@ -50,7 +50,7 @@ public:
 
   bool isActive() { return _module != 0; };
   ProxyWidget *module();
-  const KAboutData *aboutData() const;
+  const TDEAboutData *aboutData() const;
 
 
 public slots:
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index a385d859e..7e3f30de4 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -320,7 +320,7 @@ void ProxyWidget::clientChanged(bool state)
   emit changed(state);
 }
 
-const KAboutData *ProxyWidget::aboutData() const
+const TDEAboutData *ProxyWidget::aboutData() const
 {
   return _client->aboutData();
 }
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index f8a7e9ee3..e1cff0351 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -29,7 +29,7 @@ class TQPushButton;
 class TQFrame;
 
 class KCModule;
-class KAboutData;
+class TDEAboutData;
 
 #include "dockcontainer.h"
 #include <tqscrollview.h>
@@ -46,7 +46,7 @@ public:
   ~ProxyWidget();
 
   TQString quickHelp() const;
-  const KAboutData *aboutData() const;
+  const TDEAboutData *aboutData() const;
 
 public slots:
 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 0c2c9a68e..bd3c70222 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -486,15 +486,15 @@ void TopLevel::reportBug()
     bool deleteit = false;
 
     if (!_active) // report against kcontrol
-        dummyAbout = const_cast<KAboutData*>(KGlobal::instance()->aboutData());
+        dummyAbout = const_cast<TDEAboutData*>(KGlobal::instance()->aboutData());
     else
     {
         if (_active->aboutData())
-            dummyAbout = const_cast<KAboutData*>(_active->aboutData());
+            dummyAbout = const_cast<TDEAboutData*>(_active->aboutData());
         else
         {
             snprintf(buffer, sizeof(buffer), "kcm%s", _active->library().latin1());
-            dummyAbout = new KAboutData(buffer, _active->moduleName().utf8(), "2.0");
+            dummyAbout = new TDEAboutData(buffer, _active->moduleName().utf8(), "2.0");
             deleteit = true;
         }
     }
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8cc4a7a67..1a7e1735f 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -100,7 +100,7 @@ private:
    * against a module with no about data
    * we construct one for him
    **/
-  KAboutData *dummyAbout;
+  TDEAboutData *dummyAbout;
 };
 
 #endif
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index c74b46e08..226e84310 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) )
 KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) :
 	KCModule( KDEDFactory::instance(), parent, name )
 {
-	KAboutData *about =
-		new KAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
-				0, 0, KAboutData::License_GPL,
+	TDEAboutData *about =
+		new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ),
+				0, 0, TDEAboutData::License_GPL,
 				I18N_NOOP( "(c) 2002 Daniel Molkentin" ) );
 	about->addAuthor("Daniel Molkentin",0,"molkentin@kde.org");
 	setAboutData( about );
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index c225187fd..5b2ac8a1a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -84,10 +84,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 {
     KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
 
-    KAboutData* about = new KAboutData("kcmfontinst",
+    TDEAboutData* about = new TDEAboutData("kcmfontinst",
          I18N_NOOP("TDE Font Installer"),
          0, 0,
-         KAboutData::License_GPL,
+         TDEAboutData::License_GPL,
          I18N_NOOP("GUI front end to the fonts:/ ioslave.\n"
          "(c) Craig Drummond, 2000 - 2004"));
     about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org");
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index a27bebf70..7421d1681 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -110,7 +110,7 @@ int kdemain(int argc, char **argv)
 
     KLocale::setMainCatalogue(KFI_CATALOGUE);
 
-    KInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
+    TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL);
     KFI::CKioFonts slave(argv[2], argv[3]);
 
     slave.dispatchLoop();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 3c8a47086..7d9d9d3f4 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
-    setInstance(new KInstance("kfontview"));
+    setInstance(new TDEInstance("kfontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
     itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
index dd695a033..32f36f9e9 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
@@ -45,8 +45,8 @@ extern "C"
 namespace KFI
 {
 
-KInstance * CFontViewPartFactory::theirInstance=NULL;
-KAboutData * CFontViewPartFactory::theirAbout=NULL;
+TDEInstance * CFontViewPartFactory::theirInstance=NULL;
+TDEAboutData * CFontViewPartFactory::theirAbout=NULL;
 
 CFontViewPartFactory::CFontViewPartFactory()
 {
@@ -71,12 +71,12 @@ TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name
     return new CFontViewPart((TQWidget*) parent, name);
 }
 
-KInstance* CFontViewPartFactory::instance()
+TDEInstance* CFontViewPartFactory::instance()
 {
     if(!theirInstance)
     {
-        theirAbout = new KAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1");
-        theirInstance = new KInstance(theirAbout);
+        theirAbout = new TDEAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1");
+        theirInstance = new TDEInstance(theirAbout);
     }
     return theirInstance;
 }
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
index 44b213632..7ac96e9c8 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h
@@ -31,8 +31,8 @@
 
 #include <klibloader.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 namespace KFI
 {
@@ -47,12 +47,12 @@ class CFontViewPartFactory : public KLibFactory
     virtual ~CFontViewPartFactory();
     virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
-    static KInstance * instance();
+    static TDEInstance * instance();
 
     private:
 
-    static KInstance  *theirInstance;
-    static KAboutData *theirAbout;
+    static TDEInstance  *theirInstance;
+    static TDEAboutData *theirAbout;
 };
 
 }
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index acfd96178..bbac01bc8 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -112,8 +112,8 @@ static KCmdLineOptions options[] =
     KCmdLineLastOption
 };
 
-static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
-                            KAboutData::License_GPL,
+static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
+                            TDEAboutData::License_GPL,
                             I18N_NOOP("(c) Craig Drummond, 2004"));
 
 int main(int argc, char **argv)
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index 39972bc73..16e52c8ec 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -32,9 +32,9 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"),
-                  0, 0, KAboutData::License_GPL,
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 1999 - 2001 Matthias Elter\n(c) 2002 Aaron J. Seigo"));
 
     about->addAuthor("Matthias Elter", 0, "elter@kde.org");
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index daf9f283f..8bf4646df 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -351,13 +351,13 @@ TQString KickerConfig::quickHelp() const
                 " manipulation of the panel's buttons and applets.");
 }
 
-KAboutData *KickerConfig::aboutData()
+TDEAboutData *KickerConfig::aboutData()
 {
-    // the KAboutDatas are deleted by the KCModules
-    KAboutData *about
-          = new KAboutData(I18N_NOOP("kcmkicker"),
+    // the TDEAboutDatas are deleted by the KCModules
+    TDEAboutData *about
+          = new TDEAboutData(I18N_NOOP("kcmkicker"),
                            I18N_NOOP("TDE Panel Control Module"),
-                           0, 0, KAboutData::License_GPL,
+                           0, 0, TDEAboutData::License_GPL,
                            I18N_NOOP("(c) 2009 - 2010 Timothy Pearson\n"
                                      "(c) 1999 - 2001 Matthias Elter\n"
                                      "(c) 2002 - 2003 Aaron J. Seigo"));
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 97de653b5..bbc567273 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -24,7 +24,7 @@
 #include "extensionInfo.h"
 
 class TQComboBox;
-class KAboutData;
+class TDEAboutData;
 class KDirWatch;
 
 class KickerConfig : public TQObject, public DCOPObject
@@ -46,7 +46,7 @@ public:
     void restartKicker();
 
     TQString quickHelp() const;
-    KAboutData *aboutData();
+    TDEAboutData *aboutData();
 
     int currentPanelIndex() const { return m_currentPanelIndex; }
 
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index 742033c7b..80453b75b 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -38,9 +38,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
   : KCModule(parent, "kcmkio")
 {
 
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmsocks"), I18N_NOOP("TDE SOCKS Control Module"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 2001 George Staikos"));
 
   about->addAuthor("George Staikos", 0, "staikos@kde.org");
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index ea2479264..30914e96a 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -84,10 +84,10 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
     connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ),
              TQT_SLOT( slotPlayerSettings()));
 
-    KAboutData* ab = new KAboutData(
+    TDEAboutData* ab = new TDEAboutData(
         "kcmknotify", I18N_NOOP("KNotify"), "3.0",
         I18N_NOOP("System Notification Control Panel Module"),
-        KAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 );
+        TDEAboutData::License_GPL, "(c) 2002 Carsten Pfeiffer", 0, 0 );
     ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
     ab->addCredit( "Charles Samuels", I18N_NOOP("Original implementation"),
 	       "charles@altair.dhs.org" );
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index 7f5cf8507..5af670bbe 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -32,7 +32,7 @@ class TQCheckBox;
 class TQLabel;
 class TQSlider;
 
-class KAboutData;
+class TDEAboutData;
 class KComboBox;
 class KURLRequester;
 class PlayerSettingsDialog;
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index 28654869e..f1f28efca 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -78,9 +78,9 @@ extern "C"
 KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
 	: KCModule(parent, name), mConfig(config)
 {
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 1999 - 2001 The Konqueror Developers"));
 
   about->addAuthor("Waldo Bastian",0,"bastian@kde.org");
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 64ecc45d9..8eb8747ce 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -53,8 +53,8 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
     topLayout->add(dialog);
     load();
 
-    KAboutData *ab=new KAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"),
-       "0.2",I18N_NOOP("KControl module for Konsole configuration"), KAboutData::License_GPL,
+    TDEAboutData *ab=new TDEAboutData( "kcmkonsole", I18N_NOOP("KCM Konsole"),
+       "0.2",I18N_NOOP("KControl module for Konsole configuration"), TDEAboutData::License_GPL,
        "(c) 2001, Andrea Rizzi", 0, 0, "rizzi@kde.org");
 
     ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org");
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 47070ab02..4a3f21644 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -46,10 +46,10 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
     : KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
 {
 
-    KAboutData *about = new KAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
+    TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
                                        "0.4", I18N_NOOP("This control module handles installing, removing and "
                                                         "creating visual TDE themes."),
-                                       KAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
+                                       TDEAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
                                        "http://developer.kde.org/~lukas/kthememanager");
     setAboutData( about );
 
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index fba803ec5..0d7059729 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -29,7 +29,7 @@
 
 class TQString;
 
-class KAboutData;
+class TDEAboutData;
 
 #define ORIGINAL_THEME "original" // no i18n() here!!!
 
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 086d05d92..f561ecaf6 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -49,11 +49,11 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
                                        const TQStringList &args)
   : KCModule( KLocaleFactory::instance(), parent, args)
 {
-  KAboutData* aboutData = new KAboutData("kcmlocale",
+  TDEAboutData* aboutData = new TDEAboutData("kcmlocale",
         I18N_NOOP("KCMLocale"),
         "3.0",
         I18N_NOOP("Regional settings"),
-        KAboutData::License_GPL,
+        TDEAboutData::License_GPL,
         "(C) 1998 Matthias Hoelzer, "
         "(C) 1999-2003 Hans Petter Bieker",
         0, 0, "bieker@kde.org");
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 1a5500b2d..6d2acf1e9 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -106,10 +106,10 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &)
    connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update()));
    connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update()));
    update();
-   KAboutData *about =
-   new KAboutData(I18N_NOOP("kcminfo"),
+   TDEAboutData *about =
+   new TDEAboutData(I18N_NOOP("kcminfo"),
 	I18N_NOOP("TDE Panel System Information Control Module"),
-	0, 0, KAboutData::License_GPL,
+	0, 0, TDEAboutData::License_GPL,
 	I18N_NOOP("(c) 2001 - 2002 Alexander Neundorf"));
 
    about->addAuthor("Alexander Neundorf", 0, "neundorf@kde.org");
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index d0a503c6b..bc25083a6 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -45,9 +45,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
 
   setButtons( KCModule::Default|KCModule::Apply|KCModule::Help );
 
-  KAboutData *about =
-    new KAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"),
-                  0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 2003 Ralf Hoelzer"));
 
   about->addAuthor("Ralf Hoelzer", 0, "ralf@well.com");
diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp
index c1a9e6a41..18df71fbc 100644
--- a/kcontrol/randr/main.cpp
+++ b/kcontrol/randr/main.cpp
@@ -35,7 +35,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	KAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), KAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
+	TDEAboutData aboutData("randr", I18N_NOOP("Resize and Rotate"), krandrtrayVersion, I18N_NOOP("Resize and Rotate System Tray App"), TDEAboutData::License_GPL, "(c) 2009,2010 Timothy Pearson", 0L, "");
 	aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Developer and maintainer"), "kb9vqf@pearsoncomputing.net");
 	aboutData.addAuthor("Hamish Rodda",I18N_NOOP("Original developer and maintainer"), "rodda@kde.org");
 	aboutData.addCredit("Lubos Lunak",I18N_NOOP("Many fixes"), "l.lunak@suse.cz");
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 11095bc60..5c2856c32 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -81,10 +81,10 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
      " is parsed. On some systems showmount is in /usr/sbin, check if you have"
      " showmount in your PATH."));
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmsamba"),
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmsamba"),
 		I18N_NOOP("TDE Panel System Information Control Module"),
-		0, 0, KAboutData::License_GPL,
+		0, 0, TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2002 KDE Information Control Module Samba Team"));
     about->addAuthor("Michael Glauche", 0, "glauche@isa.rwth-aachen.de");
     about->addAuthor("Matthias Hoelzer", 0, "hoelzer@kde.org");
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 01b4cf944..85d1aa628 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -281,9 +281,9 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mChanged = false;
     emit changed(false);
 
-    KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmscreensaver"), I18N_NOOP("TDE Screen Saver Control Module"),
-                  0, 0, KAboutData::License_GPL,
+    TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmscreensaver"), I18N_NOOP("TDE Screen Saver Control Module"),
+                  0, 0, TDEAboutData::License_GPL,
                   I18N_NOOP("(c) 1997-2002 Martin R. Jones\n"
                   "(c) 2003-2004 Chris Howells"));
     about->addAuthor("Chris Howells", 0, "howells@kde.org");
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index 4d4f7b071..fcc70a66d 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -55,9 +55,9 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   _ok = false;
   dc->remoteInterfaces("kded", "kardsvc", &_ok);
 
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmsmartcard"), I18N_NOOP("TDE Smartcard Control Module"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmsmartcard"), I18N_NOOP("TDE Smartcard Control Module"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 2001 George Staikos"));
 
   about->addAuthor("George Staikos", 0, "staikos@kde.org");
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 78126222e..274113bfb 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -130,10 +130,10 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	KGlobal::dirs()->addResourceType("themes",
 		KStandardDirs::kde_default("data") + "kstyle/themes");
 
-	KAboutData *about =
-		new KAboutData( I18N_NOOP("kcmstyle"),
+	TDEAboutData *about =
+		new TDEAboutData( I18N_NOOP("kcmstyle"),
 						I18N_NOOP("TDE Style Module"),
-						0, 0, KAboutData::License_GPL,
+						0, 0, TDEAboutData::License_GPL,
 						I18N_NOOP("(c) 2002 Karol Szwed, Daniel Molkentin"));
 
 	about->addAuthor("Karol Szwed", 0, "gallium@kde.org");
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index d21f39df2..053330367 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -237,9 +237,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     }
     connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
 
-    KAboutData *about = new KAboutData(I18N_NOOP("kcmtaskbar"),
+    TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"),
                                        I18N_NOOP("TDE Taskbar Control Module"),
-                                       0, 0, KAboutData::License_GPL,
+                                       0, 0, TDEAboutData::License_GPL,
                                        I18N_NOOP("(c) 2000 - 2001 Matthias Elter"));
 
     about->addAuthor("Matthias Elter", 0, "elter@kde.org");
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 096634e17..d3693768e 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -84,9 +84,9 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   , maxshowuid(0)
   , updateOK(false)
 {
-  KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmtdm"), I18N_NOOP("TDE Login Manager Config Module"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+    new TDEAboutData(I18N_NOOP("kcmtdm"), I18N_NOOP("TDE Login Manager Config Module"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 1996 - 2005 The TDM Authors"));
 
   about->addAuthor("Thomas Tanghus", I18N_NOOP("Original author"), "tanghus@earthling.net");
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 5d4d5387e..8739783de 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -67,9 +67,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
 	  this, TQT_SLOT(selectionChanged(TQListViewItem*)));
 
-  KAboutData *about =
-  new KAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"),
-                0, 0, KAboutData::License_GPL,
+  TDEAboutData *about =
+  new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"),
+                0, 0, TDEAboutData::License_GPL,
                 I18N_NOOP("(c) 2001 Matthias Hoelzer-Kluepfel"));
 
   about->addAuthor("Matthias Hoelzer-Kluepfel", 0, "mhk@kde.org");
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index 3be527fe1..c70330779 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -44,10 +44,10 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name)
   : KCModule(parent, name) {
 	_indicators.setAutoDelete(true);
 
-	KAboutData *about =
-	new KAboutData(I18N_NOOP("kcmxinerama"),
+	TDEAboutData *about =
+	new TDEAboutData(I18N_NOOP("kcmxinerama"),
 			I18N_NOOP("TDE Multiple Monitor Configurator"),
-			0, 0, KAboutData::License_GPL,
+			0, 0, TDEAboutData::License_GPL,
 			I18N_NOOP("(c) 2002-2003 George Staikos"));
  
 	about->addAuthor("George Staikos", 0, "staikos@kde.org");