Rename KInstance and KAboutData to avoid conflicts with KDE4

10 files changed, 16 insertions, 16 deletions

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"),
                            "mcamen@mcamen.de");
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();