Update after rename python extension module from python_tqt to PyTQt.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/3/head
Slávek Banko 1 year ago
parent d394f6a6cd
commit a635b7dc15
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -16,7 +16,7 @@
########################################################################### ###########################################################################
import sys import sys
from python_tqt.qt import * from PyTQt.qt import *
from tdecore import * from tdecore import *
from tdeui import * from tdeui import *

@ -15,7 +15,7 @@
# # # #
########################################################################### ###########################################################################
from python_tqt.qt import * from PyTQt.qt import *
from tdecore import * from tdecore import *
from tdeui import * from tdeui import *
import sys import sys

@ -15,7 +15,7 @@
# # # #
########################################################################### ###########################################################################
from python_tqt.qt import * from PyTQt.qt import *
from tdecore import * from tdecore import *
from tdeui import * from tdeui import *
from tdeio import * from tdeio import *

@ -15,7 +15,7 @@
# # # #
########################################################################### ###########################################################################
from python_tqt.qt import * from PyTQt.qt import *
from tdecore import * from tdecore import *
from tdeui import * from tdeui import *

@ -16,7 +16,7 @@
########################################################################### ###########################################################################
import sys import sys
from python_tqt.qt import * from PyTQt.qt import *
from tdecore import * from tdecore import *
from tdeui import * from tdeui import *
import tdedesigner import tdedesigner

@ -16,7 +16,7 @@
########################################################################### ###########################################################################
# Import the required Qt and KDE modules. # Import the required Qt and KDE modules.
from python_tqt.qt import * from PyTQt.qt import *
from tdeio import * from tdeio import *
from tdecore import * from tdecore import *
import os, time import os, time

@ -17,7 +17,7 @@
import os import os
import sys import sys
from python_tqt import pyqtconfig from PyTQt import pyqtconfig
from distutils.spawn import * from distutils.spawn import *
import traceback import traceback
@ -59,7 +59,7 @@ def CompileUI(ui_file_name, py_file_name=None, kde=False):
input = open(tmp_file_name, 'r') input = open(tmp_file_name, 'r')
output = open(py_file_name, 'w') output = open(py_file_name, 'w')
for line in input.readlines(): for line in input.readlines():
if kde and string.strip(line) == 'from python_tqt.qt import *': if kde and string.strip(line) == 'from PyTQt.qt import *':
output.write(line) output.write(line)
output.write('from tdecore import *\nfrom tdeui import *\n\n') output.write('from tdecore import *\nfrom tdeui import *\n\n')
elif kde and string.find(line, " = KDatePicker(") != -1: elif kde and string.find(line, " = KDatePicker(") != -1:

@ -638,9 +638,9 @@ class BuildKControlModule(Command):
# PyQt dir # PyQt dir
if self.pyqt_dir is None: if self.pyqt_dir is None:
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path) self.pyqt_dir = FindFileInPaths("PyTQt", sys.path)
if self.pyqt_dir is None: if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt') self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'PyTQt')
if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None): if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
self.announce("Using %s for PyQt modules" % self.pyqt_dir) self.announce("Using %s for PyQt modules" % self.pyqt_dir)
@ -948,7 +948,7 @@ static TDECModule* return_instance( TQWidget *parent, const char *name ) {
// Inject a helper function // Inject a helper function
TQString bridge = TQString("import sip_tqt\n" TQString bridge = TQString("import sip_tqt\n"
"from python_tqt import qt\n" "from PyTQt import qt\n"
"def kcontrol_bridge_" FACTORY "(parent,name):\n" "def kcontrol_bridge_" FACTORY "(parent,name):\n"
" if parent!=0:\n" " if parent!=0:\n"
" wparent = sip_tqt.wrapinstance(parent,qt.TQWidget)\n" " wparent = sip_tqt.wrapinstance(parent,qt.TQWidget)\n"
@ -1589,9 +1589,9 @@ class BuildTdeioslave(Command):
# PyQt dir # PyQt dir
if self.pyqt_dir is None: if self.pyqt_dir is None:
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path) self.pyqt_dir = FindFileInPaths("PyTQt", sys.path)
if self.pyqt_dir is None: if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt') self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'PyTQt')
if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None): if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
self.announce("Using %s for PyQt modules" % self.pyqt_dir) self.announce("Using %s for PyQt modules" % self.pyqt_dir)
@ -2033,7 +2033,7 @@ class CheckPyQt(Command):
self.announce("Found Qt version %s." % qtver) self.announce("Found Qt version %s." % qtver)
try: try:
self.announce("Checking for a working PyQt...") self.announce("Checking for a working PyQt...")
from python_tqt import qt from PyTQt import qt
self.announce(" ...PyQt is working") self.announce(" ...PyQt is working")
except: except:
raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working." raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working."

Loading…
Cancel
Save