From f0143f408543569757ebf8f671e1012e16c575ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 28 Sep 2016 03:03:35 +0200
Subject: [PATCH] Properly import python_tqt module - second part
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b7a62620df1c214340b86735a73d4c3b3b834565)
---
 doc/dcopext.html                                 | 2 +-
 examples/example_dcopexport.py                   | 2 +-
 examples/example_dcopext.py                      | 2 +-
 examples/menudemo.py                             | 2 +-
 examples/pyTDEHTMLPart.py                        | 2 +-
 examples/pytde-sampler/basic_widgets/__init__.py | 2 +-
 examples/pytde-sampler/dialogs/__init__.py       | 2 +-
 examples/pytde-sampler/dialogs/about/__init__.py | 2 +-
 examples/pytde-sampler/dialogs/about/aboutapp.py | 2 +-
 examples/pytde-sampler/dialogs/about/aboutkde.py | 2 +-
 examples/pytde-sampler/dialogs/bugreport.py      | 2 +-
 examples/pytde-sampler/dialogs/color.py          | 2 +-
 examples/pytde-sampler/dialogs/input.py          | 2 +-
 examples/pytde-sampler/dialogs/key.py            | 2 +-
 examples/pytde-sampler/dialogs/msgbox.py         | 2 +-
 examples/pytde-sampler/dialogs/passwd.py         | 2 +-
 examples/pytde-sampler/dialogs/tip.py            | 2 +-
 examples/pytde-sampler/icon_handling/__init__.py | 2 +-
 examples/pytde-sampler/icon_handling/misc.py     | 2 +-
 examples/pytde-sampler/icon_handling/sizes.py    | 2 +-
 examples/pytde-sampler/misc/__init__.py          | 2 +-
 examples/pytde-sampler/misc/gradientselect.py    | 2 +-
 examples/pytde-sampler/misc/window_info.py       | 2 +-
 examples/pytde-sampler/qt_widgets/__init__.py    | 2 +-
 examples/pytde-sampler/runner.py                 | 2 +-
 examples/pytde-sampler/xwin/__init__.py          | 2 +-
 examples/qxembedexample.py                       | 2 +-
 examples/systray.py                              | 2 +-
 examples/uimodules/uidialogs.py                  | 2 +-
 examples/uimodules/uimenus.py                    | 2 +-
 examples/uimodules/uimisc.py                     | 2 +-
 examples/uimodules/uixml.py                      | 2 +-
 examples/uitdemdi.py                             | 2 +-
 examples/xmlmenudemo.py                          | 2 +-
 extensions/dcopexport.py                         | 2 +-
 extensions/dcopext.py                            | 2 +-
 postproc                                         | 2 +-
 templates/annotated/menuapp1.py                  | 2 +-
 templates/annotated/menuapp2.py                  | 2 +-
 templates/annotated/menuapp3.py                  | 2 +-
 templates/annotated/systray.py                   | 2 +-
 templates/annotated/systray1.py                  | 2 +-
 templates/basic/basicapp.py                      | 2 +-
 templates/basic/menuapp1.py                      | 2 +-
 templates/basic/menuapp2.py                      | 2 +-
 templates/basic/menuapp3.py                      | 2 +-
 templates/basic/systray.py                       | 2 +-
 templates/basic/systray1.py                      | 2 +-
 48 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/doc/dcopext.html b/doc/dcopext.html
index ea21e47..cbf9304 100644
--- a/doc/dcopext.html
+++ b/doc/dcopext.html
@@ -263,7 +263,7 @@ different argument counts. Here are some examples:
 <TABLE BORDER="0" BGCOLOR="#E0E0E0" WIDTH="100%">
 <TR><TD><PRE CLASS="PROGRAMLISTING">
 from tdecore import dcop_add, dcop_next
-from qt import TQByteArray, TQDataStream, IO_ReadOnly, IO_WriteOnly, TQString,\
+from python_tqt.qt import TQByteArray, TQDataStream, IO_ReadOnly, IO_WriteOnly, TQString,\
     TQCString, TQValueList&lt;TQCString&gt;
 from dcopext import numericTypes, stringTypes    
     
diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index 2e7a504..6be121a 100644
--- a/examples/example_dcopexport.py
+++ b/examples/example_dcopexport.py
@@ -36,7 +36,7 @@ copyright holder.
 import sys
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from dcopexport import DCOPExObj
-from qt import TQString, TQStringList
+from python_tqt.qt import TQString, TQStringList
 
 """
 DCOPExObj provides all of the necessary machinery to DCOP-enable
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index 721df50..939ed50 100644
--- a/examples/example_dcopext.py
+++ b/examples/example_dcopext.py
@@ -31,7 +31,7 @@ import sys, time
 import dcop
 import dcopext
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
-from qt import TQString, TQCString
+from python_tqt.qt import TQString, TQCString
 
 
 
diff --git a/examples/menudemo.py b/examples/menudemo.py
index c99e613..1f270a3 100644
--- a/examples/menudemo.py
+++ b/examples/menudemo.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
+from python_tqt.qt 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/pyTDEHTMLPart.py b/examples/pyTDEHTMLPart.py
index bcdb18e..e4ba32f 100644
--- a/examples/pyTDEHTMLPart.py
+++ b/examples/pyTDEHTMLPart.py
@@ -47,7 +47,7 @@ from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, TDEAboutData, Ba
 
 from tdeui import TDEMainWindow, KMessageBox, TDEAction, KStdAction, KKeyDialog, KEditToolbar
 
-from qt import  TQString, TQStringList
+from python_tqt.qt import  TQString, TQStringList
 
 from tdeio import TDETrader
 
diff --git a/examples/pytde-sampler/basic_widgets/__init__.py b/examples/pytde-sampler/basic_widgets/__init__.py
index 312f629..8b5e183 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 = """KDE provides a large set of basic widgets for application use.  
 Select the children of this item to see for yourself."""
 
-from qt import TQFrame, TQVBoxLayout
+from python_tqt.qt import TQFrame, TQVBoxLayout
 from tdeui import KTextEdit
 
 
diff --git a/examples/pytde-sampler/dialogs/__init__.py b/examples/pytde-sampler/dialogs/__init__.py
index 07a731c..ddb37fe 100644
--- a/examples/pytde-sampler/dialogs/__init__.py
+++ b/examples/pytde-sampler/dialogs/__init__.py
@@ -6,7 +6,7 @@ helpText = ("KDE provides a convenient set of dialog boxes for application use.
             "Select the children of this item to see for yourself.")
 
 
-from qt import TQFrame, TQVBoxLayout
+from python_tqt.qt 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 ea1ad17..4cc0bc9 100644
--- a/examples/pytde-sampler/dialogs/about/__init__.py
+++ b/examples/pytde-sampler/dialogs/about/__init__.py
@@ -5,7 +5,7 @@ helpText = ("KDE 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 qt import TQFrame, TQVBoxLayout
+from python_tqt.qt 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 7fe2b75..4c6d5d5 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 qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
 from tdecore import i18n
 from tdeui import TDEAboutApplication, KPushButton, KTextEdit
 
diff --git a/examples/pytde-sampler/dialogs/about/aboutkde.py b/examples/pytde-sampler/dialogs/about/aboutkde.py
index 183c6fb..7141373 100644
--- a/examples/pytde-sampler/dialogs/about/aboutkde.py
+++ b/examples/pytde-sampler/dialogs/about/aboutkde.py
@@ -1,7 +1,7 @@
 iconName = 'about_kde'
 labelText = 'TDEAboutKDE'
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 caf72f7..34c3508 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 qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 738c000..793ebe9 100644
--- a/examples/pytde-sampler/dialogs/color.py
+++ b/examples/pytde-sampler/dialogs/color.py
@@ -2,7 +2,7 @@ iconName = 'colorize'
 labelText = 'KColorDialog'
 
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
 from tdecore import i18n
 from tdeui import KPushButton, KColorDialog, KColorPatch, KTextEdit
 
diff --git a/examples/pytde-sampler/dialogs/input.py b/examples/pytde-sampler/dialogs/input.py
index 8d9312f..2caced1 100644
--- a/examples/pytde-sampler/dialogs/input.py
+++ b/examples/pytde-sampler/dialogs/input.py
@@ -1,7 +1,7 @@
 iconName = 'editclear'
 labelText = 'KInputDialog'
 
-from qt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
+from python_tqt.qt 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 808a298..9e74acb 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 qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 b22c03f..6e61777 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 StringIO import StringIO
 
-from qt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL
+from python_tqt.qt 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 3081c3d..e2f7996 100644
--- a/examples/pytde-sampler/dialogs/passwd.py
+++ b/examples/pytde-sampler/dialogs/passwd.py
@@ -1,4 +1,4 @@
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
 from tdecore import i18n
 from tdeui import KPushButton, KPasswordDialog, KTextEdit
 
diff --git a/examples/pytde-sampler/dialogs/tip.py b/examples/pytde-sampler/dialogs/tip.py
index b86d3fd..c999abe 100644
--- a/examples/pytde-sampler/dialogs/tip.py
+++ b/examples/pytde-sampler/dialogs/tip.py
@@ -3,7 +3,7 @@ labelText = 'KTipDialog'
 
 import os
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 2a525ac..a3649d2 100644
--- a/examples/pytde-sampler/icon_handling/__init__.py
+++ b/examples/pytde-sampler/icon_handling/__init__.py
@@ -6,7 +6,7 @@ helpText = ("KDE icons are nice. "
             "Select the children of this item to see for yourself.")
 
 
-from qt import TQFrame, TQVBoxLayout
+from python_tqt.qt 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 748dd64..6a4a43d 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 qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQPoint
+from python_tqt.qt 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 a76671a..39723f3 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 qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 f9b66ae..f6c60fb 100644
--- a/examples/pytde-sampler/misc/__init__.py
+++ b/examples/pytde-sampler/misc/__init__.py
@@ -4,7 +4,7 @@ iconName = 'misc'
 
 helpText = ("")
 
-from qt import TQFrame, TQVBoxLayout
+from python_tqt.qt import TQFrame, TQVBoxLayout
 from tdeui import KTextEdit
 
 
diff --git a/examples/pytde-sampler/misc/gradientselect.py b/examples/pytde-sampler/misc/gradientselect.py
index 0adb2ea..e0d788e 100644
--- a/examples/pytde-sampler/misc/gradientselect.py
+++ b/examples/pytde-sampler/misc/gradientselect.py
@@ -1,4 +1,4 @@
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL, TQColor, TQSizePolicy, TQLabel
+from python_tqt.qt 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/window_info.py b/examples/pytde-sampler/misc/window_info.py
index 00252c6..ab53fe9 100644
--- a/examples/pytde-sampler/misc/window_info.py
+++ b/examples/pytde-sampler/misc/window_info.py
@@ -1,7 +1,7 @@
 
 
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
+from python_tqt.qt 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 fdd6539..21e2037 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 qt import TQFrame, TQVBoxLayout, SIGNAL
+from python_tqt.qt import TQFrame, TQVBoxLayout, SIGNAL
 from tdeui import KTextEdit
 
 
diff --git a/examples/pytde-sampler/runner.py b/examples/pytde-sampler/runner.py
index 1bfb18b..0064084 100755
--- a/examples/pytde-sampler/runner.py
+++ b/examples/pytde-sampler/runner.py
@@ -5,7 +5,7 @@
 import sys
 from tdecore import TDEApplication, TDECmdLineArgs
 from tdeui import TDEMainWindow
-from qt import TQVBoxLayout
+from python_tqt.qt import TQVBoxLayout
 
 ## relative import -- cry me a river!
 import about
diff --git a/examples/pytde-sampler/xwin/__init__.py b/examples/pytde-sampler/xwin/__init__.py
index 34787fd..2049b8f 100644
--- a/examples/pytde-sampler/xwin/__init__.py
+++ b/examples/pytde-sampler/xwin/__init__.py
@@ -4,7 +4,7 @@ iconName = 'kcmx'
 helpText = """KDE and PyKDE allow interaction with the X Window system.  Check
 out the nifty samples below."""
 
-from qt import TQFrame, TQLabel, TQVBoxLayout
+from python_tqt.qt import TQFrame, TQLabel, TQVBoxLayout
 
 class MainFrame(TQFrame):
     def __init__(self, parent=None):
diff --git a/examples/qxembedexample.py b/examples/qxembedexample.py
index 0482c78..bb24f63 100644
--- a/examples/qxembedexample.py
+++ b/examples/qxembedexample.py
@@ -8,7 +8,7 @@
 # WARNING! All changes made in this file will be lost!
 
 
-from qt import *
+from python_tqt.qt import *
 
 
 class QXEmbedExample(TQWidget):
diff --git a/examples/systray.py b/examples/systray.py
index 0da1961..fd3d1c5 100644
--- a/examples/systray.py
+++ b/examples/systray.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from qt import TQLabel
+from python_tqt.qt import TQLabel
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray
 
diff --git a/examples/uimodules/uidialogs.py b/examples/uimodules/uidialogs.py
index 82e6260..a2f4512 100644
--- a/examples/uimodules/uidialogs.py
+++ b/examples/uimodules/uidialogs.py
@@ -1,4 +1,4 @@
-from qt import TQVBox, TQLabel, TQLineEdit, TQString, TQPixmap, TQPushButton, TQColor, SIGNAL, TQButtonGroup,\
+from python_tqt.qt 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 d57f7cc..96207b1 100644
--- a/examples/uimodules/uimenus.py
+++ b/examples/uimodules/uimenus.py
@@ -1,6 +1,6 @@
 import os
 
-from qt import TQLabel
+from python_tqt.qt import TQLabel
 
 from tdecore import TDEApplication
 
diff --git a/examples/uimodules/uimisc.py b/examples/uimodules/uimisc.py
index 0dd4124..9e96165 100644
--- a/examples/uimodules/uimisc.py
+++ b/examples/uimodules/uimisc.py
@@ -1,6 +1,6 @@
 import os, time
 
-from qt import TQImage, TQLabel, TQPixmap, TQPushButton, SIGNAL, TQColor, TQValidator
+from python_tqt.qt import TQImage, TQLabel, TQPixmap, TQPushButton, SIGNAL, TQColor, TQValidator
 
 from tdeui import KMessageBox, KDateValidator, KFloatValidator, KIntValidator, KLineEdit, KLed
 
diff --git a/examples/uimodules/uixml.py b/examples/uimodules/uixml.py
index b661ffb..b90dde9 100644
--- a/examples/uimodules/uixml.py
+++ b/examples/uimodules/uixml.py
@@ -1,6 +1,6 @@
 import os
 
-from qt import TQLabel
+from python_tqt.qt import TQLabel
 
 from tdecore import TDEApplication
 
diff --git a/examples/uitdemdi.py b/examples/uitdemdi.py
index dfcaa74..c62ceae 100644
--- a/examples/uitdemdi.py
+++ b/examples/uitdemdi.py
@@ -28,7 +28,7 @@ All is not rosy, however:
 import os
 import sys
 
-from qt import SIGNAL, TQVBoxLayout, TQLabel
+from python_tqt.qt 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 f4cfdb1..5659b0a 100644
--- a/examples/xmlmenudemo.py
+++ b/examples/xmlmenudemo.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys, os
 
-from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
+from python_tqt.qt 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 4269d67..b7eb3e6 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 qt import TQString, TQCString, TQDataStream, IO_ReadOnly, IO_WriteOnly
+from python_tqt.qt 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",
diff --git a/extensions/dcopext.py b/extensions/dcopext.py
index e854996..2997b85 100644
--- a/extensions/dcopext.py
+++ b/extensions/dcopext.py
@@ -32,7 +32,7 @@ copyright holder.
 
 import re
 from dcop    import DCOPClient
-from qt      import TQString, TQCString, TQByteArray, TQDataStream, IO_ReadOnly, IO_WriteOnly
+from python_tqt.qt 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,
diff --git a/postproc b/postproc
index 6228889..1a05c15 100755
--- a/postproc
+++ b/postproc
@@ -324,7 +324,7 @@ def appQuit (filelist):
             tmp.write (buff [i])
             i = i + 1
 
-        tmp.write (buff [i] + "\nfrom qt import TQCloseEvent")
+        tmp.write (buff [i] + "\nfrom python_tqt.qt import TQCloseEvent")
         i = i + 1
 
         while (i < nLines) and (string.find (buff [i], "class TDEApplication") < 0):
diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index f1586ae..5387494 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -43,7 +43,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 8d79dd1..d45d49c 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 9ac414d..223be7a 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 1bb8849..8604a30 100644
--- a/templates/annotated/systray.py
+++ b/templates/annotated/systray.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from qt import TQWidget, SIGNAL
+from python_tqt.qt 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 e25ffb6..78967c9 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -35,7 +35,7 @@ copyright holder.
 
 import sys
 
-from qt import TQLabel, TQWidget, SIGNAL
+from python_tqt.qt 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 65f5813..7240e57 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from qt import SIGNAL
+from python_tqt.qt 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 dceec10..796e628 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -42,7 +42,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 a9ec76f..9d14f6c 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 ce0dfaf..4577ed6 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -41,7 +41,7 @@ True  = not False
 
 import sys
 
-from qt import TQPopupMenu, SIGNAL
+from python_tqt.qt 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 84f2e1a..da2a34f 100644
--- a/templates/basic/systray.py
+++ b/templates/basic/systray.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from qt import TQWidget, SIGNAL
+from python_tqt.qt import TQWidget, SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import  KSystemTray
 
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index b6b9b05..a8f9ca2 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -29,7 +29,7 @@ copyright holder.
 
 import sys
 
-from qt import TQLabel, TQWidget, SIGNAL
+from python_tqt.qt import TQLabel, TQWidget, SIGNAL
 from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray