diff options
Diffstat (limited to 'sip')
-rw-r--r-- | sip/kio/kmimetype.sip | 6 | ||||
-rw-r--r-- | sip/kio/kprotocolinfo.sip | 6 | ||||
-rw-r--r-- | sip/kio/kservice.sip | 14 | ||||
-rw-r--r-- | sip/kio/kservicegroup.sip | 14 | ||||
-rw-r--r-- | sip/kio/kservicetype.sip | 4 | ||||
-rw-r--r-- | sip/kio/tdesycocaentry.sip | 20 | ||||
-rw-r--r-- | sip/tdecore/kglobal.sip | 2 | ||||
-rw-r--r-- | sip/tdecore/kinstance.sip | 2 | ||||
-rw-r--r-- | sip/tdecore/klockfile.sip | 8 | ||||
-rw-r--r-- | sip/tdecore/kmountpoint.sip | 8 | ||||
-rw-r--r-- | sip/tdecore/ksharedptr.sip | 16 | ||||
-rw-r--r-- | sip/tdecore/ktimezones.sip | 14 | ||||
-rw-r--r-- | sip/tdecore/tdeconfig.sip | 26 | ||||
-rw-r--r-- | sip/tdecore/tdeconfigskeleton.sip | 2 | ||||
-rw-r--r-- | sip/tderesources/configpage.sip | 2 | ||||
-rw-r--r-- | sip/tdespell2/broker.sip | 8 | ||||
-rw-r--r-- | sip/tdespell2/settings.sip | 4 | ||||
-rw-r--r-- | sip/tdeui/kaboutapplication.sip | 2 | ||||
-rw-r--r-- | sip/tdeui/kpanelapplet.sip | 2 | ||||
-rw-r--r-- | sip/tdeui/krootpixmap.sip | 2 | ||||
-rw-r--r-- | sip/tdeui/ksharedpixmap.sip | 6 |
21 files changed, 84 insertions, 84 deletions
diff --git a/sip/kio/kmimetype.sip b/sip/kio/kmimetype.sip index 34ece6b..803c70c 100644 --- a/sip/kio/kmimetype.sip +++ b/sip/kio/kmimetype.sip @@ -33,7 +33,7 @@ class KMimeType : KServiceType public: - typedef KSharedPtr<KMimeType> Ptr; + typedef TDESharedPtr<KMimeType> Ptr; typedef TQValueList<KMimeType::Ptr> List; public: @@ -252,7 +252,7 @@ protected: if (!sipCpp) return NULL; - KSharedPtr<KMimeType> *cPtr = (KSharedPtr<KMimeType> *)sipCpp; + TDESharedPtr<KMimeType> *cPtr = (TDESharedPtr<KMimeType> *)sipCpp; KMimeType *cpp = new KMimeType (*cPtr->data ()); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KMimeType, sipTransferObj); @@ -274,7 +274,7 @@ protected: return 0; } - *sipCppPtr = new KSharedPtr<KMimeType> (cpp); + *sipCppPtr = new TDESharedPtr<KMimeType> (cpp); return 1; %End diff --git a/sip/kio/kprotocolinfo.sip b/sip/kio/kprotocolinfo.sip index 02934db..6a8bb81 100644 --- a/sip/kio/kprotocolinfo.sip +++ b/sip/kio/kprotocolinfo.sip @@ -32,7 +32,7 @@ class KProtocolInfo : KSycocaEntry public: - typedef KSharedPtr<KProtocolInfo> Ptr; + typedef TDESharedPtr<KProtocolInfo> Ptr; public: KProtocolInfo (const TQString&); @@ -187,7 +187,7 @@ protected: if (!sipCpp) return NULL; - KSharedPtr<KProtocolInfo> *cPtr = new KSharedPtr<KProtocolInfo>(*(KSharedPtr<KProtocolInfo> *)sipCpp); + TDESharedPtr<KProtocolInfo> *cPtr = new TDESharedPtr<KProtocolInfo>(*(TDESharedPtr<KProtocolInfo> *)sipCpp); KProtocolInfo *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KProtocolInfo, sipTransferObj); @@ -209,7 +209,7 @@ protected: return 0; } - *sipCppPtr = new KSharedPtr<KProtocolInfo> (cpp); + *sipCppPtr = new TDESharedPtr<KProtocolInfo> (cpp); return 1; %End diff --git a/sip/kio/kservice.sip b/sip/kio/kservice.sip index f9e2fd9..07799a6 100644 --- a/sip/kio/kservice.sip +++ b/sip/kio/kservice.sip @@ -32,7 +32,7 @@ class KService : KSycocaEntry public: -//ig typedef KSharedPtr<KService> Ptr; +//ig typedef TDESharedPtr<KService> Ptr; //ig typedef TQValueList<KService::Ptr> List; public: @@ -164,7 +164,7 @@ protected: %TypeHeaderCode #include <ksharedptr.h> #include <kservice.h> -//typedef KSharedPtr<KService> SvcPtr; +//typedef TDESharedPtr<KService> SvcPtr; //typedef KService::Ptr SvcPtr; %End @@ -174,7 +174,7 @@ protected: if (!sipCpp) return NULL; - KSharedPtr<KService> *cPtr = new KSharedPtr<KService> (*(KSharedPtr<KService> *)sipCpp); + TDESharedPtr<KService> *cPtr = new TDESharedPtr<KService> (*(TDESharedPtr<KService> *)sipCpp); KService *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KService, sipTransferObj); @@ -196,7 +196,7 @@ protected: return 0; } - *sipCppPtr = new KSharedPtr<KService> (cpp); + *sipCppPtr = new TDESharedPtr<KService> (cpp); return 1; %End @@ -209,7 +209,7 @@ protected: %TypeHeaderCode #include <tqvaluelist.h> #include <kservice.h> -//typedef KSharedPtr<KService> Ptr; +//typedef TDESharedPtr<KService> Ptr; //typedef TQValueList<Ptr> SvcList; //typedef KService::List SvcList; typedef TQValueList<KService::Ptr> List; @@ -230,12 +230,12 @@ typedef TQValueList<KService::Ptr> List; // Get it. KService::List *cList = (KService::List *)sipCpp; PyObject *inst; - KSharedPtr<KService> *svc; + TDESharedPtr<KService> *svc; KService::List::Iterator it; for( it = cList->begin(); it != cList->end(); ++it ) { - KSharedPtr <KService> svcptr = static_cast<KService::Ptr>(*it); + TDESharedPtr <KService> svcptr = static_cast<KService::Ptr>(*it); svc = &svcptr; inst = sipConvertFromType(svc, sipType_KService_Ptr, sipTransferObj); diff --git a/sip/kio/kservicegroup.sip b/sip/kio/kservicegroup.sip index 55684c5..8993214 100644 --- a/sip/kio/kservicegroup.sip +++ b/sip/kio/kservicegroup.sip @@ -32,8 +32,8 @@ class KServiceGroup : KSycocaEntry public: -//ig typedef KSharedPtr<KServiceGroup> Ptr; -//ig typedef KSharedPtr<KSycocaEntry> SPtr; +//ig typedef TDESharedPtr<KServiceGroup> Ptr; +//ig typedef TDESharedPtr<KSycocaEntry> SPtr; %If ( KDE_3_1_2 - ) //ig typedef TQValueList<KServiceGroup::SPtr> List; @@ -144,7 +144,7 @@ class KServiceSeparator : KSycocaEntry public: -//ig typedef KSharedPtr<KServiceSeparator> Ptr; +//ig typedef TDESharedPtr<KServiceSeparator> Ptr; public: KServiceSeparator (); @@ -173,7 +173,7 @@ public: if (!sipCpp) return NULL; - KSharedPtr<KServiceGroup> *cPtr = new KSharedPtr<KServiceGroup> (*(KSharedPtr<KServiceGroup> *)sipCpp); + TDESharedPtr<KServiceGroup> *cPtr = new TDESharedPtr<KServiceGroup> (*(TDESharedPtr<KServiceGroup> *)sipCpp); KServiceGroup *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KServiceGroup, sipTransferObj); @@ -195,7 +195,7 @@ public: return 0; } - *sipCppPtr = new KSharedPtr<KServiceGroup> (cpp); + *sipCppPtr = new TDESharedPtr<KServiceGroup> (cpp); return 1; %End @@ -230,12 +230,12 @@ public: KServiceGroup::List *cList = (KServiceGroup::List *)sipCpp; PyObject *inst; - KSharedPtr <KSycocaEntry> *svcGroupType; + TDESharedPtr <KSycocaEntry> *svcGroupType; KServiceGroup::List::Iterator it; for( it = cList->begin(); it != cList->end(); ++it ) { - KSharedPtr<KSycocaEntry> svcptr = static_cast<KServiceGroup::SPtr>(*it); + TDESharedPtr<KSycocaEntry> svcptr = static_cast<KServiceGroup::SPtr>(*it); svcGroupType = &svcptr; inst = sipConvertFromType(svcGroupType, sipType_KSycocaEntry_Ptr, sipTransferObj); diff --git a/sip/kio/kservicetype.sip b/sip/kio/kservicetype.sip index 1f1ccd8..cfd6a41 100644 --- a/sip/kio/kservicetype.sip +++ b/sip/kio/kservicetype.sip @@ -235,12 +235,12 @@ protected: // Get it. TQValueList<KServiceType::Ptr> *cList = (TQValueList<KServiceType::Ptr> *)sipCpp; PyObject *inst; - KSharedPtr <KServiceType> *svc; + TDESharedPtr <KServiceType> *svc; TQValueList<KServiceType::Ptr>::Iterator it; for( it = cList->begin(); it != cList->end(); ++it ) { - KSharedPtr <KServiceType> svcptr = static_cast<KServiceType::Ptr>(*it); + TDESharedPtr <KServiceType> svcptr = static_cast<KServiceType::Ptr>(*it); svc = &svcptr; inst = sipConvertFromType(svc, sipType_KServiceType_Ptr, sipTransferObj); diff --git a/sip/kio/tdesycocaentry.sip b/sip/kio/tdesycocaentry.sip index d428bdd..6bc56be 100644 --- a/sip/kio/tdesycocaentry.sip +++ b/sip/kio/tdesycocaentry.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KSycocaEntry : KShared +class KSycocaEntry : TDEShared { %TypeHeaderCode #include <tdesycocaentry.h> @@ -36,7 +36,7 @@ public: virtual KSycocaType sycocaType () const; public: -//ig typedef KSharedPtr<KSycocaEntry> Ptr; +//ig typedef TDESharedPtr<KSycocaEntry> Ptr; //ig typedef TQValueList<KSycocaEntry::Ptr> List; public: @@ -79,7 +79,7 @@ protected: if (!sipCpp) return NULL; - KSharedPtr<KSycocaEntry> *cPtr = new KSharedPtr<KSycocaEntry> (*(KSharedPtr<KSycocaEntry> *)sipCpp); + TDESharedPtr<KSycocaEntry> *cPtr = new TDESharedPtr<KSycocaEntry> (*(TDESharedPtr<KSycocaEntry> *)sipCpp); KSycocaEntry *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KSycocaEntry, sipTransferObj); @@ -101,7 +101,7 @@ protected: return 0; } - *sipCppPtr = new KSharedPtr<KSycocaEntry> (cpp); + *sipCppPtr = new TDESharedPtr<KSycocaEntry> (cpp); return 1; %End @@ -137,23 +137,23 @@ protected: KSycocaEntry::List *cList = (KSycocaEntry::List *)sipCpp; PyObject *inst; - KSharedPtr<KSycocaEntry> *svc; - KSharedPtr <KService> *svcType; - KSharedPtr <KServiceGroup> *svcGroupType; + TDESharedPtr<KSycocaEntry> *svc; + TDESharedPtr <KService> *svcType; + TDESharedPtr <KServiceGroup> *svcGroupType; KSycocaEntry::List::Iterator it; for( it = cList->begin(); it != cList->end(); ++it ) { - KSharedPtr<KSycocaEntry> svcptr = static_cast<KSycocaEntry::Ptr>(*it); + TDESharedPtr<KSycocaEntry> svcptr = static_cast<KSycocaEntry::Ptr>(*it); svc = &svcptr; if (svc->data ()->sycocaType () == KST_KService) { - svcType = (KSharedPtr<KService> *)svc; + svcType = (TDESharedPtr<KService> *)svc; inst = sipConvertFromType(svcType, sipType_KService_Ptr, sipTransferObj); } else if (svc->data ()->sycocaType () == KST_KServiceGroup) { - svcGroupType = (KSharedPtr <KServiceGroup> *) svc; + svcGroupType = (TDESharedPtr <KServiceGroup> *) svc; inst = sipConvertFromType(svcGroupType, sipType_KServiceGroup_Ptr, sipTransferObj); } else diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index 71652c9..59515a3 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -37,7 +37,7 @@ public: static TDEConfig* config (); %If ( KDE_3_2_0 - ) - static KSharedConfig* sharedConfig (); + static TDESharedConfig* sharedConfig (); %End static KIconLoader* iconLoader (); diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip index bd22d8c..a32a074 100644 --- a/sip/tdecore/kinstance.sip +++ b/sip/tdecore/kinstance.sip @@ -39,7 +39,7 @@ public: TDEConfig* config () const; %If ( KDE_3_2_0 - ) - KSharedConfig* sharedConfig () const; + TDESharedConfig* sharedConfig () const; %End KIconLoader* iconLoader () const; diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip index 984804c..6082dab 100644 --- a/sip/tdecore/klockfile.sip +++ b/sip/tdecore/klockfile.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KLockFile : KShared +class KLockFile : TDEShared { %TypeHeaderCode #include <klockfile.h> @@ -34,7 +34,7 @@ class KLockFile : KShared public: - typedef KSharedPtr<KLockFile> Ptr; + typedef TDESharedPtr<KLockFile> Ptr; KLockFile (const TQString&); enum LockResult @@ -80,7 +80,7 @@ public: if (!sipCpp) return NULL; - KSharedPtr<KLockFile> *cPtr = new KSharedPtr<KLockFile> (*(KSharedPtr<KLockFile> *)sipCpp); + TDESharedPtr<KLockFile> *cPtr = new TDESharedPtr<KLockFile> (*(TDESharedPtr<KLockFile> *)sipCpp); KLockFile *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj); @@ -102,7 +102,7 @@ public: return 0; } - *sipCppPtr = new KSharedPtr<KLockFile> (cpp); + *sipCppPtr = new TDESharedPtr<KLockFile> (cpp); return 1; %End diff --git a/sip/tdecore/kmountpoint.sip b/sip/tdecore/kmountpoint.sip index a811b2e..76a6c85 100644 --- a/sip/tdecore/kmountpoint.sip +++ b/sip/tdecore/kmountpoint.sip @@ -26,7 +26,7 @@ %If ( KDE_3_2_0 - ) -class KMountPoint : KShared +class KMountPoint : TDEShared { %TypeHeaderCode #include <kmountpoint.h> @@ -34,7 +34,7 @@ class KMountPoint : KShared public: -//ig typedef KSharedPtr<KMountPoint> Ptr; +//ig typedef TDESharedPtr<KMountPoint> Ptr; //ig typedef TQValueList<KMountPoint::Ptr> List; public: @@ -81,7 +81,7 @@ private: if (!sipCpp) return NULL; - KSharedPtr<KMountPoint> *cPtr = new KSharedPtr<KMountPoint> (*(KSharedPtr<KMountPoint> *)sipCpp); + TDESharedPtr<KMountPoint> *cPtr = new TDESharedPtr<KMountPoint> (*(TDESharedPtr<KMountPoint> *)sipCpp); KMountPoint *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KMountPoint, sipTransferObj); @@ -103,7 +103,7 @@ private: return 0; } - *sipCppPtr = new KSharedPtr<KMountPoint> (cpp); + *sipCppPtr = new TDESharedPtr<KMountPoint> (cpp); return 1; %End diff --git a/sip/tdecore/ksharedptr.sip b/sip/tdecore/ksharedptr.sip index f6ca092..0a66253 100644 --- a/sip/tdecore/ksharedptr.sip +++ b/sip/tdecore/ksharedptr.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KShared +class TDEShared { %TypeHeaderCode #include <ksharedptr.h> @@ -32,14 +32,14 @@ class KShared public: - KShared (); - KShared (const KShared&); - void _KShared_ref (); - void _KShared_unref (); - int _KShared_count (); + TDEShared (); + TDEShared (const TDEShared&); + void _TDEShared_ref (); + void _TDEShared_unref (); + int _TDEShared_count (); protected: - ~KShared (); + ~TDEShared (); -}; // class KShared +}; // class TDEShared diff --git a/sip/tdecore/ktimezones.sip b/sip/tdecore/ktimezones.sip index b3ed9ea..1f9e612 100644 --- a/sip/tdecore/ktimezones.sip +++ b/sip/tdecore/ktimezones.sip @@ -26,7 +26,7 @@ %If ( KDE_3_5_0 - ) -class KTimezoneSource : KShared +class KTimezoneSource : TDEShared { %TypeHeaderCode #include <ktimezones.h> @@ -56,7 +56,7 @@ public: static const float UNKNOWN; static bool isValidLatitude (float); static bool isValidLongitude (float); - KTimezone (KSharedPtr<KTimezoneSource>, const TQString&, const TQString& = TQString (), float = KTimezone ::UNKNOWN , float = KTimezone ::UNKNOWN , const TQString& = TQString ()); + KTimezone (TDESharedPtr<KTimezoneSource>, const TQString&, const TQString& = TQString (), float = KTimezone ::UNKNOWN , float = KTimezone ::UNKNOWN , const TQString& = TQString ()); TQString name () const; TQString countryCode () const; float latitude () const; @@ -72,7 +72,7 @@ private: public: //force - typedef KSharedPtr<KTimezoneSource> TZSourcePtr; + typedef TDESharedPtr<KTimezoneSource> TZSourcePtr; //end }; // class KTimezone @@ -134,8 +134,8 @@ private: %If (KDE_3_5_0 - ) -%MappedType KSharedPtr<KTimezoneSource> -//converts KSharedPtr<KTimezoneSource> +%MappedType TDESharedPtr<KTimezoneSource> +//converts TDESharedPtr<KTimezoneSource> { %TypeHeaderCode #include <ksharedptr.h> @@ -148,7 +148,7 @@ private: if (!sipCpp) return NULL; - KSharedPtr<KTimezoneSource> *cPtr = new KSharedPtr<KTimezoneSource> (*(KSharedPtr<KTimezoneSource> *)sipCpp); + TDESharedPtr<KTimezoneSource> *cPtr = new TDESharedPtr<KTimezoneSource> (*(TDESharedPtr<KTimezoneSource> *)sipCpp); KTimezoneSource *cpp = cPtr->data (); PyObject *obj = sipConvertFromInstance (cpp, sipClass_KTimezoneSource, sipTransferObj); @@ -170,7 +170,7 @@ private: return 0; } - *sipCppPtr = new KSharedPtr<KTimezoneSource> (cpp); + *sipCppPtr = new TDESharedPtr<KTimezoneSource> (cpp); return 1; %End diff --git a/sip/tdecore/tdeconfig.sip b/sip/tdecore/tdeconfig.sip index c60c002..354bfa0 100644 --- a/sip/tdecore/tdeconfig.sip +++ b/sip/tdecore/tdeconfig.sip @@ -79,7 +79,7 @@ protected: %If ( KDE_3_2_0 - ) -class KSharedConfig : TDEConfig, KShared +class TDESharedConfig : TDEConfig, TDEShared { %TypeHeaderCode #include <tdeconfig.h> @@ -87,16 +87,16 @@ class KSharedConfig : TDEConfig, KShared public: -//ig typedef KSharedPtr<KSharedConfig> Ptr; +//ig typedef TDESharedPtr<TDESharedConfig> Ptr; public: - static KSharedConfig::Ptr openConfig (const TQString&, bool = 0, bool = 1); + static TDESharedConfig::Ptr openConfig (const TQString&, bool = 0, bool = 1); private: - KSharedConfig (const TQString&, bool, bool); - ~KSharedConfig (); + TDESharedConfig (const TQString&, bool, bool); + ~TDESharedConfig (); -}; // class KSharedConfig +}; // class TDESharedConfig %End @@ -192,8 +192,8 @@ private: %If (KDE_3_2_0 - ) -%MappedType KSharedConfig::Ptr -//converts KSharedConfig +%MappedType TDESharedConfig::Ptr +//converts TDESharedConfig { %TypeHeaderCode #include <ksharedptr.h> @@ -206,9 +206,9 @@ private: if (!sipCpp) return NULL; - KSharedPtr<KSharedConfig> *cPtr = new KSharedPtr<KSharedConfig> (*(KSharedPtr<KSharedConfig> *)sipCpp); - KSharedConfig *cpp = cPtr->data (); - PyObject *obj = sipConvertFromInstance (cpp, sipClass_KSharedConfig, sipTransferObj); + TDESharedPtr<TDESharedConfig> *cPtr = new TDESharedPtr<TDESharedConfig> (*(TDESharedPtr<TDESharedConfig> *)sipCpp); + TDESharedConfig *cpp = cPtr->data (); + PyObject *obj = sipConvertFromInstance (cpp, sipClass_TDESharedConfig, sipTransferObj); return obj; %End @@ -220,7 +220,7 @@ private: return PyInstance_Check(sipPy); int iserr = 0; - KSharedConfig *cpp = (KSharedConfig *)sipForceConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + TDESharedConfig *cpp = (TDESharedConfig *)sipForceConvertToType(sipPy, sipType_TDESharedConfig, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -228,7 +228,7 @@ private: return 0; } - *sipCppPtr = new KSharedPtr<KSharedConfig> (cpp); + *sipCppPtr = new TDESharedPtr<TDESharedConfig> (cpp); return 1; %End diff --git a/sip/tdecore/tdeconfigskeleton.sip b/sip/tdecore/tdeconfigskeleton.sip index 6e588c1..c36e13c 100644 --- a/sip/tdecore/tdeconfigskeleton.sip +++ b/sip/tdecore/tdeconfigskeleton.sip @@ -227,7 +227,7 @@ public: public: TDEConfigSkeleton (const TQString& = TQString ::null ); - TDEConfigSkeleton (KSharedConfig::Ptr); + TDEConfigSkeleton (TDESharedConfig::Ptr); void setDefaults (); void readConfig (); void writeConfig (); diff --git a/sip/tderesources/configpage.sip b/sip/tderesources/configpage.sip index 43efd25..26a6e0b 100644 --- a/sip/tderesources/configpage.sip +++ b/sip/tderesources/configpage.sip @@ -28,7 +28,7 @@ namespace KRES { -class ResourcePageInfo : KShared +class ResourcePageInfo : TDEShared { %TypeHeaderCode #include <configpage.h> diff --git a/sip/tdespell2/broker.sip b/sip/tdespell2/broker.sip index b506f3c..64ba38a 100644 --- a/sip/tdespell2/broker.sip +++ b/sip/tdespell2/broker.sip @@ -28,15 +28,15 @@ namespace KSpell2 { -class Broker : TQObject, KShared +class Broker : TQObject, TDEShared { %TypeHeaderCode #include <broker.h> %End public: - typedef KSharedPtr<Broker> Ptr; - static KSpell2::Broker* openBroker (KSharedConfig* = 0); + typedef TDESharedPtr<Broker> Ptr; + static KSpell2::Broker* openBroker (TDESharedConfig* = 0); public: KSpell2::DefaultDictionary* defaultDictionary () const; @@ -52,7 +52,7 @@ protected: void changed (); private: - Broker (KSharedConfig*); + Broker (TDESharedConfig*); }; // class Broker diff --git a/sip/tdespell2/settings.sip b/sip/tdespell2/settings.sip index 0c4692b..1459b90 100644 --- a/sip/tdespell2/settings.sip +++ b/sip/tdespell2/settings.sip @@ -50,10 +50,10 @@ public: TQStringList currentIgnoreList () const; bool ignore (const TQString&); void save (); - KSharedConfig* sharedConfig () const; + TDESharedConfig* sharedConfig () const; private: - Settings (KSpell2::Broker*, KSharedConfig*); + Settings (KSpell2::Broker*, TDESharedConfig*); }; // class Settings diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip index fc20a16..b5fe91c 100644 --- a/sip/tdeui/kaboutapplication.sip +++ b/sip/tdeui/kaboutapplication.sip @@ -161,7 +161,7 @@ protected: {sipName_KSelectAction, &sipClass_KSelectAction}, {sipName_KSelector, &sipClass_KSelector}, {sipName_KSeparator, &sipClass_KSeparator}, -// {sipName_KSharedPixmap, &sipClass_KSharedPixmap}, +// {sipName_TDESharedPixmap, &sipClass_TDESharedPixmap}, {sipName_KSqueezedTextLabel, &sipClass_KSqueezedTextLabel}, {sipName_KStatusBar, &sipClass_KStatusBar}, {sipName_KStatusBarLabel, &sipClass_KStatusBarLabel}, diff --git a/sip/tdeui/kpanelapplet.sip b/sip/tdeui/kpanelapplet.sip index f3fc116..fc6790d 100644 --- a/sip/tdeui/kpanelapplet.sip +++ b/sip/tdeui/kpanelapplet.sip @@ -80,7 +80,7 @@ public: TDEConfig* config () const; %If ( KDE_3_2_0 - ) - KSharedConfig::Ptr sharedConfig () const; + TDESharedConfig::Ptr sharedConfig () const; %End Type type () const; diff --git a/sip/tdeui/krootpixmap.sip b/sip/tdeui/krootpixmap.sip index 59b9088..a344414 100644 --- a/sip/tdeui/krootpixmap.sip +++ b/sip/tdeui/krootpixmap.sip @@ -65,7 +65,7 @@ signals: protected: virtual bool eventFilter (TQObject*, TQEvent*); -//ig virtual void updateBackground (KSharedPixmap*); +//ig virtual void updateBackground (TDESharedPixmap*); }; // class KRootPixmap diff --git a/sip/tdeui/ksharedpixmap.sip b/sip/tdeui/ksharedpixmap.sip index e9af80d..d1fd3b3 100644 --- a/sip/tdeui/ksharedpixmap.sip +++ b/sip/tdeui/ksharedpixmap.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KSharedPixmap : TQWidget, KPixmap +class TDESharedPixmap : TQWidget, KPixmap { %TypeHeaderCode #include <tqwidget.h> @@ -36,7 +36,7 @@ class KSharedPixmap : TQWidget, KPixmap public: - KSharedPixmap (); + TDESharedPixmap (); %If ( KDE_3_1_2 - ) bool loadFromShared (const TQString&, const TQRect& = TQRect ()); @@ -58,5 +58,5 @@ public: %End -}; // class KSharedPixmap +}; // class TDESharedPixmap |