summaryrefslogtreecommitdiffstats
path: root/sip
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 12:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 12:59:34 -0600
commit62e707662a0943c63abdd7df358e323c95a97eda (patch)
treec0025f3f8249724efaa6519b0c9b9b6fba647838 /sip
parent352b2ef6c06332062d35211d7f49942315d2f36a (diff)
downloadpytde-62e707662a0943c63abdd7df358e323c95a97eda.tar.gz
pytde-62e707662a0943c63abdd7df358e323c95a97eda.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'sip')
-rw-r--r--sip/tdecore/kaccel.sip2
-rw-r--r--sip/tdecore/kbufferedio.sip6
2 files changed, 4 insertions, 4 deletions
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index fbf0f96..c6940e6 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -121,7 +121,7 @@ public:
{sipName_TDEApplication, &sipClass_TDEApplication},
{sipName_KAsyncIO, &sipClass_KAsyncIO},
{sipName_KAudioPlayer, &sipClass_KAudioPlayer},
- {sipName_KBufferedIO, &sipClass_KBufferedIO},
+ {sipName_TDEBufferedIO, &sipClass_TDEBufferedIO},
#if TDE_VERSION >= 0x030100
{sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer},
#endif
diff --git a/sip/tdecore/kbufferedio.sip b/sip/tdecore/kbufferedio.sip
index bb79121..e444b14 100644
--- a/sip/tdecore/kbufferedio.sip
+++ b/sip/tdecore/kbufferedio.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KBufferedIO : KAsyncIO
+class TDEBufferedIO : KAsyncIO
{
%TypeHeaderCode
#include <kbufferedio.h>
@@ -32,7 +32,7 @@ class KBufferedIO : KAsyncIO
protected:
- KBufferedIO ();
+ TDEBufferedIO ();
public:
@@ -69,5 +69,5 @@ protected:
protected:
//igx virtual void virtual_hook (int, void*);
-}; // class KBufferedIO
+}; // class TDEBufferedIO