summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-01-13 14:47:47 +0100
committerSlávek Banko <slavek.banko@axis.cz>2022-01-13 14:51:36 +0100
commitb9e2f5ab2c2708cea16bc014c5deefd9b22a474d (patch)
tree1ea0a5c80587821a6586995e35fbf73535627e48
parent8f5d69e802d95951848cee574dbf343d2847352c (diff)
downloadtde-guidance-b9e2f5ab.tar.gz
tde-guidance-b9e2f5ab.zip
Update for renamed sip-tqt.HEADmaster
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--wineconfig/kcm_wineconfig.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/wineconfig/kcm_wineconfig.cpp b/wineconfig/kcm_wineconfig.cpp
index cc478cf..041e8e4 100644
--- a/wineconfig/kcm_wineconfig.cpp
+++ b/wineconfig/kcm_wineconfig.cpp
@@ -16,7 +16,7 @@
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <tqstring.h>
-#include <sip.h>
+#include <sip-tqt.h>
#define MODULE_DIR "/root/TEMP5/tde-guidance-trinity-14.0.0-r131/debian/tmp/opt/trinity/share/apps/guidance"
#define EXTRA_MODULE_DIR "None"
@@ -75,19 +75,15 @@ static TDECModule* return_instance( TQWidget *parent, const char *name ) {
}
// Inject a helper function
- TQString bridge = TQString("from sip4_tqt import sip\n"
+ TQString bridge = TQString("import sip_tqt\n"
"from python_tqt import qt\n"
"def kcontrol_bridge_" FACTORY "(parent,name):\n"
" if parent!=0:\n"
-#if SIP_VERSION >= 0x040200
- " wparent = sip.wrapinstance(parent,qt.TQWidget)\n"
-#else
- " wparent = sip.wrapinstance(parent,'TQWidget')\n"
-#endif
+ " wparent = sip_tqt.wrapinstance(parent,qt.TQWidget)\n"
" else:\n"
" wparent = None\n"
" inst = " FACTORY "(wparent, name)\n"
- " return (inst,sip.unwrapinstance(inst))\n");
+ " return (inst,sip_tqt.unwrapinstance(inst))\n");
PyRun_String(bridge.latin1(),Py_file_input,PyModule_GetDict(pyModule),PyModule_GetDict(pyModule));
// Get the Python module's factory function.