diff options
Diffstat (limited to 'sip')
33 files changed, 104 insertions, 104 deletions
diff --git a/sip/kfile/knotifydialog.sip b/sip/kfile/knotifydialog.sip index ebf00fe..5787bb2 100644 --- a/sip/kfile/knotifydialog.sip +++ b/sip/kfile/knotifydialog.sip @@ -34,9 +34,9 @@ class KNotifyDialog : KDialogBase public: - KNotifyDialog (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1, const KAboutData* = 0); + KNotifyDialog (TQWidget* /TransferThis/ = 0, const char* = 0, bool = 1, const TDEAboutData* = 0); %MethodCode -//takes parent | (TQWidget = 0) | name | (char = 0) | modal | (bool = 1) | aboutData | (KAboutData = see note) +//takes parent | (TQWidget = 0) | name | (char = 0) | modal | (bool = 1) | aboutData | (TDEAboutData = see note) //doc // The default value for aboutData in C++ is KGlobal::instance()->aboutData() // which sip is unable to parse. Since it's the last arg in the list, it has @@ -46,17 +46,17 @@ public: //end if (a3 == 0) - a3 = (KAboutData *)KGlobal::instance ()->aboutData (); + a3 = (TDEAboutData *)KGlobal::instance ()->aboutData (); Py_BEGIN_ALLOW_THREADS sipCpp = new sipKNotifyDialog (a0, a1, a2, a3); Py_END_ALLOW_THREADS %End - static int configure (TQWidget* /Transfer/ = 0, const char* = 0, const KAboutData* = 0); + static int configure (TQWidget* /Transfer/ = 0, const char* = 0, const TDEAboutData* = 0); %MethodCode //returns (int) -//takes parent | (TQWidget = 0) | name | (a Python string = "") | aboutData | (KAboutData = see note) +//takes parent | (TQWidget = 0) | name | (a Python string = "") | aboutData | (TDEAboutData = see note) //doc // The default value for aboutData in C++ is KGlobal::instance()->aboutData() // which sip is unable to parse. Since it's the last arg in the list, it has @@ -66,7 +66,7 @@ public: //end if (a2 == 0) - a2 = (KAboutData *)KGlobal::instance ()->aboutData (); + a2 = (TDEAboutData *)KGlobal::instance ()->aboutData (); Py_BEGIN_ALLOW_THREADS sipRes = KNotifyDialog::configure (a0, a1, a2); diff --git a/sip/kio/kdatatool.sip b/sip/kio/kdatatool.sip index 8395429..46071ce 100644 --- a/sip/kio/kdatatool.sip +++ b/sip/kio/kdatatool.sip @@ -33,7 +33,7 @@ class KDataToolInfo public: KDataToolInfo (); - KDataToolInfo (const KService::Ptr&, KInstance*); + KDataToolInfo (const KService::Ptr&, TDEInstance*); KDataToolInfo (const KDataToolInfo&); TQString dataType () const; TQStringList mimeTypes () const; @@ -45,9 +45,9 @@ public: TQStringList commands () const; KDataTool* createTool (TQObject* /Transfer/ = 0, const char* = 0) const; KService::Ptr service () const; - KInstance* instance () const; + TDEInstance* instance () const; bool isValid () const; - static TQValueList<KDataToolInfo> query (const TQString&, const TQString&, KInstance*); + static TQValueList<KDataToolInfo> query (const TQString&, const TQString&, TDEInstance*); }; // class KDataToolInfo @@ -84,8 +84,8 @@ class KDataTool : TQObject public: KDataTool (TQObject* /TransferThis/ = 0, const char* = 0); - void setInstance (KInstance*); - KInstance* instance () const; + void setInstance (TDEInstance*); + TDEInstance* instance () const; virtual bool run (const TQString&, void*, const TQString&, const TQString&) = 0; protected: diff --git a/sip/kio/kscan.sip b/sip/kio/kscan.sip index 3355b34..022210e 100644 --- a/sip/kio/kscan.sip +++ b/sip/kio/kscan.sip @@ -65,7 +65,7 @@ protected: KScanDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0); virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ()); void setName (const TQCString&); - KInstance* instance () const; + TDEInstance* instance () const; protected: //igx virtual void virtual_hook (int, void*); @@ -111,7 +111,7 @@ protected: KOCRDialogFactory (TQObject* /TransferThis/ = 0, const char* = 0); virtual TQObject* createObject (TQObject* /Transfer/ = 0, const char* = 0, const char* = "TQObject", const TQStringList& = TQStringList ()); void setName (const TQCString&); - KInstance* instance () const; + TDEInstance* instance () const; protected: //igx virtual void virtual_hook (int, void*); diff --git a/sip/kparts/factory.sip b/sip/kparts/factory.sip index 6b919e2..35b18f8 100644 --- a/sip/kparts/factory.sip +++ b/sip/kparts/factory.sip @@ -38,8 +38,8 @@ public: KParts::Part* createPart (TQWidget* = 0, const char* = 0, TQObject* /Transfer/ = 0, const char* = 0, const char* = "KParts::Part", const TQStringList& = TQStringList ()); %If ( KDE_3_2_0 - ) - const KInstance* partInstance (); - static const KInstance* partInstanceFromLibrary (const TQCString&); + const TDEInstance* partInstance (); + static const TDEInstance* partInstanceFromLibrary (const TQCString&); %End diff --git a/sip/kparts/part.sip b/sip/kparts/part.sip index c1f5758..4b8ca81 100644 --- a/sip/kparts/part.sip +++ b/sip/kparts/part.sip @@ -39,11 +39,11 @@ public: TQObject* partObject () const; protected: - virtual void setInstance (KInstance*); - virtual void setInstance (KInstance*, bool); + virtual void setInstance (TDEInstance*); + virtual void setInstance (TDEInstance*, bool); %If ( KDE_3_1_0 - ) - void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, KInstance*); + void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, TDEInstance*); //ig void setPluginLoadingMode (KParts::PartBase::PluginLoadingMode); %End diff --git a/sip/kparts/partmanager.sip b/sip/kparts/partmanager.sip index 7f44390..ed4f6ca 100644 --- a/sip/kparts/partmanager.sip +++ b/sip/kparts/partmanager.sip @@ -93,7 +93,7 @@ signals: void activePartChanged (KParts::Part*); protected: - virtual void setActiveInstance (KInstance*); + virtual void setActiveInstance (TDEInstance*); protected slots: void slotObjectDestroyed (); diff --git a/sip/kparts/plugin.sip b/sip/kparts/plugin.sip index f4cf8e8..54102dc 100644 --- a/sip/kparts/plugin.sip +++ b/sip/kparts/plugin.sip @@ -50,20 +50,20 @@ public: Plugin (TQObject* /TransferThis/ = 0, const char* = 0); virtual TQString xmlFile () const; virtual TQString localXMLFile () const; - static void loadPlugins (TQObject* /Transfer/, const KInstance*); + static void loadPlugins (TQObject* /Transfer/, const TDEInstance*); static void loadPlugins (TQObject* /Transfer/, const TQValueList<KParts::Plugin::PluginInfo>&); - static void loadPlugins (TQObject* /Transfer/, const TQValueList<KParts::Plugin::PluginInfo>&, const KInstance*); + static void loadPlugins (TQObject* /Transfer/, const TQValueList<KParts::Plugin::PluginInfo>&, const TDEInstance*); %If ( KDE_3_1_0 - ) - static void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, KInstance*, bool = 1); + static void loadPlugins (TQObject* /Transfer/, KXMLGUIClient*, TDEInstance*, bool = 1); %End static TQPtrList<KParts::Plugin> pluginObjects (TQObject* /Transfer/); protected: - static TQValueList<KParts::Plugin::PluginInfo> pluginInfos (const KInstance*); + static TQValueList<KParts::Plugin::PluginInfo> pluginInfos (const TDEInstance*); static KParts::Plugin* loadPlugin (TQObject* /Transfer/, const char*); - virtual void setInstance (KInstance*); + virtual void setInstance (TDEInstance*); }; // class Plugin diff --git a/sip/kutils/kcmoduleproxy.sip b/sip/kutils/kcmoduleproxy.sip index 6387540..ea68785 100644 --- a/sip/kutils/kcmoduleproxy.sip +++ b/sip/kutils/kcmoduleproxy.sip @@ -44,11 +44,11 @@ public: void load (); void save (); TQString quickHelp () const; - const KAboutData* aboutData () const; + const TDEAboutData* aboutData () const; int buttons () const; TQString rootOnlyMsg () const; bool useRootOnlyMsg () const; - KInstance* instance () const; + TDEInstance* instance () const; bool changed () const; %If ( KDE_3_4_0 - ) diff --git a/sip/kutils/kpluginselector.sip b/sip/kutils/kpluginselector.sip index 8b84eba..ec66e3f 100644 --- a/sip/kutils/kpluginselector.sip +++ b/sip/kutils/kpluginselector.sip @@ -36,7 +36,7 @@ class KPluginSelector : TQWidget public: KPluginSelector (TQWidget*, const char* = 0); void addPlugins (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); - void addPlugins (const KInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); + void addPlugins (const TDEInstance*, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); //ig void addPlugins (const TQValueList<KPluginInfo*>&, const TQString& = TQString ::null , const TQString& = TQString ::null , KConfig* = 0); void setShowEmptyConfigPage (bool); void load (); diff --git a/sip/tdecore/kaboutdata.sip b/sip/tdecore/kaboutdata.sip index 8b3f5a1..eb75fed 100644 --- a/sip/tdecore/kaboutdata.sip +++ b/sip/tdecore/kaboutdata.sip @@ -57,7 +57,7 @@ public: }; // class KAboutTranslator -class KAboutData +class TDEAboutData { %TypeHeaderCode #include <kaboutdata.h> @@ -83,7 +83,7 @@ public: public: - KAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "[email protected]"); + TDEAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "[email protected]"); void addAuthor (const char*, const char* = 0, const char* = 0, const char* = 0); void addCredit (const char*, const char* = 0, const char* = 0, const char* = 0); void setTranslator (const char*, const char*); @@ -100,7 +100,7 @@ public: void setVersion (const char*); void setShortDescription (const char*); - void setLicense (KAboutData::LicenseKey); + void setLicense (TDEAboutData::LicenseKey); void setCopyrightStatement (const char*); void setOtherText (const char*); void setHomepage (const char*); @@ -161,7 +161,7 @@ public: %End -}; // class KAboutData +}; // class TDEAboutData diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip index 5306a5e..59e99a0 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/kapplication.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class TDEApplication : TQApplication, KInstance +class TDEApplication : TQApplication, TDEInstance { %TypeHeaderCode #include <kapplication.h> @@ -291,10 +291,10 @@ public slots: void deref (); protected: - TDEApplication (bool, bool, KInstance*); + TDEApplication (bool, bool, TDEInstance*); %If ( KDE_3_3_0 - ) -//ig TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*); +//ig TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, TDEInstance*); %End //ig bool x11EventFilter (XEvent*); diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip index 7a29bc1..f716f68 100644 --- a/sip/tdecore/kcmdlineargs.sip +++ b/sip/tdecore/kcmdlineargs.sip @@ -107,9 +107,9 @@ public: updatePyArgv (a0, argc, argv); %End - static void init (SIP_PYLIST, const KAboutData*, bool = 0) [void (int, char**, const KAboutData*, bool = 0)]; + static void init (SIP_PYLIST, const TDEAboutData*, bool = 0) [void (int, char**, const TDEAboutData*, bool = 0)]; %MethodCode -//takes _argv | (a Python list of strings which may be modified) | about | (KAboutData) | noKApp | (bool = 0) +//takes _argv | (a Python list of strings which may be modified) | about | (TDEAboutData) | noKApp | (bool = 0) int argc, nargc; //, iserr = 0; char **argv; @@ -131,7 +131,7 @@ public: updatePyArgv (a0, argc, argv); %End - static void init (const KAboutData*); + static void init (const TDEAboutData*); static void addCmdLineOptions (SIP_PYLIST, const char* = 0, const char* = 0, const char* = 0) [void (const KCmdLineOptions*, const char* = 0, const char* = 0, const char* = 0)]; %MethodCode //takes options | (a Python list of tuples) | name | (char = 0) | id | (char = 0) | afterId | (char = 0) diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index 849bb07..7a03345 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -32,7 +32,7 @@ class KGlobal public: - static KInstance* instance (); + static TDEInstance* instance (); static KStandardDirs* dirs (); static KConfig* config (); @@ -49,13 +49,13 @@ public: static void unregisterStaticDeleter (KStaticDeleterBase*); static void deleteStaticDeleters (); //ig KStringDict* _stringDict; -//ig KInstance* _instance; +//ig TDEInstance* _instance; //ig KLocale* _locale; //ig KCharsets* _charsets; //ig KStaticDeleterList* _staticDeleters; - static void setActiveInstance (KInstance*); - static KInstance* activeInstance (); -//ig KInstance* _activeInstance; + static void setActiveInstance (TDEInstance*); + static TDEInstance* activeInstance (); +//ig TDEInstance* _activeInstance; }; // class KGlobal diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip index 23f4fcc..bf62f2e 100644 --- a/sip/tdecore/kiconloader.sip +++ b/sip/tdecore/kiconloader.sip @@ -79,19 +79,19 @@ public: #include <kiconloader.h> %End -TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap DesktopIcon (const TQString&, KInstance*); -TQIconSet DesktopIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap BarIcon (const TQString&, KInstance*); -TQIconSet BarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap SmallIcon (const TQString&, KInstance*); -TQIconSet SmallIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap MainBarIcon (const TQString&, KInstance*); -TQIconSet MainBarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap UserIcon (const TQString&, KInstance*); -TQIconSet UserIconSet (const TQString&, KInstance* = KGlobal ::instance ()); -int IconSize (KIcon::Group, KInstance* = KGlobal ::instance ()); +TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap DesktopIcon (const TQString&, TDEInstance*); +TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap BarIcon (const TQString&, TDEInstance*); +TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap SmallIcon (const TQString&, TDEInstance*); +TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap MainBarIcon (const TQString&, TDEInstance*); +TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap UserIcon (const TQString&, TDEInstance*); +TQIconSet UserIconSet (const TQString&, TDEInstance* = KGlobal ::instance ()); +int IconSize (KIcon::Group, TDEInstance* = KGlobal ::instance ()); diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip index 5ee05ee..beadd9d 100644 --- a/sip/tdecore/kinstance.sip +++ b/sip/tdecore/kinstance.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KInstance +class TDEInstance { %TypeHeaderCode #include <kinstance.h> @@ -32,9 +32,9 @@ class KInstance public: - KInstance (const TQCString&); - KInstance (const KAboutData*); - KInstance (KInstance*); + TDEInstance (const TQCString&); + TDEInstance (const TDEAboutData*); + TDEInstance (TDEInstance*); KStandardDirs* dirs () const; KConfig* config () const; @@ -44,12 +44,12 @@ public: KIconLoader* iconLoader () const; void newIconLoader () const; - const KAboutData* aboutData () const; + const TDEAboutData* aboutData () const; TQCString instanceName () const; KMimeSourceFactory* mimeSourceFactory () const; protected: -//ig KInstance (const KInstance&); +//ig TDEInstance (const TDEInstance&); %If ( KDE_3_1_0 - ) void setConfigName (const TQString&); @@ -68,8 +68,8 @@ public: //force private: - KInstance (const KInstance&); + TDEInstance (const TDEInstance&); //end -}; // class KInstance +}; // class TDEInstance diff --git a/sip/tdecore/klibloader.sip b/sip/tdecore/klibloader.sip index 27c8e72..d068558 100644 --- a/sip/tdecore/klibloader.sip +++ b/sip/tdecore/klibloader.sip @@ -68,7 +68,7 @@ public: virtual void unloadLibrary (const char*); static KLibLoader* self (); static void cleanUp (); - static TQString findLibrary (const char*, const KInstance* = KGlobal ::instance ()); + static TQString findLibrary (const char*, const TDEInstance* = KGlobal ::instance ()); protected: KLibLoader (TQObject* /TransferThis/ = 0, const char* = 0); diff --git a/sip/tdecore/knotifyclient.sip b/sip/tdecore/knotifyclient.sip index d0aeb62..5320ff8 100644 --- a/sip/tdecore/knotifyclient.sip +++ b/sip/tdecore/knotifyclient.sip @@ -38,9 +38,9 @@ class Instance public: - Instance (KInstance*); + Instance (TDEInstance*); bool useSystemBell () const; - static KInstance* current (); + static TDEInstance* current (); static KNotifyClient::Instance* currentInstance (); }; // class Instance @@ -102,7 +102,7 @@ int getPresentation (const TQString&); TQString getFile (const TQString&, int); int getDefaultPresentation (const TQString&); TQString getDefaultFile (const TQString&, int); -KInstance* instance (); +TDEInstance* instance (); %If ( KDE_3_1_0 - KDE_3_2_0 ) diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip index ee3c6fc..8c44662 100644 --- a/sip/tdecore/kshortcutlist.sip +++ b/sip/tdecore/kshortcutlist.sip @@ -46,7 +46,7 @@ public: virtual bool isGlobal (uint) const; virtual int index (const TQString&) const; virtual int index (const KKeySequence&) const; - virtual const KInstance* instance () const; + virtual const TDEInstance* instance () const; enum Other { diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip index a066ec9..7922a4e 100644 --- a/sip/tdecore/kstddirs.sip +++ b/sip/tdecore/kstddirs.sip @@ -65,5 +65,5 @@ private: #include <kstddirs.h> %End -TQString locate (const char*, const TQString&, const KInstance* = KGlobal::instance()); -TQString locateLocal (const char*, const TQString&, const KInstance* = KGlobal::instance()); +TQString locate (const char*, const TQString&, const TDEInstance* = KGlobal::instance()); +TQString locateLocal (const char*, const TQString&, const TDEInstance* = KGlobal::instance()); 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&); |