Rename KInstance and KAboutData to avoid conflicts with KDE4

12 files changed, 30 insertions, 30 deletions

diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 29f8de794..61e0f3b82 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -41,7 +41,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
 	setWidget(TQT_TQWIDGET(m_widget));
 }
 
-KInstance *KonqSidebar::getInstance()
+TDEInstance *KonqSidebar::getInstance()
 {
 	kdDebug() << "KonqSidebar::getInstance()" << endl;
 	return KonqSidebarFactory::instance(); 
@@ -76,13 +76,13 @@ void KonqSidebar::customEvent(TQCustomEvent* ev)
 
 
 // It's usually safe to leave the factory code alone.. with the
-// notable exception of the KAboutData data
+// notable exception of the TDEAboutData data
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kinstance.h>
 
-KInstance*  KonqSidebarFactory::s_instance = 0L;
-KAboutData* KonqSidebarFactory::s_about = 0L;
+TDEInstance*  KonqSidebarFactory::s_instance = 0L;
+TDEAboutData* KonqSidebarFactory::s_about = 0L;
 
 KonqSidebarFactory::KonqSidebarFactory()
     : KParts::Factory()
@@ -111,13 +111,13 @@ KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, cons
     return obj;
 }
 
-KInstance* KonqSidebarFactory::instance()
+TDEInstance* KonqSidebarFactory::instance()
 {
 	if( !s_instance )
 	{
-		s_about = new KAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1");
+		s_about = new TDEAboutData("konqsidebartng", I18N_NOOP("Extended Sidebar"), "0.1");
 		s_about->addAuthor("Joseph WENNINGER", 0, "[email protected]");
-		s_instance = new KInstance(s_about);
+		s_instance = new TDEInstance(s_about);
 	}
 	return s_instance;
 }
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index 258bde835..660fda9df 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -90,7 +90,7 @@ public:
     virtual bool openURL(const KURL &url);
     KonqSidebarBrowserExtension* extension() const
        { return m_extension; }
-    KInstance *getInstance();
+    TDEInstance *getInstance();
     virtual bool universalMode() {return m_universalMode;}
 protected:
     /**
@@ -106,8 +106,8 @@ private:
      bool m_universalMode;
 };
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KonqSidebarFactory : public KParts::Factory
 {
@@ -119,11 +119,11 @@ public:
     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 // KPARTAPPPART_H
diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index 52cfc11f9..b9fb16f61 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 
 
-KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent,
+KonqSidebarPlugin::KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,
 	TQWidget * /*widgetParent*/, TQString &desktopName_, const char* name)
 	: TQObject(parent,name), desktopName(desktopName_)
 {
@@ -31,7 +31,7 @@ KonqSidebarPlugin::KonqSidebarPlugin(KInstance *instance,TQObject *parent,
 
 KonqSidebarPlugin::~KonqSidebarPlugin() { }
 
-KInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;}
+TDEInstance *KonqSidebarPlugin::parentInstance(){return m_parentInstance;}
 
 void KonqSidebarPlugin::openURL(const KURL& url){handleURL(url);}
 
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 8f3077b37..ad859d025 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -34,17 +34,17 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject
 {
 	Q_OBJECT
 	public:
-		KonqSidebarPlugin(KInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
+		KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
 		~KonqSidebarPlugin();
 		virtual TQWidget *getWidget()=0;
 		virtual void *provides(const TQString &)=0;
-		KInstance *parentInstance();
+		TDEInstance *parentInstance();
 	protected:
 		virtual void handleURL(const KURL &url)=0;
 		virtual void handlePreview(const KFileItemList & items);
 		virtual void handlePreviewOnMouseOver(const KFileItem &items); //not used yet, perhaps in KDE 3.1
 		TQString desktopName;
-		KInstance* m_parentInstance;
+		TDEInstance* m_parentInstance;
 
 	private:
 		KonqSidebarPluginPrivate *d;
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index dfdf90780..aba5e3a26 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -903,8 +903,8 @@ KonqSidebarPlugin *Sidebar_Widget::loadModule(TQWidget *par,TQString &desktopNam
 		{
 			// create the module
 
-			KonqSidebarPlugin* (*func)(KInstance*,TQObject *, TQWidget*, TQString&, const char *);
-			func = (KonqSidebarPlugin* (*)(KInstance*,TQObject *, TQWidget *, TQString&, const char *)) create;
+			KonqSidebarPlugin* (*func)(TDEInstance*,TQObject *, TQWidget*, TQString&, const char *);
+			func = (KonqSidebarPlugin* (*)(TDEInstance*,TQObject *, TQWidget *, TQString&, const char *)) create;
 			TQString fullPath(m_path+desktopName);
 			return  (KonqSidebarPlugin*)func(getInstance(),bi,par,fullPath,0);
 		}
@@ -1084,7 +1084,7 @@ void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
 	}
 }
 
-KInstance  *Sidebar_Widget::getInstance()
+TDEInstance  *Sidebar_Widget::getInstance()
 {
 	return ((KonqSidebar*)m_partParent)->getInstance();
 }
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index 75975f35e..d258c9c3b 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -137,7 +137,7 @@ signals:
 
 public:
 	/* interface KonqSidebar_PluginInterface*/
-	KInstance  *getInstance();
+	TDEInstance  *getInstance();
 //        virtual void showError(TQString &);      for later extension
 //        virtual void showMessage(TQString &);    for later extension
 	/* end of interface implementation */
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp
index a790ee7e1..2032fe202 100644
--- a/konqueror/sidebar/test/konqsidebartest.cpp
+++ b/konqueror/sidebar/test/konqsidebartest.cpp
@@ -19,7 +19,7 @@
 
 extern "C"
 {
-    KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
         return new SidebarTest(instance,par,widp,desktopname,name);
     }
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index 5c36080fd..c5abab26c 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -24,7 +24,7 @@ class SidebarTest : public KonqSidebarPlugin
 	{
 		Q_OBJECT
 		public:
-		SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
+		SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name)
 		{
 			widget=new TQLabel("Init Value",widgetParent);			
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index ffde542b0..0dc9303b4 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -14,7 +14,7 @@
 #include <tqvbox.h>
 #include <tqapplication.h>
 
-KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
+KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
                    KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
 	{
 		KSimpleConfig ksc(desktopName_);
@@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename()
 
 extern "C"
 {
-    KDE_EXPORT void*  create_konqsidebar_tree(KInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
+    KDE_EXPORT void*  create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
     {
         return new KonqSidebar_Tree(inst,par,widp,desktopname,name);
     }
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index 06f6b16b5..b70230b9e 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -18,7 +18,7 @@ class KonqSidebar_Tree: public KonqSidebarPlugin
         {
                 Q_OBJECT
                 public:
-                KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
+                KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
                 ~KonqSidebar_Tree();
                 virtual void *provides(const TQString &);
 //		void emitStatusBarText (const TQString &);
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 695bc4d69..3697c443f 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 
 
-KonqSideBarWebModule::KonqSideBarWebModule(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
+KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name)
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
 	_htmlPart = new KHTMLSideBar(universalMode());
@@ -182,7 +182,7 @@ void KonqSideBarWebModule::pageLoaded() {
 
 
 extern "C" {
-	KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(KInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
+	KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) {
 		return new KonqSideBarWebModule(instance, parent, widget, desktopName, name);
 	}
 }
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 36109ff86..4e0c3d6d7 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -166,7 +166,7 @@ class KonqSideBarWebModule : public KonqSidebarPlugin
 {
 	Q_OBJECT
 	public:
-		KonqSideBarWebModule(KInstance *instance, TQObject *parent,
+		KonqSideBarWebModule(TDEInstance *instance, TQObject *parent,
 			       	TQWidget *widgetParent, TQString &desktopName,
 			       	const char *name);
 		virtual ~KonqSideBarWebModule();