Rename KInstance and KAboutData to avoid conflicts with KDE4

14 files changed, 31 insertions, 31 deletions

diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index 3d7d5ef..343665c 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -33,10 +33,10 @@ class KAboutApplication : KAboutDialog
 
 public:
                          KAboutApplication (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
-                         KAboutApplication (const KAboutData*, TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
+                         KAboutApplication (const TDEAboutData*, TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1);
 
 protected:
-    void                 buildDialog (const KAboutData*);
+    void                 buildDialog (const TDEAboutData*);
 
 //force
 %ConvertToSubClassCode
diff --git a/sip/tdeui/kaction.sip b/sip/tdeui/kaction.sip
index d54d730..cae6587 100644
--- a/sip/tdeui/kaction.sip
+++ b/sip/tdeui/kaction.sip
@@ -611,8 +611,8 @@ class KActionCollection : TQObject
 
 
 public:
-                         KActionCollection (TQWidget* /TransferThis/, const char* = 0, KInstance* = 0);
-                         KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+                         KActionCollection (TQWidget* /TransferThis/, const char* = 0, TDEInstance* = 0);
+                         KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
                          KActionCollection (const KActionCollection&);
     virtual void         setWidget (TQWidget*);
 
@@ -642,8 +642,8 @@ public:
 
     bool                 readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
     bool                 writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
-    void                 setInstance (KInstance*);
-    KInstance*           instance () const;
+    void                 setInstance (TDEInstance*);
+    TDEInstance*           instance () const;
     void                 setXMLFile (const TQString&);
     const TQString&       xmlFile () const;
     void                 setHighlightingEnabled (bool);
@@ -660,7 +660,7 @@ signals:
     void                 clearStatusText ();
 
 public:
-                         KActionCollection (TQObject* /TransferThis/ = 0, const char* = 0, KInstance* = 0);
+                         KActionCollection (TQObject* /TransferThis/ = 0, const char* = 0, TDEInstance* = 0);
     void                 insert (KAction*);
     void                 remove (KAction*);
     KAction*             take (KAction*);
diff --git a/sip/tdeui/kactioncollection.sip b/sip/tdeui/kactioncollection.sip
index 3bd6859..0f4d6ab 100644
--- a/sip/tdeui/kactioncollection.sip
+++ b/sip/tdeui/kactioncollection.sip
@@ -34,8 +34,8 @@ class KActionCollection : TQObject
 
 
 public:
-                         KActionCollection (TQWidget* /TransferThis/, const char* = 0, KInstance* = 0);
-                         KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+                         KActionCollection (TQWidget* /TransferThis/, const char* = 0, TDEInstance* = 0);
+                         KActionCollection (TQWidget*, TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
                          KActionCollection (const KActionCollection&);
     virtual void         setWidget (TQWidget*);
     void                 setAutoConnectShortcuts (bool);
@@ -53,8 +53,8 @@ public:
     virtual KActionPtrList actions () const;
     bool                 readShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0);
     bool                 writeShortcutSettings (const TQString& = TQString ::null , KConfigBase* = 0) const;
-    void                 setInstance (KInstance*);
-    KInstance*           instance () const;
+    void                 setInstance (TDEInstance*);
+    TDEInstance*           instance () const;
     void                 setXMLFile (const TQString&);
     const TQString&       xmlFile () const;
     void                 setHighlightingEnabled (bool);
@@ -76,7 +76,7 @@ signals:
     void                 clearStatusText ();
 
 public:
-                         KActionCollection (TQObject* /TransferThis/, const char* = 0, KInstance* = 0);
+                         KActionCollection (TQObject* /TransferThis/, const char* = 0, TDEInstance* = 0);
 
 public:
     void                 insert (KAction*);
diff --git a/sip/tdeui/kactionshortcutlist.sip b/sip/tdeui/kactionshortcutlist.sip
index 319db0c..2d5a0d7 100644
--- a/sip/tdeui/kactionshortcutlist.sip
+++ b/sip/tdeui/kactionshortcutlist.sip
@@ -44,7 +44,7 @@ public:
     virtual const KShortcut& shortcutDefault (uint) const;
     virtual bool         isConfigurable (uint) const;
     virtual bool         setShortcut (uint, const KShortcut&);
-    virtual const KInstance* instance () const;
+    virtual const TDEInstance* instance () const;
     virtual TQVariant     getOther (Other, uint) const;
     virtual bool         setOther (Other, uint, TQVariant);
     virtual bool         save () const;
diff --git a/sip/tdeui/kbugreport.sip b/sip/tdeui/kbugreport.sip
index 8454063..6facfcd 100644
--- a/sip/tdeui/kbugreport.sip
+++ b/sip/tdeui/kbugreport.sip
@@ -32,7 +32,7 @@ class KBugReport : KDialogBase
 
 
 public:
-                         KBugReport (TQWidget* /TransferThis/ = 0, bool = 1, const KAboutData* = 0);
+                         KBugReport (TQWidget* /TransferThis/ = 0, bool = 1, const TDEAboutData* = 0);
 
 protected slots:
     virtual void         slotConfigureEmail ();
diff --git a/sip/tdeui/kcmodule.sip b/sip/tdeui/kcmodule.sip
index 63daf3d..8878de2 100644
--- a/sip/tdeui/kcmodule.sip
+++ b/sip/tdeui/kcmodule.sip
@@ -45,22 +45,22 @@ public:
     };
 
                          KCModule (TQWidget* /TransferThis/ = 0, const char* = 0, const TQStringList& = TQStringList ());
-                         KCModule (KInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
+                         KCModule (TDEInstance*, TQWidget* /TransferThis/ = 0, const TQStringList& = TQStringList ());
     virtual void         load ();
     virtual void         save ();
     virtual void         defaults ();
     virtual void         sysdefaults ();
     virtual TQString      quickHelp () const;
-    virtual const KAboutData* aboutData () const;
+    virtual const TDEAboutData* aboutData () const;
 
 %If ( KDE_3_3_0 -  )
-    void                 setAboutData (KAboutData*);
+    void                 setAboutData (TDEAboutData*);
 %End
 
     int                  buttons ();
     TQString              rootOnlyMsg () const;
     bool                 useRootOnlyMsg () const;
-    KInstance*           instance () const;
+    TDEInstance*           instance () const;
 
 %If ( KDE_3_4_0 -  )
     const TQPtrList<KConfigDialogManager>& configs () const;
diff --git a/sip/tdeui/kguiitem.sip b/sip/tdeui/kguiitem.sip
index 5b490ac..18ead43 100644
--- a/sip/tdeui/kguiitem.sip
+++ b/sip/tdeui/kguiitem.sip
@@ -38,7 +38,7 @@ public:
                          KGuiItem (const KGuiItem&);
     TQString              text () const;
     TQString              plainText () const;
-    TQIconSet             iconSet (KIcon::Group, int = 0, KInstance* = KGlobal ::instance ()) const;
+    TQIconSet             iconSet (KIcon::Group, int = 0, TDEInstance* = KGlobal ::instance ()) const;
     TQIconSet             iconSet () const;
     TQString              iconName () const;
     TQString              toolTip () const;
diff --git a/sip/tdeui/khelpmenu.sip b/sip/tdeui/khelpmenu.sip
index aa970f7..fd2d0e9 100644
--- a/sip/tdeui/khelpmenu.sip
+++ b/sip/tdeui/khelpmenu.sip
@@ -43,7 +43,7 @@ public:
     };
 
                          KHelpMenu (TQWidget* /TransferThis/ = 0, const TQString& = TQString ::null , bool = 1);
-                         KHelpMenu (TQWidget* /TransferThis/, const KAboutData*, bool = 1, KActionCollection* = 0);
+                         KHelpMenu (TQWidget* /TransferThis/, const TDEAboutData*, bool = 1, KActionCollection* = 0);
     KPopupMenu*          menu ();
 
 public slots:
diff --git a/sip/tdeui/ksystemtray.sip b/sip/tdeui/ksystemtray.sip
index 89b1081..5af6040 100644
--- a/sip/tdeui/ksystemtray.sip
+++ b/sip/tdeui/ksystemtray.sip
@@ -43,7 +43,7 @@ public:
     virtual void         setCaption (const TQString&);
 %End
 
-    static TQPixmap       loadIcon (const TQString&, KInstance* = KGlobal ::instance ());
+    static TQPixmap       loadIcon (const TQString&, TDEInstance* = KGlobal ::instance ());
 %End
 
 
diff --git a/sip/tdeui/ktoolbar.sip b/sip/tdeui/ktoolbar.sip
index e36fe0b..5221988 100644
--- a/sip/tdeui/ktoolbar.sip
+++ b/sip/tdeui/ktoolbar.sip
@@ -92,8 +92,8 @@ public:
                          KToolBar (TQWidget* /TransferThis/, const char* = 0, bool = 0, bool = 1);
 //ig                          KToolBar (TQMainWindow*, TQMainWindow::ToolBarDock, bool = 0, const char* = 0, bool = 0, bool = 1);
                          KToolBar (TQMainWindow*, TQWidget*, bool = 0, const char* = 0, bool = 0, bool = 1);
-    int                  insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, KInstance* = KGlobal ::instance ());
-    int                  insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, KInstance* = KGlobal ::instance ());
+    int                  insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
+    int                  insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
     int                  insertButton (const TQPixmap&, int, bool = 1, const TQString& = TQString ::null , int = -1);
     int                  insertButton (const TQPixmap&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1);
     int                  insertButton (const TQString&, int, TQPopupMenu*, bool, const TQString&, int = -1);
diff --git a/sip/tdeui/ktoolbarbutton.sip b/sip/tdeui/ktoolbarbutton.sip
index 8fdfbe4..902ee11 100644
--- a/sip/tdeui/ktoolbarbutton.sip
+++ b/sip/tdeui/ktoolbarbutton.sip
@@ -32,7 +32,7 @@ class KToolBarButton : TQToolButton
 
 
 public:
-                         KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , KInstance* = KGlobal ::instance ());
+                         KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , TDEInstance* = KGlobal ::instance ());
                          KToolBarButton (const TQPixmap&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null );
                          KToolBarButton (TQWidget* /TransferThis/ = 0, const char* = 0);
     virtual void         setPixmap (const TQPixmap&);
diff --git a/sip/tdeui/kxmlguibuilder.sip b/sip/tdeui/kxmlguibuilder.sip
index a5b48e5..9123dad 100644
--- a/sip/tdeui/kxmlguibuilder.sip
+++ b/sip/tdeui/kxmlguibuilder.sip
@@ -35,8 +35,8 @@ public:
                          KXMLGUIBuilder (TQWidget*);
     KXMLGUIClient*       builderClient () const;
     void                 setBuilderClient (KXMLGUIClient*);
-    KInstance*           builderInstance () const;
-    void                 setBuilderInstance (KInstance*);
+    TDEInstance*           builderInstance () const;
+    void                 setBuilderInstance (TDEInstance*);
     TQWidget*             widget ();
     virtual TQStringList  containerTags () const;
 //ig     virtual TQWidget*     createContainer (TQWidget* /Transfer/, int, const TQDomElement&, int&);
diff --git a/sip/tdeui/kxmlguiclient.sip b/sip/tdeui/kxmlguiclient.sip
index 800801a..3ea9d70 100644
--- a/sip/tdeui/kxmlguiclient.sip
+++ b/sip/tdeui/kxmlguiclient.sip
@@ -37,7 +37,7 @@ public:
     KAction*             action (const char*) const;
     virtual KAction*     action (const TQDomElement&) const;
     virtual KActionCollection* actionCollection () const;
-    virtual KInstance*   instance () const;
+    virtual TDEInstance*   instance () const;
     virtual TQDomDocument domDocument () const;
     virtual TQString      xmlFile () const;
     virtual TQString      localXMLFile () const;
@@ -86,7 +86,7 @@ public:
 
 
 protected:
-    virtual void         setInstance (KInstance*);
+    virtual void         setInstance (TDEInstance*);
     virtual void         setXMLFile (const TQString&, bool = 0, bool = 1);
     virtual void         setLocalXMLFile (const TQString&);
     virtual void         setXML (const TQString&, bool = 0);
diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip
index 7f361c7..d9be213 100644
--- a/sip/tdeui/kxmlguifactory.sip
+++ b/sip/tdeui/kxmlguifactory.sip
@@ -33,9 +33,9 @@ class KXMLGUIFactory : TQObject
 
 public:
                          KXMLGUIFactory (KXMLGUIBuilder*, TQObject* /TransferThis/ = 0, const char* = 0);
-    static TQString       readConfigFile (const TQString&, bool, const KInstance* = 0);
-    static TQString       readConfigFile (const TQString&, const KInstance* = 0);
-    static bool          saveConfigFile (const TQDomDocument&, const TQString&, const KInstance* = 0);
+    static TQString       readConfigFile (const TQString&, bool, const TDEInstance* = 0);
+    static TQString       readConfigFile (const TQString&, const TDEInstance* = 0);
+    static bool          saveConfigFile (const TQDomDocument&, const TQString&, const TDEInstance* = 0);
     static TQString       documentToXML (const TQDomDocument&);
     static TQString       elementToXML (const TQDomElement&);
     static void          removeDOMComments (TQDomNode&);