diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:48:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:48:05 -0600 |
commit | 4f9367a19011b727951632ba7c8d9539c72be75d (patch) | |
tree | 1c243c83ea93d66baaea66f51540b5b2ee2bb3e4 /sip/tdecore/klockfile.sip | |
parent | 11ce0e9ead6ca61215b1bafdf6f4fb2151018c77 (diff) | |
download | pytde-4f9367a19011b727951632ba7c8d9539c72be75d.tar.gz pytde-4f9367a19011b727951632ba7c8d9539c72be75d.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore/klockfile.sip')
-rw-r--r-- | sip/tdecore/klockfile.sip | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip index 6082dab..fe3bc95 100644 --- a/sip/tdecore/klockfile.sip +++ b/sip/tdecore/klockfile.sip @@ -26,7 +26,7 @@ %If ( KDE_3_3_0 - ) -class KLockFile : TDEShared +class TDELockFile : TDEShared { %TypeHeaderCode #include <klockfile.h> @@ -34,8 +34,8 @@ class KLockFile : TDEShared public: - typedef TDESharedPtr<KLockFile> Ptr; - KLockFile (const TQString&); + typedef TDESharedPtr<TDELockFile> Ptr; + TDELockFile (const TQString&); enum LockResult { @@ -52,22 +52,22 @@ public: LockForce }; - KLockFile::LockResult lock (int = 0); + TDELockFile::LockResult lock (int = 0); bool isLocked () const; void unlock (); int staleTime () const; void setStaleTime (int); bool getLockInfo (int& /Out/, TQString& /Out/, TQString& /Out/); -}; // class KLockFile +}; // class TDELockFile %End %If (KDE_3_3_0 - ) -%MappedType KLockFile::Ptr -//converts KLockFile +%MappedType TDELockFile::Ptr +//converts TDELockFile { %TypeHeaderCode #include <ksharedptr.h> @@ -80,9 +80,9 @@ public: if (!sipCpp) return NULL; - TDESharedPtr<KLockFile> *cPtr = new TDESharedPtr<KLockFile> (*(TDESharedPtr<KLockFile> *)sipCpp); - KLockFile *cpp = cPtr->data (); - PyObject *obj = sipConvertFromInstance (cpp, sipClass_KLockFile, sipTransferObj); + TDESharedPtr<TDELockFile> *cPtr = new TDESharedPtr<TDELockFile> (*(TDESharedPtr<TDELockFile> *)sipCpp); + TDELockFile *cpp = cPtr->data (); + PyObject *obj = sipConvertFromInstance (cpp, sipClass_TDELockFile, sipTransferObj); return obj; %End @@ -94,7 +94,7 @@ public: return PyInstance_Check(sipPy); int iserr = 0; - KLockFile *cpp = (KLockFile *)sipForceConvertToType(sipPy, sipType_KLockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); if (iserr) { @@ -102,7 +102,7 @@ public: return 0; } - *sipCppPtr = new TDESharedPtr<KLockFile> (cpp); + *sipCppPtr = new TDESharedPtr<TDELockFile> (cpp); return 1; %End |