Rename KInstance and KAboutData to avoid conflicts with KDE4

48 files changed, 77 insertions, 77 deletions

diff --git a/atlantikdesigner/designer/main.cpp b/atlantikdesigner/designer/main.cpp
index 19e62ec..ca8033f 100644
--- a/atlantikdesigner/designer/main.cpp
+++ b/atlantikdesigner/designer/main.cpp
@@ -7,11 +7,11 @@
 
 int main(int argc, char *argv[])
 {
-	KAboutData aboutData(
+	TDEAboutData aboutData(
 	           "atlantikdesigner",
 	           I18N_NOOP("Atlantik Designer"), "1.1.0",
 	           I18N_NOOP("Atlantik gameboard designer"),
-	           KAboutData::License_GPL,
+	           TDEAboutData::License_GPL,
 	           I18N_NOOP("(c) 2002 Jason Katz-Brown"),
 	           0,
 	           "http://www.unixcode.org/atlantik/"
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 9165878..e0f37b8 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -58,7 +58,7 @@ KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
     KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(),      "view_insert_symbolviewer" );
     act->setCheckedState(i18n("Show Symbols"));
 
-    setInstance (new KInstance("kate"));
+    setInstance (new TDEInstance("kate"));
     setXMLFile("plugins/katecppsymbolviewer/ui.rc");
     w->guiFactory()->addClient (this);
   win = w;
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index f40ed9f..e0a20f1 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -91,7 +91,7 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win)
     this, TQT_SLOT( slotSaveListAs() ),
     view->actionCollection(), "file_kfllsaveas" );
 
-  view->setInstance (new KInstance("kate"));
+  view->setInstance (new TDEInstance("kate"));
   view->setXMLFile( "plugins/katefll/ui.rc" );
   win->guiFactory()->addClient (view);
   view->win = win;
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index affdb19..b065113 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -90,7 +90,7 @@ extern "C"
 
 KatePluginFactory::KatePluginFactory()
 {
-  s_instance = new KInstance( "kate" );
+  s_instance = new TDEInstance( "kate" );
 }
 
 KatePluginFactory::~KatePluginFactory()
@@ -103,7 +103,7 @@ TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, c
   return new KateFileTemplates( parent, name );
 }
 
-KInstance* KatePluginFactory::s_instance = 0L;
+TDEInstance* KatePluginFactory::s_instance = 0L;
 //END
 
 //BEGIN TemplateInfo
@@ -127,7 +127,7 @@ class TemplateInfo
 //BEGIN KateFileTemplates
 KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
     : Kate::Plugin ( (Kate::Application*)parent, name ),
-      m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) )
+      m_actionCollection( new KActionCollection( this, "template_actions", new TDEInstance("kate") ) )
 {
   // create actions, so that they are shared.
   // We plug them into each view's menus, and update them centrally, so that
@@ -256,7 +256,7 @@ void KateFileTemplates::addView(Kate::MainWindow *win)
       view->actionCollection(), "file_new_fromtemplate" );
   refreshMenu( view );
 
-  view->setInstance (new KInstance("kate"));
+  view->setInstance (new TDEInstance("kate"));
   view->setXMLFile("plugins/katefiletemplates/ui.rc");
   win->guiFactory()->addClient (view);
   view->win = win;
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index eb150e4..a9d53f2 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -48,7 +48,7 @@ class KatePluginFactory : public KLibFactory
     virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   private:
-    static KInstance* s_instance;
+    static TDEInstance* s_instance;
 };
 
 /**
diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp
index 3031f51..16a0074 100644
--- a/kate/helloworld/plugin_katehelloworld.cpp
+++ b/kate/helloworld/plugin_katehelloworld.cpp
@@ -34,7 +34,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win)
                       TQT_SLOT( slotInsertHello() ), view->actionCollection(),
                       "edit_insert_helloworld" );
     
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile("plugins/katehelloworld/ui.rc");
     win->guiFactory()->addClient (view);
     view->win = win; 
diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp
index edf2ef1..155fb16 100644
--- a/kate/htmltools/plugin_katehtmltools.cpp
+++ b/kate/htmltools/plugin_katehtmltools.cpp
@@ -53,7 +53,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win)
      (void)  new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this,
                                 TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" );
 
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/katehtmltools/ui.rc" );
     win->guiFactory()->addClient (view);
     view->win = win;
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index c94c24f..bc0a6a4 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -87,7 +87,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win)
                       TQT_SLOT( slotInsertCommand() ), view->actionCollection(),
                       "edit_insert_command" );
 
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile("plugins/kateinsertcommand/ui.rc");
     win->guiFactory()->addClient (view);
     view->win = win;
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index ac7a9a3..ff87170 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -342,7 +342,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win)
 
     if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl;
 
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname));
     win->guiFactory()->addClient (view);
 }
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 4b8490c..90e4aca 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -38,7 +38,7 @@ PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w)
                       "python_update_pybrowse" );
 
    //set up the menus
-   setInstance(new KInstance("kate"));
+   setInstance(new TDEInstance("kate"));
    setXMLFile( "plugins/katepybrowse/ui.rc" );
    win->guiFactory()->addClient(this);
 
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index b71422a..7a3f014 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -349,7 +349,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 		TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ),
 		actionCollection(), "make_settings" );
 
-	setInstance(new KInstance("kate"));
+	setInstance(new TDEInstance("kate"));
 	setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc"));
 
 
diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp
index 9184f6a..e724ae3 100644
--- a/kate/modeline/ModelinePlugin.cpp
+++ b/kate/modeline/ModelinePlugin.cpp
@@ -59,7 +59,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win)
 		this, TQT_SLOT(applyModeline()),
 		view->actionCollection(), "edit_apply_modeline" );   
        
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/katemodeline/ui.rc" );
     win->guiFactory()->addClient (view);
     view->win = win; 
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index 61cd592..7694d4f 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -54,7 +54,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win)
       this, TQT_SLOT( slotOpenHeader() ),
       view->actionCollection(), "file_openheader" );
 
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/kateopenheader/ui.rc" );
     win->guiFactory()->addClient (view);
     view->win = win;
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index 8212f47..cae9598 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY(katesnippetsplugin, KGenericFactory<KatePluginSnippet
 KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *dock) : CWidgetSnippets(dock,"snippetswidget")
   , dock (dock)
 {
-  setInstance (new KInstance("kate"));
+  setInstance (new TDEInstance("kate"));
   setXMLFile("plugins/katesnippets/plugin_katesnippets.rc");
 
   w->guiFactory()->addClient (this);
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 2fd9378..66c43c1 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 KatePluginFactory::KatePluginFactory()
 {
-  s_instance = new KInstance( "kate" );
+  s_instance = new TDEInstance( "kate" );
 }
 
 KatePluginFactory::~KatePluginFactory()
@@ -78,7 +78,7 @@ TQObject* KatePluginFactory::createObject(
   return new KatePluginTabBarExtension( parent, name );
 }
 
-KInstance* KatePluginFactory::s_instance = 0L;
+TDEInstance* KatePluginFactory::s_instance = 0L;
 
 // BEGIN KatePluginTabBarExtension
 KatePluginTabBarExtension::KatePluginTabBarExtension(
@@ -112,7 +112,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
   new KWidgetAction(view->tabbar, "tab_bar_widget",
       KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget");
 
-  view->setInstance (new KInstance("kate"));
+  view->setInstance (new TDEInstance("kate"));
   view->setXMLFile("plugins/katetabbarextension/ui.rc");
   win->guiFactory()->addClient (view);
   view->win = win;
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 1f68ee7..0894828 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -71,7 +71,7 @@ class KatePluginFactory : public KLibFactory
         const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   private:
-    static KInstance* s_instance;
+    static TDEInstance* s_instance;
 };
 
 /**
diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp
index 97d28c2..996353b 100644
--- a/kate/textfilter/plugin_katetextfilter.cpp
+++ b/kate/textfilter/plugin_katetextfilter.cpp
@@ -66,7 +66,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win)
     (void)  new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this,
   TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" );
 
-    view->setInstance (new KInstance("kate"));
+    view->setInstance (new TDEInstance("kate"));
     view->setXMLFile( "plugins/katetextfilter/ui.rc" );
     win->guiFactory()->addClient (view);
     view->win = win;
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 94ffe2c..6e4f0ad 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -105,7 +105,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 	//(void)  new KAction ( i18n("Indent XML"), 0, this,
 	//	TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" );
 
-	setInstance(new KInstance("kate"));
+	setInstance(new TDEInstance("kate"));
 	setXMLFile("plugins/katexmlcheck/ui.rc");
 
 
@@ -299,7 +299,7 @@ bool PluginKateXMLCheckView::slotValidate()
 
 	// use catalogs for KDE docbook:
 	if( ! getenv("SGML_CATALOG_FILES") ) {
-    	KInstance ins("katexmlcheckplugin");
+    	TDEInstance ins("katexmlcheckplugin");
 		TQString catalogs;
 		catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog");
 		catalogs += ":";
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index e362569..20be13e 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -156,7 +156,7 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win )
   ( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this,
                         TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" );
 
-  view->setInstance( new KInstance("kate") );
+  view->setInstance( new TDEInstance("kate") );
   view->setXMLFile( "plugins/katexmltools/ui.rc" );
   win->guiFactory()->addClient( view );
 
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index b727446..a51229e 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -62,14 +62,14 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 	: KPanelApplet(configFile, type, actions, parent, name),
 	  m_picking(0)
 {
-	KAboutData *about = new KAboutData("kolourpicker",
+	TDEAboutData *about = new TDEAboutData("kolourpicker",
 									   I18N_NOOP("Color Picker"),
 									   "v0.1",
 									   I18N_NOOP("An applet to pick color values from anywhere on the screen"),
-									   KAboutData::License_GPL_V2,
+									   TDEAboutData::License_GPL_V2,
 									   "(c) 2001 Malte Starostik");
 	about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "[email protected]");
-	m_instance = new KInstance(about);
+	m_instance = new TDEInstance(about);
 
 	KConfig *conf = config();
 	conf->setGroup("General");
diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h
index 09bbdc5..af160e7 100644
--- a/kicker-applets/kolourpicker/kolourpicker.h
+++ b/kicker-applets/kolourpicker/kolourpicker.h
@@ -28,7 +28,7 @@
 
 #include "simplebutton.h"
 
-class KInstance;
+class TDEInstance;
 class TQPopupMenu;
 
 class KolourPicker : public KPanelApplet
@@ -59,7 +59,7 @@ private:
 	void arrangeButtons();
 	void setClipboard(const TQString& text);
 
-	KInstance *m_instance;
+	TDEInstance *m_instance;
 	bool m_picking;
 	SimpleButton *m_historyButton, *m_colourButton;
 	TQValueList<TQColor> m_history;
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 95cf81c..99c79c6 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -94,12 +94,12 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
 	TQWidget *parent, const char *name)
 	: DCOPObject("MediaControl"),
 		KPanelApplet(configFile, t, actions, parent, name),
-		mInstance(new KInstance("mediacontrol")),
-		mAboutData(new KAboutData("mediacontrol",
+		mInstance(new TDEInstance("mediacontrol")),
+		mAboutData(new TDEAboutData("mediacontrol",
 			I18N_NOOP("MediaControl"),
 			MEDIACONTROL_VERSION,
 			I18N_NOOP("A small control-applet for various media players"),
-			KAboutData::License_GPL_V2,
+			TDEAboutData::License_GPL_V2,
 			"(c) 2001-2004 Stefan Gehn",
 			0,
 			"http://metz.gehn.net"))
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 4c98787..0704da5 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -43,9 +43,9 @@
 
 class MCSlider;
 class KPopupMenu;
-class KInstance;
+class TDEInstance;
 class MediaControlConfig;
-class KAboutData;
+class TDEAboutData;
 class MediaControlToolTip;
 
 // =============================================================================
@@ -84,8 +84,8 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
 		void reportBug();
 
 	private:
-		KInstance *mInstance;
-		KAboutData *mAboutData;
+		TDEInstance *mInstance;
+		TDEAboutData *mAboutData;
 		DCOPClient *_dcopClient;
 		PlayerInterface *_player;
 		ConfigFrontend *_configFrontend;
diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h
index 324b828..b805921 100644
--- a/konq-plugins/autorefresh/autorefresh.h
+++ b/konq-plugins/autorefresh/autorefresh.h
@@ -11,7 +11,7 @@
 #include <klibloader.h>
  
 class KURL;
-class KInstance;
+class TDEInstance;
 class TQTimer;
 
 /**
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 4d1a61b..3848f3b 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -31,7 +31,7 @@
 #include <khtml_part.h>
 
 typedef KGenericFactory<PluginBabelFish> BabelFishFactory;
-static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" );
+static const TDEAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) )
 
 PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 205d994..3a913ec 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -83,12 +83,12 @@ void FSJob::progressSlot(int percent, int dirs, const TQString& cDir)
 
 // FSViewPart
 
-KAboutData* FSViewPart::createAboutData()
+TDEAboutData* FSViewPart::createAboutData()
 {
-  KAboutData* aboutData;
-  aboutData = new KAboutData("fsview", I18N_NOOP("FSView"), "0.1.1",
+  TDEAboutData* aboutData;
+  aboutData = new TDEAboutData("fsview", I18N_NOOP("FSView"), "0.1.1",
                              I18N_NOOP("Filesystem Utilization Viewer"),
-                             KAboutData::License_GPL,
+                             TDEAboutData::License_GPL,
                              I18N_NOOP("(c) 2003-2005, Josef Weidendorfer"));
   return aboutData;
 }
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 23ffe32..0919918 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -29,7 +29,7 @@
 
 #include "fsview.h"
 
-class KAboutData;
+class TDEAboutData;
 class KActionMenu;
 
 class FSViewPart;
@@ -93,7 +93,7 @@ public:
 
   bool supportsUndo() const { return false; }
 
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
   FSView* view() const { return _view; }
 
 public slots:
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index 105f4c4..f2f2daf 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -23,9 +23,9 @@ static KCmdLineOptions options[] =
 int main(int argc, char* argv[])
 {
   // KDE compliant startup
-  KAboutData aboutData("fsview", I18N_NOOP("FSView"), "0.1",
+  TDEAboutData aboutData("fsview", I18N_NOOP("FSView"), "0.1",
                        I18N_NOOP("Filesystem Viewer"),
-                       KAboutData::License_GPL,
+                       TDEAboutData::License_GPL,
                        I18N_NOOP("(c) 2002, Josef Weidendorfer"));
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
index d9f5219..af688f1 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
@@ -35,7 +35,7 @@
 #include "settingsplugin.h"
 
 typedef KGenericFactory<SettingsPlugin> SettingsPluginFactory;
-static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" );
+static const TDEAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Settings") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin,
                             SettingsPluginFactory( &aboutdata ) )
 
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index 0115385..95abf73 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -36,8 +36,8 @@ K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
 KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
 :KCModule(parent, name)
 {
-    KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
-       "0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL,
+    TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
+       "0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL,
        "(c) 2001, Holger Freyther", 0, 0, "[email protected]");
     ab->addAuthor("Holger Freyther",0, "[email protected]");
     setAboutData( ab );
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 4f62c05..d2b2826 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -54,7 +54,7 @@ typedef KGenericFactory<RelLinksPlugin> RelLinksFactory;
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3,2,90)
 #include <kaboutdata.h>
-static const KAboutData aboutdata("rellinks", I18N_NOOP("Rellinks") , "1.0" );
+static const TDEAboutData aboutdata("rellinks", I18N_NOOP("Rellinks") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory(&aboutdata) )
 #else
 K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") )
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index f57a9d6..b033e92 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent,
+KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *parent,
                                             TQWidget *widgetParent, TQString &desktopName_,
                                             const char* name )
     : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ),
@@ -68,7 +68,7 @@ bool KonqSidebarDelicious::universalMode()
 
 extern "C"
 {
-    KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, TQObject *par, TQWidget *widp,
+    KDE_EXPORT void* create_konqsidebar_delicious( TDEInstance *instance, TQObject *par, TQWidget *widp,
                                                    TQString &desktopname, const char *name )
     {
         KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" );
diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h
index 425cd51..7ac71a8 100644
--- a/konq-plugins/sidebar/delicious/plugin.h
+++ b/konq-plugins/sidebar/delicious/plugin.h
@@ -43,7 +43,7 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject
 //    
     K_DCOP
 public:
-    KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent,
+    KonqSidebarDelicious( TDEInstance * instance, TQObject * parent, TQWidget * widgetParent,
                           TQString & desktopName_, const char * name = 0 );
     ~KonqSidebarDelicious();
     virtual void * provides( const TQString & );
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index 305cc0b..ab6463b 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -27,7 +27,7 @@
 #include <kdemacros.h>
 #include "mediawidget.h"
 
-KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
+KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
                    KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
 	{
 		widget=new KSB_MediaWidget(widgetParent);
@@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/)
 
 extern "C"
 {
-    KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
 	KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer");
         return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name);
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
index d37c432..ee1a299 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h
@@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin
                 Q_OBJECT
   
                 public:
-                KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
+                KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
                 ~KonqSidebar_MediaPlayer();
                 virtual void *provides(const TQString &);
 		void emitStatusBarText (const TQString &);
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index 0a7528f..9839fd0 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -7,7 +7,7 @@
 #include "metabar.h"
 #include "metabar.moc"
 
-Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
 {
   KImageIO::registerFormats();
@@ -52,7 +52,7 @@ extern "C" {
 
 extern "C"
 {
-  void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+  void* create_konqsidebar_metabar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
       return new Metabar(instance,par,widp,desktopname,name);
     }
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index aed2e69..29c8efa 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin
   
     
   public:
-    Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+    Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
     ~Metabar();
       
     virtual TQWidget *getWidget(){ return widget; }
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index edaa1f4..30aedb4 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -59,11 +59,11 @@ namespace KSB_News {
     pages.setAutoDelete(TRUE);
 
     // about dialog
-    m_aboutdata = new KAboutData("konq_sidebarnews",
+    m_aboutdata = new TDEAboutData("konq_sidebarnews",
                                  I18N_NOOP("Newsticker"),
                                  KDE::versionString(),
                                  I18N_NOOP("RSS Feed Viewer"),
-                                 KAboutData::License_LGPL,
+                                 TDEAboutData::License_LGPL,
                                  I18N_NOOP("(c) 2002-2004, the Sidebar Newsticker developers"));
     m_aboutdata->addAuthor("Marcus Camen", I18N_NOOP("Maintainer"),
                            "[email protected]");
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 98b436e..53934f4 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -36,7 +36,7 @@ class TQVBoxLayout;
 class TQPushButton;
 class TQStringList;
 class KPopupMenu;
-class KAboutData;
+class TDEAboutData;
 class KAboutApplication;
 class KBugReport;
 class KConfigDialog;
@@ -77,7 +77,7 @@ namespace KSB_News {
     TQVBoxLayout *layout;
     TQWidget *currentPage;
     KPopupMenu *popup, *helpmenu;
-    KAboutData *m_aboutdata;
+    TDEAboutData *m_aboutdata;
     KAboutApplication *m_about;
     KBugReport *m_bugreport;
     TQPushButton *m_last_button_rightclicked;
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index de6788f..1ba4f94 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -46,7 +46,7 @@
 
 namespace KSB_News {
 
-  KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent,
+  KonqSidebar_News::KonqSidebar_News(TDEInstance *inst, TQObject *parent,
                                      TQWidget *widgetParent,
                                      TQString &desktopName, const char* name)
     : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name),
@@ -252,7 +252,7 @@ namespace KSB_News {
 
 
   extern "C" {
-    KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par,
+    KDE_EXPORT void* create_konq_sidebarnews(TDEInstance *instance, TQObject *par,
                                              TQWidget *widp,
                                              TQString &desktopname,
                                              const char *name) {
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h
index 84bbb27..048ead5 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.h
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.h
@@ -48,7 +48,7 @@ namespace KSB_News {
     K_DCOP
 
   public:
-    KonqSidebar_News(KInstance *instance, TQObject *parent,
+    KonqSidebar_News(TDEInstance *instance, TQObject *parent,
                      TQWidget *widgetParent, TQString &desktopName_,
                      const char* name=0);
     ~KonqSidebar_News();
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index dc241b7..f216c18 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -42,7 +42,7 @@
 #include "uachangerplugin.h"
 
 typedef KGenericFactory<UAChangerPlugin> UAChangerPluginFactory;
-static const KAboutData aboutdata("uachangerplugin", I18N_NOOP("Change Browser Identification") , "1.0" );
+static const TDEAboutData aboutdata("uachangerplugin", I18N_NOOP("Change Browser Identification") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutdata))
 
 
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index f669308..9175402 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -40,7 +40,7 @@
 
 
 typedef KGenericFactory<PluginValidators> PluginValidatorsFactory;
-static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Page") , "1.0" );
+static const TDEAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Page") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin,
 	                    PluginValidatorsFactory( &aboutdata ) )
 
diff --git a/ksig/main.cpp b/ksig/main.cpp
index c7c6bf2..8b8a7e5 100644
--- a/ksig/main.cpp
+++ b/ksig/main.cpp
@@ -36,8 +36,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-    KAboutData aboutData("ksig", I18N_NOOP("KSig"),
-			 "1.1", description, KAboutData::License_GPL,
+    TDEAboutData aboutData("ksig", I18N_NOOP("KSig"),
+			 "1.1", description, TDEAboutData::License_GPL,
 			 "(c) 2002, Scott Wheeler", 0, 0, "[email protected]");
 
     aboutData.addAuthor("Scott Wheeler", 0, "[email protected]");
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index 0bcafbe..b7208b5 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -568,9 +568,9 @@ int main(int argc, char **argv)
 	runLock.lock();
 #endif
 
-	KAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1",
+	TDEAboutData aboutData("nex", I18N_NOOP("Nex"), "0.0.1",
 		I18N_NOOP("The awesome customizable scope"),
-		KAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0,
+		TDEAboutData::License_LGPL, "(C) 2001 Charles Samuels", 0,
 		"http://noatun.kde.org");
 
 	aboutData.addAuthor("Charles Samuels", I18N_NOOP("Nex Author"),
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index 4b4a2a5..adbadaa 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -178,7 +178,7 @@ void warning(const char *str, bool)
 
 int main(void)
 {
-	KInstance in("noatunsynaescope");
+	TDEInstance in("noatunsynaescope");
 
 	core = new Core;
 
diff --git a/noatun-plugins/tippercanoe/main.cpp b/noatun-plugins/tippercanoe/main.cpp
index 28a60ec..24e81b9 100644
--- a/noatun-plugins/tippercanoe/main.cpp
+++ b/noatun-plugins/tippercanoe/main.cpp
@@ -160,7 +160,7 @@ void warning(const char *, bool)
 int main()
 {
 	fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) & ~O_NONBLOCK);
-	KInstance in("noatunsynaescope");
+	TDEInstance in("noatunsynaescope");
 	core=new Core;
 	core->go();
 	delete core;
diff --git a/noatun-plugins/tyler/main.cpp b/noatun-plugins/tyler/main.cpp
index 219c6ed..40f639d 100644
--- a/noatun-plugins/tyler/main.cpp
+++ b/noatun-plugins/tyler/main.cpp
@@ -68,7 +68,7 @@ int main(int, char **)
 
 	atexit(SDL_Quit);
 
-	KInstance in("noatuntyler");
+	TDEInstance in("noatuntyler");
 
 	finished = false;
 	access_mutex = SDL_CreateMutex();