diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:31:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:31:20 -0600 |
commit | 1244eb7c0136985569a71f525ef5bcee08a431c4 (patch) | |
tree | b611e304794fa1b9ec4cce9dd762e572d301aa4e /sip/tdecore/kaccel.sip | |
parent | 44249e7b6a1264a1d56b6ac085fa797d831d9bb2 (diff) | |
download | pytde-1244eb7c0136985569a71f525ef5bcee08a431c4.tar.gz pytde-1244eb7c0136985569a71f525ef5bcee08a431c4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore/kaccel.sip')
-rw-r--r-- | sip/tdecore/kaccel.sip | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip index 23f7f75..f054ef1 100644 --- a/sip/tdecore/kaccel.sip +++ b/sip/tdecore/kaccel.sip @@ -123,21 +123,21 @@ public: {sipName_KAudioPlayer, &sipClass_KAudioPlayer}, {sipName_KBufferedIO, &sipClass_KBufferedIO}, #if TDE_VERSION >= 0x030100 - {sipName_KClipboardSynchronizer, &sipClass_KClipboardSynchronizer}, + {sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer}, #endif {sipName_KCompletion, &sipClass_KCompletion}, {sipName_KConfig, &sipClass_KConfig}, {sipName_KConfigBase, &sipClass_KConfigBase}, {sipName_KConfigGroup, &sipClass_KConfigGroup}, {sipName_KDesktopFile, &sipClass_KDesktopFile}, - {sipName_KGlobalAccel, &sipClass_KGlobalAccel}, + {sipName_TDEGlobalAccel, &sipClass_TDEGlobalAccel}, {sipName_KLibFactory, &sipClass_KLibFactory}, {sipName_KLibLoader, &sipClass_KLibLoader}, {sipName_KLibrary, &sipClass_KLibrary}, {sipName_KMultipleDrag, &sipClass_KMultipleDrag}, {sipName_KProcIO, &sipClass_KProcIO}, - {sipName_KProcess, &sipClass_KProcess}, - {sipName_KProcessController, &sipClass_KProcessController}, + {sipName_TDEProcess, &sipClass_TDEProcess}, + {sipName_TDEProcessController, &sipClass_TDEProcessController}, {sipName_KServerSocket, &sipClass_KServerSocket}, {sipName_KShellProcess, &sipClass_KShellProcess}, {sipName_KSimpleConfig, &sipClass_KSimpleConfig}, |