diff options
| -rwxr-xr-x | app_templates/kcontrol_module/src/kcontrol_module.py | 2 | ||||
| -rwxr-xr-x | app_templates/kdeapp/src/kdeapp.py | 2 | ||||
| -rw-r--r-- | app_templates/kdeapp/src/kdeappview.py | 2 | ||||
| -rw-r--r-- | app_templates/kdeapp/src/prefdialog.py | 2 | ||||
| -rwxr-xr-x | app_templates/kdeutility/src/kdeutility.py | 2 | ||||
| -rwxr-xr-x | app_templates/tdeioslave/src/tdeioslave.py | 2 | ||||
| -rw-r--r-- | src/qtuicompiler.py | 4 | ||||
| -rw-r--r-- | src/tdedistutils.py | 12 |
8 files changed, 14 insertions, 14 deletions
diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py index 5dc5ed9..f5cf394 100755 --- a/app_templates/kcontrol_module/src/kcontrol_module.py +++ b/app_templates/kcontrol_module/src/kcontrol_module.py @@ -16,7 +16,7 @@ ########################################################################### import sys -from python_tqt.qt import * +from PyTQt.qt import * from tdecore import * from tdeui import * diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py index 11ca1d1..842d283 100755 --- a/app_templates/kdeapp/src/kdeapp.py +++ b/app_templates/kdeapp/src/kdeapp.py @@ -15,7 +15,7 @@ # # ########################################################################### -from python_tqt.qt import * +from PyTQt.qt import * from tdecore import * from tdeui import * import sys diff --git a/app_templates/kdeapp/src/kdeappview.py b/app_templates/kdeapp/src/kdeappview.py index c20fa84..92ec6df 100644 --- a/app_templates/kdeapp/src/kdeappview.py +++ b/app_templates/kdeapp/src/kdeappview.py @@ -15,7 +15,7 @@ # # ########################################################################### -from python_tqt.qt import * +from PyTQt.qt import * from tdecore import * from tdeui import * from tdeio import * diff --git a/app_templates/kdeapp/src/prefdialog.py b/app_templates/kdeapp/src/prefdialog.py index c13d6c6..ef8ec0f 100644 --- a/app_templates/kdeapp/src/prefdialog.py +++ b/app_templates/kdeapp/src/prefdialog.py @@ -15,7 +15,7 @@ # # ########################################################################### -from python_tqt.qt import * +from PyTQt.qt import * from tdecore import * from tdeui import * diff --git a/app_templates/kdeutility/src/kdeutility.py b/app_templates/kdeutility/src/kdeutility.py index 4672109..6b34826 100755 --- a/app_templates/kdeutility/src/kdeutility.py +++ b/app_templates/kdeutility/src/kdeutility.py @@ -16,7 +16,7 @@ ########################################################################### import sys -from python_tqt.qt import * +from PyTQt.qt import * from tdecore import * from tdeui import * import tdedesigner diff --git a/app_templates/tdeioslave/src/tdeioslave.py b/app_templates/tdeioslave/src/tdeioslave.py index 6fe7602..4146b82 100755 --- a/app_templates/tdeioslave/src/tdeioslave.py +++ b/app_templates/tdeioslave/src/tdeioslave.py @@ -16,7 +16,7 @@ ########################################################################### # Import the required Qt and KDE modules. -from python_tqt.qt import * +from PyTQt.qt import * from tdeio import * from tdecore import * import os, time diff --git a/src/qtuicompiler.py b/src/qtuicompiler.py index 7e196df..dfca67c 100644 --- a/src/qtuicompiler.py +++ b/src/qtuicompiler.py @@ -17,7 +17,7 @@ import os import sys -from python_tqt import pyqtconfig +from PyTQt import pyqtconfig from distutils.spawn import * import traceback @@ -59,7 +59,7 @@ def CompileUI(ui_file_name, py_file_name=None, kde=False): input = open(tmp_file_name, 'r') output = open(py_file_name, 'w') 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('from tdecore import *\nfrom tdeui import *\n\n') elif kde and string.find(line, " = KDatePicker(") != -1: diff --git a/src/tdedistutils.py b/src/tdedistutils.py index f5e034c..06a6d83 100644 --- a/src/tdedistutils.py +++ b/src/tdedistutils.py @@ -638,9 +638,9 @@ class BuildKControlModule(Command): # PyQt dir 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: - 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): raise SystemExit, "Failed to find the PyQt directory: %s" % 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 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" " if parent!=0:\n" " wparent = sip_tqt.wrapinstance(parent,qt.TQWidget)\n" @@ -1589,9 +1589,9 @@ class BuildTdeioslave(Command): # PyQt dir 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: - 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): raise SystemExit, "Failed to find the PyQt directory: %s" % 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) try: self.announce("Checking for a working PyQt...") - from python_tqt import qt + from PyTQt import qt self.announce(" ...PyQt is working") except: raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working." |