diff --git a/configure.py b/configure.py
index 54f4e53..242bd0e 100644
--- a/configure.py
+++ b/configure.py
@@ -37,9 +37,9 @@ except:
sys.exit (-1)
try:
- from PyTQt import pyqtconfig
+ from PyTQt import pytqtconfig
except:
- sip_tqt_config.error ("Can't find pyqtconfig.py in sys.path - exiting")
+ sip_tqt_config.error ("Can't find pytqtconfig.py in sys.path - exiting")
topsrcdir = os.path.dirname(os.path.abspath(__file__))
has_objdir = topsrcdir != os.path.abspath(os.path.curdir)
@@ -63,7 +63,7 @@ def srcPath(filename):
# Get the SIP-TQt configuration.
sipcfg = sip_tqt_config.Configuration()
-pyqtcfg = pyqtconfig.Configuration ()
+pytqtcfg = pytqtconfig.Configuration ()
# Initialise the globals.
pytde_version = 0x031006
@@ -75,8 +75,8 @@ kde_version_extra = None
kde_max_version = 0x030503
sip_min_v4_version = 0x040900
-qt_min_version = 0x030200
-pyqt_min_version = 0x031000
+tqt_min_version = 0x030200
+pytqt_min_version = 0x031000
kde_sip_flags = []
@@ -100,22 +100,22 @@ pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources
"tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
pytde_imports = {
- "dcop": ["PyTQt.qt"],
- "tdecore": ["PyTQt.qt", "dcop"],
-# "tdesu": ["PyTQt.qt", "dcop", "tdecore"],
- "tdefx": ["PyTQt.qt", "dcop", "tdecore"],
- "tdeui": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx"],
- "tdeio": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
- "tderesources": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdeabc": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
- "tdeutils": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdefile": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdeparts": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdehtml": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"],
- "tdespell": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"],
- "tdeprint": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
- "tdemdi": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"],
- "tdespell2": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
+ "dcop": ["PyTQt.tqt"],
+ "tdecore": ["PyTQt.tqt", "dcop"],
+# "tdesu": ["PyTQt.tqt", "dcop", "tdecore"],
+ "tdefx": ["PyTQt.tqt", "dcop", "tdecore"],
+ "tdeui": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx"],
+ "tdeio": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"],
+ "tderesources": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdeabc": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
+ "tdeutils": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdefile": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdeparts": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdehtml": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"],
+ "tdespell": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"],
+ "tdeprint": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"],
+ "tdemdi": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"],
+ "tdespell2": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"]
}
kde_includes = {
@@ -202,20 +202,20 @@ def init_and_check_sanity ():
sipcfg.error("This version of PyKDE requires SIP-TQt v%s or later" % sipcfg.version_to_string(minv))
# Check SIP-TQt has TQt support enabled and check version
- if pyqtcfg.qt_version == 0:
+ if pytqtcfg.tqt_version == 0:
sip_tqt_config.error("SIP-TQt has been built with TQt support disabled.")
- if pyqtcfg.qt_version < qt_min_version:
+ if pytqtcfg.tqt_version < tqt_min_version:
sip_tqt_config.error("SIP-TQt has been built with an unsupported TQt version (%s)"\
- % sipcfg.version_to_string (sipcfg.qt_version))
+ % sipcfg.version_to_string (sipcfg.tqt_version))
# Check PyTQt built with libtqt-mt
- if pyqtcfg.qt_threaded == 0:
+ if pytqtcfg.tqt_threaded == 0:
sip_tqt_config.error ("PyKDE requires a threaded TQt version (libtqt-mt)")
# Check PyTQt version
- if pyqtcfg.pyqt_version < pyqt_min_version:
+ if pytqtcfg.pytqt_version < pytqt_min_version:
sipcfg.error("This version of PyKDE requires PyTQt v%s or later"\
- % pyqtcfg.version_to_string(pyqtcfg.pyqt_version))
+ % pytqtcfg.version_to_string(pytqtcfg.pytqt_version))
# find the libs, includes, and version info
check_kde_installation ()
@@ -262,12 +262,12 @@ def inform_user(stage):
sip_tqt_config.inform ("sip-tqt version is %s (%s)" % (sipcfg.sip_version_str,
sip_tqt_config.version_to_string (sipcfg.sip_version)))
print()
- sip_tqt_config.inform ("TQt directory is %s" % pyqtcfg.qt_dir)
- sip_tqt_config.inform ("TQt version is %s" % sip_tqt_config.version_to_string (pyqtcfg.qt_version))
+ sip_tqt_config.inform ("TQt directory is %s" % pytqtcfg.tqt_dir)
+ sip_tqt_config.inform ("TQt version is %s" % sip_tqt_config.version_to_string (pytqtcfg.tqt_version))
print()
- sip_tqt_config.inform ("PyTQt directory is %s" % pyqtcfg.pyqt_sip_dir)
- sip_tqt_config.inform ("PyTQt version is %s (%s)" % (pyqtcfg.pyqt_version_str,
- sip_tqt_config.version_to_string (pyqtcfg.pyqt_version)))
+ sip_tqt_config.inform ("PyTQt directory is %s" % pytqtcfg.pytqt_sip_dir)
+ sip_tqt_config.inform ("PyTQt version is %s (%s)" % (pytqtcfg.pytqt_version_str,
+ sip_tqt_config.version_to_string (pytqtcfg.pytqt_version)))
print()
elif stage == 1:
@@ -524,7 +524,7 @@ def set_sip_flags():
check_distribution ()
- kde_sip_flags.append (pyqtcfg.pyqt_qt_sip_flags)
+ kde_sip_flags.append (pytqtcfg.pytqt_tqt_sip_flags)
kdetags = {
0x030001: "KDE_3_0_0",
@@ -622,12 +622,12 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
argv.append("-I")
argv.append(srcPath("sip"))
- pyqtInclPathSeen = 0
+ pytqtInclPathSeen = 0
for mod in pytde_imports [mname]:
- if mod.find("PyTQt.q") == 0 and not pyqtInclPathSeen:
+ if mod.find("PyTQt.tq") == 0 and not pytqtInclPathSeen:
argv.append ("-I")
- argv.append (pyqtcfg.pyqt_sip_dir)
- pyqtInclPathSeen = 1
+ argv.append (pytqtcfg.pytqt_sip_dir)
+ pytqtInclPathSeen = 1
elif mod == "dcop" or mod.find("k") == 0 or mod.find("tde") == 0:
subdir = os.path.join(srcPath("sip"), mod)
@@ -697,12 +697,12 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
installs.append([sipfiles, os.path.join(opt_pytdesipdir, mname)])
makefile = sip_tqt_config.SIPModuleMakefile(
- configuration = pyqtcfg,
+ configuration = pytqtcfg,
build_file = mname + ".sbf",
dir = mname,
install_dir = opt_pytdemoddir,
installs = installs,
- qt = 1,
+ tqt = 1,
opengl = opengl,
warnings = warnings,
static = opt_static,
@@ -787,7 +787,7 @@ def create_makefiles():
sip_tqt_config.inform("Creating top level Makefile...")
sip_tqt_config.ParentMakefile(
- configuration = pyqtcfg,
+ configuration = pytqtcfg,
subdirs = subdirs,
installs= [("pytdeconfig.py", opt_pytdemoddir), (srcPath("contrib/tdepyuic"), opt_tdebasedir + "/bin")]
).generate()
diff --git a/contrib/tdepyuic b/contrib/tdepyuic
index 48444a8..e9acd45 100755
--- a/contrib/tdepyuic
+++ b/contrib/tdepyuic
@@ -134,7 +134,7 @@ def doPyuic ():
buff = m.readlines ()
for line in buff:
- if addImport and (line.strip() == 'from PyTQt.qt import *'):
+ if addImport and (line.strip() == 'from PyTQt.tqt import *'):
n.write (line)
addimport (n)
elif addApp and (line.strip() == 'a = TQApplication(sys.argv)'):
diff --git a/doc/install.html b/doc/install.html
index 7c405a5..268ace6 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -37,7 +37,7 @@ sip must be installed. sip is the bindings code generator and run-time lib for P
PyTQt
PyTQt must be installed Just as KDE depends on TQt, PyKDE depends on PyTQt. If you don't already have
-PyTQt installed, you can get it here
+PyTQt installed, you can get it here
NOTE: sip, PyTQt, and PyKDE must be compatible versions (the PyKDE build script will test
@@ -55,7 +55,7 @@ These files only work with KDE and TQt 3.x.x - they don't work with TQt4 or the
If PyTQt was installed from an RPM ---
If you have installed sip and PyTQt from binaries, to build PyKDE you must have
-the sipconfig.py and pyqtconfig.py files (suitable for your environment) installed. These
+the sipconfig.py and pytqtconfig.py files (suitable for your environment) installed. These
are in the same location as the PyTQt files (usually python/site-packages). These config
files are generated automatically if you build/compile sip and PyTQt from source.
diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index d9436fc..faec09a 100644
--- a/examples/example_dcopexport.py
+++ b/examples/example_dcopexport.py
@@ -34,7 +34,7 @@ copyright holder.
# which was written by Torben Weis and Julian Rockey
import sys
-from PyTQt.qt import TQString, TQStringList
+from PyTQt.tqt import TQString, TQStringList
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from dcopexport import DCOPExObj
@@ -94,11 +94,11 @@ class DeadParrotObject (DCOPExObj):
"a stiff", "bereft of life", "rests in peace", "metabolic processes are now history",
"off the twig", "kicked the bucket", "shuffled off his mortal coil",
"run down his curtain", "joined the bleedin' choir invisible", "THIS IS AN EX-PARROT"]
- qadjList = TQStringList ()
+ tqadjList = TQStringList ()
for adj in adjList:
- qadjList.append (adj)
+ tqadjList.append (adj)
- return qadjList
+ return tqadjList
description = b"DCOP server template"
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index d019780..96df963 100644
--- a/examples/example_dcopext.py
+++ b/examples/example_dcopext.py
@@ -28,15 +28,15 @@ copyright holder.
"""
import sys, time
-from PyTQt.qt import TQString, TQCString
+from PyTQt.tqt import TQString, TQCString
import dcop
import dcopext
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
def getAnyApplication (client, appName):
- for qcstring_app in client.registeredApplications ():
- app = str (qcstring_app)
+ for tqcstring_app in client.registeredApplications ():
+ app = str (tqcstring_app)
if app == appName or app.startswith (appName + "-"):
print(app)
print()
diff --git a/examples/menudemo.py b/examples/menudemo.py
index 33960a2..0e4ddf6 100644
--- a/examples/menudemo.py
+++ b/examples/menudemo.py
@@ -37,7 +37,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
+from PyTQt.tqt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEIcon, TDEIconLoader, TDEShortcut
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEToggleAction, TDEFontSizeAction, TDEFontAction, TDERadioAction,\
diff --git a/examples/mimetype.py b/examples/mimetype.py
index 26fbe7f..9e615a8 100644
--- a/examples/mimetype.py
+++ b/examples/mimetype.py
@@ -37,7 +37,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
+from PyTQt.tqt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
from tdeui import TDEMainWindow, KTabCtl, TDEListBox
diff --git a/examples/pyTDEHTMLPart.py b/examples/pyTDEHTMLPart.py
index 333247d..187cad6 100644
--- a/examples/pyTDEHTMLPart.py
+++ b/examples/pyTDEHTMLPart.py
@@ -43,7 +43,7 @@ lifted from the TDE classref.
# If you import more classes, don't forget to add them here (some of these
# are extras/not used)
-from PyTQt.qt import TQString, TQStringList
+from PyTQt.tqt import TQString, TQStringList
from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, TDEAboutData, BarIcon, KLibLoader
from tdeui import TDEMainWindow, KMessageBox, TDEAction, KStdAction, KKeyDialog, KEditToolbar
from tdeio import TDETrader
@@ -135,14 +135,14 @@ class pyPartsMW (KParts.MainWindow):
res = KMessageBox.warningYesNoCancel(self,\
i18n("Save changes to Document?
(Does not make sense, we know, but it is just a programming example :-)"))
if res == KMessageBox.Yes:
- #// save document here. If saving fails, return False
- return True
+ #// save document here. If saving fails, return False
+ return True
elif res == KMessageBox.No:
return True
else: #// cancel
- return False
+ return False
def queryExit(self):
#// this slot is invoked in addition when the *last* window is going
diff --git a/examples/pytde-sampler/basic_widgets/__init__.py b/examples/pytde-sampler/basic_widgets/__init__.py
index 014db50..c90b359 100644
--- a/examples/pytde-sampler/basic_widgets/__init__.py
+++ b/examples/pytde-sampler/basic_widgets/__init__.py
@@ -4,7 +4,7 @@ iconName = 'about_kde'
helpText = """TDE provides a large set of basic widgets for application use.
Select the children of this item to see for yourself."""
-from PyTQt.qt import TQFrame, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQVBoxLayout
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/basic_widgets/datepicker.py b/examples/pytde-sampler/basic_widgets/datepicker.py
index 30431fc..467a96a 100644
--- a/examples/pytde-sampler/basic_widgets/datepicker.py
+++ b/examples/pytde-sampler/basic_widgets/datepicker.py
@@ -1,5 +1,5 @@
-from PyTQt.qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL, TQLabel, TQSizePolicy, TQt
-from PyTQt.qttable import TQTable
+from PyTQt.tqt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL, TQLabel, TQSizePolicy, TQt
+from PyTQt.tqttable import TQTable
from tdeui import KTextEdit, KDatePicker, KDateWidget
diff --git a/examples/pytde-sampler/basic_widgets/historycombo.py b/examples/pytde-sampler/basic_widgets/historycombo.py
index bfca05e..a43e8a9 100644
--- a/examples/pytde-sampler/basic_widgets/historycombo.py
+++ b/examples/pytde-sampler/basic_widgets/historycombo.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQStringList, TQLabel, \
+from PyTQt.tqt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQStringList, TQLabel, \
SIGNAL, SLOT
from tdeui import KHistoryCombo, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/__init__.py b/examples/pytde-sampler/dialogs/__init__.py
index caab63d..50d4522 100644
--- a/examples/pytde-sampler/dialogs/__init__.py
+++ b/examples/pytde-sampler/dialogs/__init__.py
@@ -6,7 +6,7 @@ helpText = ("TDE provides a convenient set of dialog boxes for application use.
"Select the children of this item to see for yourself.")
-from PyTQt.qt import TQFrame, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQVBoxLayout
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/dialogs/about/__init__.py b/examples/pytde-sampler/dialogs/about/__init__.py
index 9d0092f..1442308 100644
--- a/examples/pytde-sampler/dialogs/about/__init__.py
+++ b/examples/pytde-sampler/dialogs/about/__init__.py
@@ -5,7 +5,7 @@ helpText = ("TDE has multiple dialog types to display information about your "
"applicaiton and environment. They provide a tremendous amount of functionality "
"and consistency. They're easy to use, and they're good for the environment!")
-from PyTQt.qt import TQFrame, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQVBoxLayout
from tdeui import KTextEdit
class MainFrame(TQFrame):
diff --git a/examples/pytde-sampler/dialogs/about/aboutapp.py b/examples/pytde-sampler/dialogs/about/aboutapp.py
index 4584107..737fe57 100644
--- a/examples/pytde-sampler/dialogs/about/aboutapp.py
+++ b/examples/pytde-sampler/dialogs/about/aboutapp.py
@@ -1,7 +1,7 @@
iconName = 'about_kde'
labelText = 'TDEAboutApplication'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import TDEAboutApplication, KPushButton, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/about/abouttde.py b/examples/pytde-sampler/dialogs/about/abouttde.py
index 43e354f..c48e83f 100644
--- a/examples/pytde-sampler/dialogs/about/abouttde.py
+++ b/examples/pytde-sampler/dialogs/about/abouttde.py
@@ -1,7 +1,7 @@
iconName = 'about_kde'
labelText = 'TDEAboutTDE'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import TDEAboutKDE, KPushButton, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/bugreport.py b/examples/pytde-sampler/dialogs/bugreport.py
index 74fce7e..4d37a8c 100644
--- a/examples/pytde-sampler/dialogs/bugreport.py
+++ b/examples/pytde-sampler/dialogs/bugreport.py
@@ -6,7 +6,7 @@ labelText = 'KBugReport'
##~ specifies what we want.
##~ docItemName = 'KBugReport'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import TDEAboutDialog, KPushButton, KBugReport, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/color.py b/examples/pytde-sampler/dialogs/color.py
index ea567e2..8c87162 100644
--- a/examples/pytde-sampler/dialogs/color.py
+++ b/examples/pytde-sampler/dialogs/color.py
@@ -2,7 +2,7 @@ iconName = 'colorize'
labelText = 'KColorDialog'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KColorDialog, KColorPatch, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/config.py b/examples/pytde-sampler/dialogs/config.py
index f0338d4..d086b28 100644
--- a/examples/pytde-sampler/dialogs/config.py
+++ b/examples/pytde-sampler/dialogs/config.py
@@ -1,5 +1,5 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQString
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQString
from tdecore import i18n, TDEConfigSkeleton
from tdeui import KPushButton, TDEConfigDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/edfind.py b/examples/pytde-sampler/dialogs/edfind.py
index aff61cb..5fa8155 100644
--- a/examples/pytde-sampler/dialogs/edfind.py
+++ b/examples/pytde-sampler/dialogs/edfind.py
@@ -1,5 +1,5 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
from tdecore import i18n
from tdeui import KPushButton, KEdFind, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/edreplace.py b/examples/pytde-sampler/dialogs/edreplace.py
index 31b03b9..249ca42 100644
--- a/examples/pytde-sampler/dialogs/edreplace.py
+++ b/examples/pytde-sampler/dialogs/edreplace.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
from tdecore import i18n
from tdeui import KPushButton, KEdReplace, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/font.py b/examples/pytde-sampler/dialogs/font.py
index 298f44f..7846eb6 100644
--- a/examples/pytde-sampler/dialogs/font.py
+++ b/examples/pytde-sampler/dialogs/font.py
@@ -1,5 +1,5 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
from tdecore import i18n
from tdeui import KPushButton, TDEFontDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/input.py b/examples/pytde-sampler/dialogs/input.py
index 4925a35..a297e37 100644
--- a/examples/pytde-sampler/dialogs/input.py
+++ b/examples/pytde-sampler/dialogs/input.py
@@ -1,7 +1,7 @@
iconName = 'editclear'
labelText = 'KInputDialog'
-from PyTQt.qt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
+from PyTQt.tqt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KInputDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/key.py b/examples/pytde-sampler/dialogs/key.py
index db6e295..487f5d9 100644
--- a/examples/pytde-sampler/dialogs/key.py
+++ b/examples/pytde-sampler/dialogs/key.py
@@ -1,7 +1,7 @@
iconName = 'configure_shortcuts'
labelText = 'KKeyDialog'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KKeyDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/msgbox.py b/examples/pytde-sampler/dialogs/msgbox.py
index 1ccfe3a..697dd3c 100644
--- a/examples/pytde-sampler/dialogs/msgbox.py
+++ b/examples/pytde-sampler/dialogs/msgbox.py
@@ -5,7 +5,7 @@ from random import random
from traceback import print_exc
from io import StringIO
-from PyTQt.qt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
+from PyTQt.tqt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
from tdecore import i18n
from tdeui import KGuiItem, KPushButton, KMessageBox, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/passwd.py b/examples/pytde-sampler/dialogs/passwd.py
index 93d66f9..0508611 100644
--- a/examples/pytde-sampler/dialogs/passwd.py
+++ b/examples/pytde-sampler/dialogs/passwd.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KPasswordDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/progress.py b/examples/pytde-sampler/dialogs/progress.py
index b2ead9a..1f4ab4b 100644
--- a/examples/pytde-sampler/dialogs/progress.py
+++ b/examples/pytde-sampler/dialogs/progress.py
@@ -2,7 +2,7 @@ iconName = 'go'
labelText = 'KProgressDialog'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KProgressDialog, KTextEdit
diff --git a/examples/pytde-sampler/dialogs/tip.py b/examples/pytde-sampler/dialogs/tip.py
index 2e4fc02..b9e8b3d 100644
--- a/examples/pytde-sampler/dialogs/tip.py
+++ b/examples/pytde-sampler/dialogs/tip.py
@@ -3,7 +3,7 @@ labelText = 'KTipDialog'
import os
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import KPushButton, KTipDatabase, KTipDialog, KTextEdit
diff --git a/examples/pytde-sampler/icon_handling/__init__.py b/examples/pytde-sampler/icon_handling/__init__.py
index 87ee0c7..2919a18 100644
--- a/examples/pytde-sampler/icon_handling/__init__.py
+++ b/examples/pytde-sampler/icon_handling/__init__.py
@@ -6,7 +6,7 @@ helpText = ("TDE icons are nice. "
"Select the children of this item to see for yourself.")
-from PyTQt.qt import TQFrame, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQVBoxLayout
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/icon_handling/misc.py b/examples/pytde-sampler/icon_handling/misc.py
index db7b624..4be12be 100644
--- a/examples/pytde-sampler/icon_handling/misc.py
+++ b/examples/pytde-sampler/icon_handling/misc.py
@@ -3,7 +3,7 @@ iconName = 'icons'
labelText = 'Misc.'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQPoint
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQPoint
from tdecore import i18n
from tdeui import TDEAboutDialog, KPushButton, KBugReport, KTextEdit
from tdeui import KRootPermsIcon, KWritePermsIcon
diff --git a/examples/pytde-sampler/icon_handling/sizes.py b/examples/pytde-sampler/icon_handling/sizes.py
index b1bdbd8..f93fd94 100644
--- a/examples/pytde-sampler/icon_handling/sizes.py
+++ b/examples/pytde-sampler/icon_handling/sizes.py
@@ -3,7 +3,7 @@ iconName = 'icons'
labelText = 'Icon Sizing'
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdecore import i18n
from tdeui import TDEAboutDialog, KPushButton, KBugReport, KTextEdit
diff --git a/examples/pytde-sampler/misc/__init__.py b/examples/pytde-sampler/misc/__init__.py
index fe5dc63..f05d709 100644
--- a/examples/pytde-sampler/misc/__init__.py
+++ b/examples/pytde-sampler/misc/__init__.py
@@ -4,7 +4,7 @@ iconName = 'misc'
helpText = ("")
-from PyTQt.qt import TQFrame, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQVBoxLayout
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/misc/gradientselect.py b/examples/pytde-sampler/misc/gradientselect.py
index 8f9c1c4..4b2ee9e 100644
--- a/examples/pytde-sampler/misc/gradientselect.py
+++ b/examples/pytde-sampler/misc/gradientselect.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQColor, TQSizePolicy, TQLabel
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQColor, TQSizePolicy, TQLabel
from tdecore import i18n
from tdeui import KPushButton, KGradientSelector, KTextEdit, KDualColorButton, KColorPatch
diff --git a/examples/pytde-sampler/misc/passivepop.py b/examples/pytde-sampler/misc/passivepop.py
index fbccc73..316b69e 100644
--- a/examples/pytde-sampler/misc/passivepop.py
+++ b/examples/pytde-sampler/misc/passivepop.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL
+from PyTQt.tqt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL
from tdeui import KPassivePopup, KTextEdit, KPushButton
from tdecore import TDEGlobal, TDEIcon
diff --git a/examples/pytde-sampler/misc/window_info.py b/examples/pytde-sampler/misc/window_info.py
index df9a21c..cf95afe 100644
--- a/examples/pytde-sampler/misc/window_info.py
+++ b/examples/pytde-sampler/misc/window_info.py
@@ -1,7 +1,7 @@
-from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
from tdeui import KWindowInfo, KPushButton, KTextEdit
from tdecore import i18n, TDEApplication
diff --git a/examples/pytde-sampler/qt_widgets/__init__.py b/examples/pytde-sampler/qt_widgets/__init__.py
index a2da4db..982bc9c 100644
--- a/examples/pytde-sampler/qt_widgets/__init__.py
+++ b/examples/pytde-sampler/qt_widgets/__init__.py
@@ -4,7 +4,7 @@ iconName = 'designer'
helpText = """TQt provides a rich set of widgets for application use.
Select the children of this item to see for yourself."""
-from PyTQt.qt import TQFrame, TQVBoxLayout, SIGNAL
+from PyTQt.tqt import TQFrame, TQVBoxLayout, SIGNAL
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/qt_widgets/table.py b/examples/pytde-sampler/qt_widgets/table.py
index b75d596..0cdc4ab 100644
--- a/examples/pytde-sampler/qt_widgets/table.py
+++ b/examples/pytde-sampler/qt_widgets/table.py
@@ -8,8 +8,8 @@ editable table widget.'
import csv
import os
-from PyTQt.qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL
-from PyTQt.qttable import TQTable
+from PyTQt.tqt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL
+from PyTQt.tqttable import TQTable
from tdeui import KTextEdit
diff --git a/examples/pytde-sampler/runner.py b/examples/pytde-sampler/runner.py
index 66056d7..99a8765 100755
--- a/examples/pytde-sampler/runner.py
+++ b/examples/pytde-sampler/runner.py
@@ -3,7 +3,7 @@
"""
import sys
-from PyTQt.qt import TQVBoxLayout
+from PyTQt.tqt import TQVBoxLayout
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import TDEMainWindow
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 6534829..8d04233 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -10,9 +10,9 @@ import inspect
import os
import sys
-from PyTQt.qt import SIGNAL, SLOT, PYSIGNAL, TQt
-from PyTQt.qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
-from PyTQt.qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
+from PyTQt.tqt import SIGNAL, SLOT, PYSIGNAL, TQt
+from PyTQt.tqt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
+from PyTQt.tqt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal
from tdecore import TDEGlobalSettings, KWin, KWinModule, KURL, TDEIcon
diff --git a/examples/pytde-sampler/xwin/__init__.py b/examples/pytde-sampler/xwin/__init__.py
index 41563ee..958435e 100644
--- a/examples/pytde-sampler/xwin/__init__.py
+++ b/examples/pytde-sampler/xwin/__init__.py
@@ -4,7 +4,7 @@ iconName = 'kcmx'
helpText = """TDE and PyTDE allow interaction with the X Window system. Check
out the nifty samples below."""
-from PyTQt.qt import TQFrame, TQLabel, TQVBoxLayout
+from PyTQt.tqt import TQFrame, TQLabel, TQVBoxLayout
class MainFrame(TQFrame):
def __init__(self, parent=None):
diff --git a/examples/qxembedexample.py b/examples/qxembedexample.py
index eb42a26..82c2c92 100644
--- a/examples/qxembedexample.py
+++ b/examples/qxembedexample.py
@@ -8,7 +8,7 @@
# WARNING! All changes made in this file will be lost!
-from PyTQt.qt import *
+from PyTQt.tqt import *
class QXEmbedExample(TQWidget):
diff --git a/examples/systray.py b/examples/systray.py
index a4c3ff3..075e11c 100644
--- a/examples/systray.py
+++ b/examples/systray.py
@@ -29,7 +29,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQLabel
+from PyTQt.tqt import TQLabel
from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, TDEIcon, TDEIconLoader
from tdeui import TDEMainWindow, KSystemTray
diff --git a/examples/uimodules/uidialogs.py b/examples/uimodules/uidialogs.py
index 697deb8..1c8e2b4 100644
--- a/examples/uimodules/uidialogs.py
+++ b/examples/uimodules/uidialogs.py
@@ -1,4 +1,4 @@
-from PyTQt.qt import TQVBox, TQLabel, TQLineEdit, TQString, TQPixmap, TQPushButton, TQColor, SIGNAL, TQButtonGroup,\
+from PyTQt.tqt import TQVBox, TQLabel, TQLineEdit, TQString, TQPixmap, TQPushButton, TQColor, SIGNAL, TQButtonGroup,\
TQRadioButton, TQt, TQWidget
from tdecore import TDEAccel, i18n
diff --git a/examples/uimodules/uimenus.py b/examples/uimodules/uimenus.py
index 025663a..e44dc58 100644
--- a/examples/uimodules/uimenus.py
+++ b/examples/uimodules/uimenus.py
@@ -1,6 +1,6 @@
import os
-from PyTQt.qt import TQLabel
+from PyTQt.tqt import TQLabel
from tdecore import TDEApplication
diff --git a/examples/uimodules/uimisc.py b/examples/uimodules/uimisc.py
index 4536092..26129d1 100644
--- a/examples/uimodules/uimisc.py
+++ b/examples/uimodules/uimisc.py
@@ -1,6 +1,6 @@
import os, time
-from PyTQt.qt import TQImage, TQLabel, TQPixmap, TQPushButton, SIGNAL, TQColor, TQValidator
+from PyTQt.tqt import TQImage, TQLabel, TQPixmap, TQPushButton, SIGNAL, TQColor, TQValidator
from tdeui import KMessageBox, KDateValidator, KFloatValidator, KIntValidator, KLineEdit, KLed
diff --git a/examples/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py
index 106a559..1d7992f 100644
--- a/examples/uimodules/uiwidgets.py
+++ b/examples/uimodules/uiwidgets.py
@@ -1,6 +1,6 @@
import time, sys
-from PyTQt.qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, \
+from PyTQt.tqt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, \
TQt, TQString, TQChar, TQWidget, TQTimer
from tdecore import TDEApplication
diff --git a/examples/uimodules/uixml.py b/examples/uimodules/uixml.py
index fd3ca21..0c7578e 100644
--- a/examples/uimodules/uixml.py
+++ b/examples/uimodules/uixml.py
@@ -1,6 +1,6 @@
import os
-from PyTQt.qt import TQLabel
+from PyTQt.tqt import TQLabel
from tdecore import TDEApplication
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index 21e31da..bbeae5a 100644
--- a/examples/uiqxembed.py
+++ b/examples/uiqxembed.py
@@ -4,7 +4,7 @@
"""
import sys
-from PyTQt.qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
+from PyTQt.tqt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal, TDEIcon
from tdecore import KWin, KWinModule
diff --git a/examples/uisampler.py b/examples/uisampler.py
index 76bff2a..e52a3b6 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -1,7 +1,7 @@
import sys
sys.path.append ("./uimodules")
-from PyTQt.qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
+from PyTQt.tqt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import TDEMainWindow, TDEListView
diff --git a/examples/uitdemdi.py b/examples/uitdemdi.py
index 5e3509a..5be4c94 100644
--- a/examples/uitdemdi.py
+++ b/examples/uitdemdi.py
@@ -28,7 +28,7 @@ All is not rosy, however:
import os
import sys
-from PyTQt.qt import SIGNAL, TQVBoxLayout, TQLabel
+from PyTQt.tqt import SIGNAL, TQVBoxLayout, TQLabel
from tdecore import i18n, TDEAboutData, TDEApplication, TDEGlobal, TDEIcon, TDECmdLineArgs
from tdeui import KDockWidget, TDEListBox, KStdAction
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index ce92bd3..9c5fc82 100644
--- a/examples/xmlmenudemo.py
+++ b/examples/xmlmenudemo.py
@@ -37,7 +37,7 @@ copyright holder.
import sys, os
-from PyTQt.qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
+from PyTQt.tqt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEIcon, TDEIconLoader, TDEShortcut, TDEGlobal
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEToggleAction, TDEFontSizeAction, TDEFontAction, TDERadioAction,\
diff --git a/extensions/dcopexport.py b/extensions/dcopexport.py
index 7af07f1..b2dd154 100644
--- a/extensions/dcopexport.py
+++ b/extensions/dcopexport.py
@@ -51,7 +51,7 @@ stringTypes lists
from dcop import DCOPObject, DCOPClient
from tdecore import dcop_add, dcop_next
-from PyTQt.qt import TQString, TQCString, TQDataStream, IO_ReadOnly, IO_WriteOnly
+from PyTQt.tqt import TQString, TQCString, TQDataStream, IO_ReadOnly, IO_WriteOnly
numericTypes = ["char", "bool", "short", "int", "long", "uchar", "ushort", "uint", "ulong",
"unsigned char", "unsigned short", "unsigned int", "unsigned long",
@@ -72,7 +72,7 @@ class DCOPExObj (DCOPObject):
_meth = DCOPClient.normalizeFunctionSignature(meth).replace (">", "> ")
# see if this method is available from us via DCOP
- # if we don't have it, maybe DCOPObject already provides it (eg - qt object)
+ # if we don't have it, maybe DCOPObject already provides it (eg - tqt object)
if not self.matchMethod (_meth):
return DCOPObject.process(self, _meth, data, replyType, replyData);
diff --git a/extensions/dcopext.py b/extensions/dcopext.py
index e9edd30..2c71eda 100644
--- a/extensions/dcopext.py
+++ b/extensions/dcopext.py
@@ -32,7 +32,7 @@ copyright holder.
import re
from dcop import DCOPClient
-from PyTQt.qt import TQString, TQCString, TQByteArray, TQDataStream, IO_ReadOnly, IO_WriteOnly
+from PyTQt.tqt import TQString, TQCString, TQByteArray, TQDataStream, IO_ReadOnly, IO_WriteOnly
from tdecore import dcop_add, dcop_next
# XXX: 64 bit integers might be handeld wrong! pythons int is AFAIK 32 bit,
@@ -690,7 +690,7 @@ class DCOPMeth(object):
# XXX:
# Is 'isinstance(arg, eval(argtype))' really good?
- # What if 'argtype' is located in some modul? Like 'qt.TQString'.
+ # What if 'argtype' is located in some modul? Like 'tqt.TQString'.
# Then this will fail (but it should not!).
# And the worst thing: the eval() will raise a NameError!
#
diff --git a/postproc b/postproc
index 7445d8c..8261d33 100755
--- a/postproc
+++ b/postproc
@@ -324,7 +324,7 @@ def appQuit (filelist):
tmp.write (buff [i])
i = i + 1
- tmp.write (buff [i] + "\nfrom PyTQt.qt import TQCloseEvent")
+ tmp.write (buff [i] + "\nfrom PyTQt.tqt import TQCloseEvent")
i = i + 1
while (i < nLines) and (buff[i].find("class TDEApplication") < 0):
diff --git a/pytdeconfig.py b/pytdeconfig.py
index daa858f..a02966e 100644
--- a/pytdeconfig.py
+++ b/pytdeconfig.py
@@ -23,7 +23,7 @@
import sip_tqt_config
-from PyTQt import pyqtconfig
+from PyTQt import pytqtconfig
# These are installation specific values created when PyTQt was configured.
@@ -48,7 +48,7 @@ _pkg_config = {
_default_macros = None
-class Configuration(pyqtconfig.Configuration):
+class Configuration(pytqtconfig.Configuration):
"""The class that represents PyTQt configuration values.
"""
def __init__(self, sub_cfg=None):
@@ -64,10 +64,10 @@ class Configuration(pyqtconfig.Configuration):
cfg.append(_pkg_config)
- pyqtconfig.Configuration.__init__(self, cfg)
+ pytqtconfig.Configuration.__init__(self, cfg)
-class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile):
+class DCOPModuleMakefile(pytqtconfig.TQtModuleMakefile):
"""The Makefile class for modules that %Import DCOP.
"""
def finalise(self):
@@ -80,7 +80,7 @@ class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile):
self.LIBDIR.append(self.config.pytde_lib_dir)
self.extra_libs.append(self.module_as_lib("DCOP"))
- pyqtconfig.TQtModuleMakefile.finalise(self)
+ pytqtconfig.TQtModuleMakefile.finalise(self)
class KdecoreModuleMakefile(DCOPModuleMakefile):
"""The Makefile class for modules that %Import tdecore.
@@ -91,7 +91,7 @@ class KdecoreModuleMakefile(DCOPModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdecore"))
DCOPModuleMakefile.finalise(self)
@@ -105,7 +105,7 @@ class KdesuModuleMakefile(KdecoreModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdesu"))
KdecoreModuleMakefile.finalise(self)
@@ -119,7 +119,7 @@ class KdefxModuleMakefile(KdecoreModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdefx"))
KdecoreModuleMakefile.finalise(self)
@@ -133,11 +133,11 @@ class KdeuiModuleMakefile(KdefxModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeui"))
if self.config.sip_version < 0x040000:
- self.extra_libs.append(self.module_as_lib("qtxml"))
+ self.extra_libs.append(self.module_as_lib("tqtxml"))
KdefxModuleMakefile.finalise(self)
@@ -150,7 +150,7 @@ class KioModuleMakefile(KdeuiModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeio"))
KdeuiModuleMakefile.finalise(self)
@@ -164,7 +164,7 @@ class KfileModuleMakefile(KioModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdefile"))
KioModuleMakefile.finalise(self)
@@ -178,7 +178,7 @@ class KpartsModuleMakefile(KfileModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeparts"))
KfileModuleMakefile.finalise(self)
@@ -192,7 +192,7 @@ class KhtmlModuleMakefile(KpartsModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdehtml"))
KpartsModuleMakefile.finalise(self)
@@ -206,7 +206,7 @@ class KjsModuleMakefile(KhtmlModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("kjs"))
KjsModuleMakefile.finalise(self)
@@ -220,7 +220,7 @@ class KdeprintModuleMakefile(KdeuiModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeprint"))
KdeuiModuleMakefile.finalise(self)
diff --git a/pytdeconfig.py.in b/pytdeconfig.py.in
index 252184c..611113d 100644
--- a/pytdeconfig.py.in
+++ b/pytdeconfig.py.in
@@ -23,14 +23,14 @@
import sip_tqt_config
-from PyTQt import pyqtconfig
+from PyTQt import pytqtconfig
# These are installation specific values created when PyTQt was configured.
# @SIP_CONFIGURATION@
-class Configuration(pyqtconfig.Configuration):
+class Configuration(pytqtconfig.Configuration):
"""The class that represents PyTQt configuration values.
"""
def __init__(self, sub_cfg=None):
@@ -46,10 +46,10 @@ class Configuration(pyqtconfig.Configuration):
cfg.append(_pkg_config)
- pyqtconfig.Configuration.__init__(self, cfg)
+ pytqtconfig.Configuration.__init__(self, cfg)
-class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile):
+class DCOPModuleMakefile(pytqtconfig.TQtModuleMakefile):
"""The Makefile class for modules that %Import DCOP.
"""
def finalise(self):
@@ -62,7 +62,7 @@ class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile):
self.LIBDIR.append(self.config.pytde_lib_dir)
self.extra_libs.append(self.module_as_lib("DCOP"))
- pyqtconfig.TQtModuleMakefile.finalise(self)
+ pytqtconfig.TQtModuleMakefile.finalise(self)
class KdecoreModuleMakefile(DCOPModuleMakefile):
"""The Makefile class for modules that %Import tdecore.
@@ -73,7 +73,7 @@ class KdecoreModuleMakefile(DCOPModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdecore"))
DCOPModuleMakefile.finalise(self)
@@ -87,7 +87,7 @@ class KdesuModuleMakefile(KdecoreModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdesu"))
KdecoreModuleMakefile.finalise(self)
@@ -101,7 +101,7 @@ class KdefxModuleMakefile(KdecoreModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdefx"))
KdecoreModuleMakefile.finalise(self)
@@ -115,11 +115,11 @@ class KdeuiModuleMakefile(KdefxModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeui"))
if self.config.sip_version < 0x040000:
- self.extra_libs.append(self.module_as_lib("qtxml"))
+ self.extra_libs.append(self.module_as_lib("tqtxml"))
KdefxModuleMakefile.finalise(self)
@@ -132,7 +132,7 @@ class KioModuleMakefile(KdeuiModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeio"))
KdeuiModuleMakefile.finalise(self)
@@ -146,7 +146,7 @@ class KfileModuleMakefile(KioModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdefile"))
KioModuleMakefile.finalise(self)
@@ -160,7 +160,7 @@ class KpartsModuleMakefile(KfileModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeparts"))
KfileModuleMakefile.finalise(self)
@@ -174,7 +174,7 @@ class KhtmlModuleMakefile(KpartsModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdehtml"))
KpartsModuleMakefile.finalise(self)
@@ -188,7 +188,7 @@ class KjsModuleMakefile(KhtmlModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("kjs"))
KjsModuleMakefile.finalise(self)
@@ -202,7 +202,7 @@ class KdeprintModuleMakefile(KdeuiModuleMakefile):
if self.config.sip_version < 0x040000:
# Note that we don't use self.extra_lib_dirs because we don't want
# it to be added to the rpath.
- self.LIBDIR.append(self.config.pyqt_mod_dir)
+ self.LIBDIR.append(self.config.pytqt_mod_dir)
self.extra_libs.append(self.module_as_lib("tdeprint"))
KdeuiModuleMakefile.finalise(self)
diff --git a/sip/dcop/dcopmod.sip.in b/sip/dcop/dcopmod.sip.in
index 9f9e0fb..32e80b7 100644
--- a/sip/dcop/dcopmod.sip.in
+++ b/sip/dcop/dcopmod.sip.in
@@ -32,7 +32,7 @@
%Platforms { D_MANDRAKE ALL }
-%Import qt/qtmod.sip
+%Import tqt/tqtmod.sip
%Include dcopclient.sip
%Include dcopobject.sip
diff --git a/sip/dcop/typedefs.sip b/sip/dcop/typedefs.sip
index 9b7aa70..2194cbc 100644
--- a/sip/dcop/typedefs.sip
+++ b/sip/dcop/typedefs.sip
@@ -81,24 +81,24 @@ typedef long off_t;
return 0;
}
- TQValueList *qvl = new TQValueList;
+ TQValueList *tqvl = new TQValueList;
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- qvl -> append((pid_t)PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
+ tqvl -> append((pid_t)PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
if (PyErr_Occurred() != NULL)
{
- delete qvl;
+ delete tqvl;
*sipIsErr = 1;
return 0;
}
}
- *sipCppPtr = qvl;
+ *sipCppPtr = tqvl;
return 1;
%End
diff --git a/sip/tdeabc/tdeabcmod.sip.in b/sip/tdeabc/tdeabcmod.sip.in
index d4a86de..2975f84 100644
--- a/sip/tdeabc/tdeabcmod.sip.in
+++ b/sip/tdeabc/tdeabcmod.sip.in
@@ -28,8 +28,8 @@
%Module tdeabc
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 01f1fde..4640ffc 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -28,7 +28,7 @@
%Module tdecore
-%Import qt/qtmod.sip
+%Import tqt/tqtmod.sip
%Import dcopmod.sip
%Include bytearray.sip
diff --git a/sip/tdecore/tdestartupinfo.sip b/sip/tdecore/tdestartupinfo.sip
index 95e6e16..57e7113 100644
--- a/sip/tdecore/tdestartupinfo.sip
+++ b/sip/tdecore/tdestartupinfo.sip
@@ -254,24 +254,24 @@ private:
return 0;
}
- TQValueList *qvl = new TQValueList;
+ TQValueList *tqvl = new TQValueList;
PyErr_Clear();
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
- qvl -> append((pid_t)PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
+ tqvl -> append((pid_t)PyLong_AsLong(PyList_GET_ITEM(sipPy,i)));
if (PyErr_Occurred() != NULL)
{
- delete qvl;
+ delete tqvl;
*sipIsErr = 1;
return 0;
}
}
- *sipCppPtr = qvl;
+ *sipCppPtr = tqvl;
return 1;
%End
diff --git a/sip/tdefile/tdefilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index a07b0f3..b34dff3 100644
--- a/sip/tdefile/tdefilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -28,8 +28,8 @@
%Module tdefile
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdefx/tdefxmod.sip.in b/sip/tdefx/tdefxmod.sip.in
index 9a65a1f..e3bea0d 100644
--- a/sip/tdefx/tdefxmod.sip.in
+++ b/sip/tdefx/tdefxmod.sip.in
@@ -28,7 +28,7 @@
%Module tdefx
-%Import qt/qtmod.sip
+%Import tqt/tqtmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
diff --git a/sip/tdehtml/tdehtmlmod.sip.in b/sip/tdehtml/tdehtmlmod.sip.in
index 6329893..4ecc537 100644
--- a/sip/tdehtml/tdehtmlmod.sip.in
+++ b/sip/tdehtml/tdehtmlmod.sip.in
@@ -28,8 +28,8 @@
%Module tdehtml
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdeio/tdeiomod.sip.in b/sip/tdeio/tdeiomod.sip.in
index 17d91ff..a64edcd 100644
--- a/sip/tdeio/tdeiomod.sip.in
+++ b/sip/tdeio/tdeiomod.sip.in
@@ -28,8 +28,8 @@
%Module tdeio
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdemdi/tdemdichildfrm.sip b/sip/tdemdi/tdemdichildfrm.sip
index e55ac41..0975ea5 100644
--- a/sip/tdemdi/tdemdichildfrm.sip
+++ b/sip/tdemdi/tdemdichildfrm.sip
@@ -213,8 +213,8 @@ protected:
// Get it.
- TQDict qdict = *sipCpp;
- TQDictIterator it (qdict);
+ TQDict tqdict = *sipCpp;
+ TQDictIterator it (tqdict);
while (it.current ())
{
@@ -241,7 +241,7 @@ protected:
if (sipIsErr == NULL)
return PyDict_Check(sipPy);
- TQDict* qdict = new TQDict;
+ TQDict* tqdict = new TQDict;
PyObject *key, *value;
SIP_SSIZE_T pos = 0;
@@ -260,18 +260,18 @@ protected:
sipReleaseType(a0, sipType_TQString, a0_state);
*sipIsErr = 1;
- delete qdict;
+ delete tqdict;
return 0;
}
a1 = (TQWidget::FocusPolicy) PyLong_AS_LONG (value);
- qdict->insert (*a0, &a1);
+ tqdict->insert (*a0, &a1);
sipReleaseType(a0, sipType_TQString, a0_state);
}
- *sipCppPtr = qdict;
+ *sipCppPtr = tqdict;
return 1;
%End
diff --git a/sip/tdemdi/tdemdimod.sip.in b/sip/tdemdi/tdemdimod.sip.in
index ea74677..c05a131 100644
--- a/sip/tdemdi/tdemdimod.sip.in
+++ b/sip/tdemdi/tdemdimod.sip.in
@@ -28,10 +28,10 @@
%Module tdemdi
-%Import qt/qtmod.sip
+%Import tqt/tqtmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import tdefxmod.sip
%Import tdeuimod.sip
%Import tdeiomod.sip
diff --git a/sip/tdeparts/tdepartsmod.sip.in b/sip/tdeparts/tdepartsmod.sip.in
index 77c0729..25d57e2 100644
--- a/sip/tdeparts/tdepartsmod.sip.in
+++ b/sip/tdeparts/tdepartsmod.sip.in
@@ -28,8 +28,8 @@
%Module tdeparts
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdeprint/tdeprintmod.sip.in b/sip/tdeprint/tdeprintmod.sip.in
index 5e072d4..27b5172 100644
--- a/sip/tdeprint/tdeprintmod.sip.in
+++ b/sip/tdeprint/tdeprintmod.sip.in
@@ -28,8 +28,8 @@
%Module tdeprint
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tderesources/tderesourcesmod.sip.in b/sip/tderesources/tderesourcesmod.sip.in
index 3fd6f36..0a0d10f 100644
--- a/sip/tderesources/tderesourcesmod.sip.in
+++ b/sip/tderesources/tderesourcesmod.sip.in
@@ -28,8 +28,8 @@
%Module tderesources
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdespell/tdespellmod.sip.in b/sip/tdespell/tdespellmod.sip.in
index 95670ca..39d53e5 100644
--- a/sip/tdespell/tdespellmod.sip.in
+++ b/sip/tdespell/tdespellmod.sip.in
@@ -28,8 +28,8 @@
%Module tdespell
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdespell2/tdespell2mod.sip.in b/sip/tdespell2/tdespell2mod.sip.in
index 1078351..792f006 100644
--- a/sip/tdespell2/tdespell2mod.sip.in
+++ b/sip/tdespell2/tdespell2mod.sip.in
@@ -28,8 +28,8 @@
%Module tdespell2
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip
index 60e9c28..0f081b6 100644
--- a/sip/tdeui/kkeydialog.sip
+++ b/sip/tdeui/kkeydialog.sip
@@ -199,8 +199,8 @@ typedef TQDict IntDict;
// Get it.
- TQDict qdict = *sipCpp;
- TQDictIterator it (qdict);
+ TQDict tqdict = *sipCpp;
+ TQDictIterator it (tqdict);
while (it.current ())
{
@@ -227,7 +227,7 @@ typedef TQDict IntDict;
if (sipIsErr == NULL)
return PyDict_Check(sipPy);
- TQDict* qdict = new TQDict;
+ TQDict* tqdict = new TQDict;
PyObject *key, *value;
SIP_SSIZE_T pos = 0;
@@ -246,18 +246,18 @@ typedef TQDict IntDict;
sipReleaseType(a0, sipType_TQString, a0_state);
*sipIsErr = 1;
- delete qdict;
+ delete tqdict;
return 0;
}
a1 = (int) PyLong_AS_LONG (value);
- qdict->insert (*a0, &a1);
+ tqdict->insert (*a0, &a1);
sipReleaseType(a0, sipType_TQString, a0_state);
}
- *sipCppPtr = qdict;
+ *sipCppPtr = tqdict;
return 1;
%End
diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in
index 1985230..5d59d2b 100644
--- a/sip/tdeui/tdeuimod.sip.in
+++ b/sip/tdeui/tdeuimod.sip.in
@@ -28,8 +28,8 @@
%Module tdeui
-%Import qt/qtmod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqt/tqtmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
%Import tdefxmod.sip
diff --git a/sip/tdeutils/tdeutilsmod.sip.in b/sip/tdeutils/tdeutilsmod.sip.in
index b888934..bbdfd25 100644
--- a/sip/tdeutils/tdeutilsmod.sip.in
+++ b/sip/tdeutils/tdeutilsmod.sip.in
@@ -28,10 +28,10 @@
%Module tdeutils
-%Import qt/qtmod.sip
+%Import tqt/tqtmod.sip
%Import dcopmod.sip
%Import tdecoremod.sip
-%Import qtxml/qtxmlmod.sip
+%Import tqtxml/tqtxmlmod.sip
%Import tdefxmod.sip
%Import tdeuimod.sip
%Import tdeiomod.sip
diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index 43f4846..89c2568 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -43,7 +43,7 @@ True = not False
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, TDEIcon, TDEIconLoader
from tdeui import TDEMainWindow, KMessageBox
diff --git a/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py
index e7f96a2..bfdae1b 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -41,7 +41,7 @@ True = not False
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index c04ea14..924e60d 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -41,7 +41,7 @@ True = not False
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEActionCollection
diff --git a/templates/annotated/systray.py b/templates/annotated/systray.py
index b9569bf..989719e 100644
--- a/templates/annotated/systray.py
+++ b/templates/annotated/systray.py
@@ -29,7 +29,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQWidget, SIGNAL
+from PyTQt.tqt import TQWidget, SIGNAL
from tdecore import TDEApplication, TDEIcon, TDEIconLoader
from tdeui import KSystemTray
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index 42251de..d3f0ae7 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -35,7 +35,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQLabel, TQWidget, SIGNAL
+from PyTQt.tqt import TQLabel, TQWidget, SIGNAL
from tdecore import TDEApplication, TDEIcon, TDEIconLoader
from tdeui import TDEMainWindow, KSystemTray
diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index 4a897cc..938e2e9 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -29,7 +29,7 @@ copyright holder.
import sys
-from PyTQt.qt import SIGNAL
+from PyTQt.tqt import SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
from tdeui import TDEMainWindow
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index 777ec91..c7f768f 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -38,7 +38,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, TDEIcon, TDEIconLoader
from tdeui import TDEMainWindow, KMessageBox
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index beaa562..05d6464 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -37,7 +37,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index 4cfd7f9..3f849ba 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -41,7 +41,7 @@ True = not False
import sys
-from PyTQt.qt import TQPopupMenu, SIGNAL
+from PyTQt.tqt import TQPopupMenu, SIGNAL
from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEActionCollection
diff --git a/templates/basic/systray.py b/templates/basic/systray.py
index 0e305b8..f88dae5 100644
--- a/templates/basic/systray.py
+++ b/templates/basic/systray.py
@@ -29,7 +29,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQWidget, SIGNAL
+from PyTQt.tqt import TQWidget, SIGNAL
from tdecore import TDEApplication, TDEIcon, TDEIconLoader, TDEAboutData, TDECmdLineArgs
from tdeui import KSystemTray
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index c2890fa..1442e0c 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -29,7 +29,7 @@ copyright holder.
import sys
-from PyTQt.qt import TQLabel, TQWidget, SIGNAL
+from PyTQt.tqt import TQLabel, TQWidget, SIGNAL
from tdecore import TDEApplication, TDEIcon, TDEIconLoader
from tdeui import TDEMainWindow, KSystemTray