Rename KInstance and KAboutData to avoid conflicts with KDE4

13 files changed, 33 insertions, 33 deletions

diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 2742ff11..4bda8821 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -120,7 +120,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
                           TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     } else {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection ) {
         instance = m_parentCollection->instance();
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index af79486d..d904fac0 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -119,7 +119,7 @@ private:
 
 class KoTemplateChooseDiaPrivate {
     public:
-	KoTemplateChooseDiaPrivate(const TQCString& templateType, KInstance* instance,
+	KoTemplateChooseDiaPrivate(const TQCString& templateType, TDEInstance* instance,
                                    const TQCString &format,
                                    const TQString &nativeName,
                                    const TQStringList& extraNativeMimeTypes,
@@ -136,7 +136,7 @@ class KoTemplateChooseDiaPrivate {
 	~KoTemplateChooseDiaPrivate() {}
 
 	TQCString m_templateType;
-	KInstance* m_instance;
+	TDEInstance* m_instance;
 	TQCString m_format;
 	TQString m_nativeName;
         TQStringList m_extraNativeMimeTypes;
@@ -178,7 +178,7 @@ class KoTemplateChooseDiaPrivate {
 /******************************************************************/
 
 /*================================================================*/
-KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
+KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance,
                                          const TQCString &format,
                                          const TQString &nativeName,
                                          const TQStringList &extraNativeMimeTypes,
@@ -227,7 +227,7 @@ static bool cancelQuits() {
     return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell
 }
 
-KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
+KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,
                                                             const KoTemplateChooseDia::DialogType &dialogType,
                                                             const TQCString& templateType,
                                                             TQWidget* parent)
@@ -241,7 +241,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance,
                    dialogType, templateType, parent );
 }
 
-KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
+KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,
                                        const TQCString &format,
                                        const TQString &nativeName,
                                        const TQStringList& extraNativeMimeTypes,
@@ -746,7 +746,7 @@ TQString KoTemplateChooseDia::descriptionText(const TQString &name, const TQStri
 
 /*================================================================*/
 
-TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, KInstance* instance )
+TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, TDEInstance* instance )
 {
     TQIconViewItem * itemtoreturn = 0;
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 5bedde84..d39bc7ee 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -49,7 +49,7 @@ class KoTCDIconCanvas : public KIconCanvas
 	    : KIconCanvas( parent, name ) {}
 
 	bool isCurrentValid() { return currentItem(); }
-	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, KInstance* instance);
+	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance);
 
     protected:
 	virtual void keyPressEvent( TQKeyEvent *e ) {
@@ -118,7 +118,7 @@ class KoTCDRecentFilesIconView : public KFileIconView {
         TQLabel* toolTip;
 };
 
-class KInstance;
+class TDEInstance;
 class KoTemplateChooseDiaPrivate;
 
 /**
@@ -159,7 +159,7 @@ public:
      * This is the static method you'll normally use to show the
      * dialog.
      *
-     * @param instance the KInstance of your app
+     * @param instance the TDEInstance of your app
      * The native mimetype is retrieved from the (desktop file of) that instance.
      * @param file this is the filename which is returned to your app
      * More precisely, it's a url (to give to KURL) if ReturnType is File
@@ -171,14 +171,14 @@ public:
      * @param parent pointer to parent widget
      * @return The return type (see above)
      */
-    static ReturnType choose(KInstance* instance, TQString &file,
+    static ReturnType choose(TDEInstance* instance, TQString &file,
                              const DialogType &dialogType,
                              const TQCString& templateType,
                              TQWidget* parent);
 
 private:
     /// Ditto, with extraNativeMimeTypes added
-    static ReturnType choose(KInstance* instance, TQString &file,
+    static ReturnType choose(TDEInstance* instance, TQString &file,
                              const TQCString &format,
                              const TQString &nativeName,
                              const TQStringList& extraNativeMimeTypes,
@@ -215,7 +215,7 @@ private:
      *
      * @param parent parent the parent of the dialog
      * @param name the TQt internal name
-     * @param instance the KInstance of your app
+     * @param instance the TDEInstance of your app
      * @param format is the mimetype of the app (e.g. application/x-kspread)
      * @param nativeName is the name of your app (e.g KSpread)
      * @param dialogType the type of the dialog
@@ -224,7 +224,7 @@ private:
      *
      * @return The return type (see above)
      */
-    KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
+    KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance,
                         const TQCString &format,
                         const TQString &nativeName,
                         const TQStringList &extraNativeMimeTypes,
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 91684726..c3b206e8 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -55,7 +55,7 @@
 
 class KoTemplateCreateDiaPrivate {
 public:
-    KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, KInstance * instance)
+    KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, TDEInstance * instance)
          : m_instance( instance ), m_tempFile( TQString(), ".png" )
     {
         m_tree=0L;
@@ -84,7 +84,7 @@ public:
     KListView *m_groups;
     TQPushButton *m_add, *m_remove;
     TQCheckBox *m_defaultTemplate;
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     bool m_changed;
     /// Temp file for remote picture file
     KTempFile m_tempFile;
@@ -97,7 +97,7 @@ public:
  *
  ****************************************************************************/
 
-KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
+KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance,
                                           const TQString &file, const TQPixmap &pix, TQWidget *parent ) :
     KDialogBase( parent, "template create dia", true, i18n( "Create Template" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ), m_file(file), m_pixmap(pix) {
@@ -200,7 +200,7 @@ void KoTemplateCreateDia::slotSelectionChanged()
     }
 }
 
-void KoTemplateCreateDia::createTemplate( const TQCString &templateType, KInstance *instance,
+void KoTemplateCreateDia::createTemplate( const TQCString &templateType, TDEInstance *instance,
                                           const TQString &file, const TQPixmap &pix, TQWidget *parent ) {
 
     KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, parent );
diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h
index e3e30322..73833975 100644
--- a/lib/kofficeui/KoTemplateCreateDia.h
+++ b/lib/kofficeui/KoTemplateCreateDia.h
@@ -28,7 +28,7 @@
 class TQString;
 class TQPixmap;
 class TQWidget;
-class KInstance;
+class TDEInstance;
 class KLineEdit;
 class TQListViewItem;
 class KoTemplateCreateDiaPrivate;
@@ -45,11 +45,11 @@ class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase
   
 
 public:
-    KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
+    KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance,
                          const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
     ~KoTemplateCreateDia();
 
-    static void createTemplate( const TQCString &templateType, KInstance *instance,
+    static void createTemplate( const TQCString &templateType, TDEInstance *instance,
                                 const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
 
 protected:
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index db4d6467..ba3c3a9b 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -44,7 +44,7 @@
 #include <config.h>
 #endif
 
-KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes )
+KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes )
     : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance)
 {
     setFullSize( false );
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 4b83f03c..25c9f1c4 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -49,7 +49,7 @@ class KOFFICEUI_EXPORT KoToolBox : public KToolBar {
 
 public:
 
-    KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes);
+    KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes);
     virtual ~KoToolBox();
 
     // Called by the toolcontroller for each tool. For every category,
@@ -88,7 +88,7 @@ private:
 
     TQPtrList<ToolList> m_tools;
     TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating.
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
 
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 10334c32..cc606584 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -646,7 +646,7 @@ void KoColorPopupProxy::slotMoreColors()
 
 
 KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent,
-                            const char* name, const TQString& txt, KInstance* _instance ) :
+                            const char* name, const TQString& txt, TDEInstance* _instance ) :
     KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false )
 {
     init();
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 78d67cd5..4e1fab71 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -145,7 +145,7 @@ public:
      */
     KoToolButton( const TQString& icon, int id, TQWidget* parent,
                   const char* name = 0L, const TQString& txt = TQString(),
-                  KInstance* _instance = KGlobal::instance() );
+                  TDEInstance* _instance = KGlobal::instance() );
 
     /**
      * Construct a button with an existing pixmap.  It is not
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index e09ef63d..201afa8e 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -245,7 +245,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         if ( hasIcon() )
         {
             /* ###### CHECK: We're not allowed to specify the instance in iconSet()
-            KInstance *instance;
+            TDEInstance *instance;
             if ( parentCollection() )
                 instance = parentCollection()->instance();
             else
@@ -281,7 +281,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         KToolBar *bar = static_cast<KToolBar *>( w );
 
         int id_ = getToolButtonID();
-        KInstance *instance;
+        TDEInstance *instance;
         if ( parentCollection() )
             instance = parentCollection()->instance();
         else
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 65b4de02..402c8d2c 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -56,7 +56,7 @@ int TKAction::plug(TQWidget* widget, int index)
   if ( widget->inherits("KToolBar") ) {
     KToolBar* bar = static_cast<KToolBar*>(widget);
     int id_ = KAction::getToolButtonID();
-    KInstance *instance;
+    TDEInstance *instance;
 
     if ( parentCollection() )
       instance = parentCollection()->instance();
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index 8a2798e0..c1b2f8cb 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -85,12 +85,12 @@ public:
   TQTimer     *m_delayTimer;
   TQPopupMenu *m_popup;
 
-  KInstance  *m_instance;
+  TDEInstance  *m_instance;
 };
 
 TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt,
                                         TQWidget* parent, const char* name,
-                                        KInstance *instance )
+                                        TDEInstance *instance )
 : TQToolButton(parent,name)
 {
   d = new TKToolBarButtonPrivate;
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 17fc3758..bfa3a148 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 class KToolBar;
-class KInstance;
+class TDEInstance;
 class TQPopupMenu;
 class TQPainter;
 
@@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton
 public:
   TKToolBarButton(const TQString& icon, const TQString& txt,
                      TQWidget* parent = 0, const char *name=0L,
-                     KInstance *_instance = KGlobal::instance());
+                     TDEInstance *_instance = KGlobal::instance());
 
   TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0);
   ~TKToolBarButton();