diff options
author | Timothy Pearson <[email protected]> | 2013-01-31 00:23:17 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-31 00:23:17 -0600 |
commit | 8f78d8aa940d3d1cf41e279bf0174bc9b95d759a (patch) | |
tree | ecb8eb32e27d854a4342840ca564916c65be998c /sip/tdecore | |
parent | c64839178e70887ed52b276b23ba4ca8a897e4b2 (diff) | |
download | pytde-8f78d8aa940d3d1cf41e279bf0174bc9b95d759a.tar.gz pytde-8f78d8aa940d3d1cf41e279bf0174bc9b95d759a.zip |
Rename KShared
Diffstat (limited to 'sip/tdecore')
-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 |
8 files changed, 39 insertions, 39 deletions
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 (); |