Properly import python_tqt module

This relates to bug 2693

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

16 files changed, 21 insertions, 20 deletions

diff --git a/contrib/tdepyuic b/contrib/tdepyuic
index 7299e13..d391f8d 100755
--- a/contrib/tdepyuic
+++ b/contrib/tdepyuic
@@ -134,7 +134,7 @@ def doPyuic ():
         buff = m.readlines ()
 
         for line in buff:
-            if addImport and (string.strip (line) == 'from qt import *'):
+            if addImport and (string.strip (line) == 'from python_tqt.qt import *'):
                 n.write (line)
                 addimport (n)
             elif addApp and (string.strip (line) == 'a = TQApplication(sys.argv)'):
diff --git a/examples/mimetype.py b/examples/mimetype.py
index 5cd67a7..7166642 100644
--- a/examples/mimetype.py
+++ b/examples/mimetype.py
@@ -39,7 +39,7 @@ copyright holder.
 
 import sys
 
-from qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
+from python_tqt.qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
 from tdeui import TDEMainWindow, KTabCtl, TDEListBox
diff --git a/examples/pytde-sampler/basic_widgets/datepicker.py b/examples/pytde-sampler/basic_widgets/datepicker.py
index b0f74c6..a0d74ab 100644
--- a/examples/pytde-sampler/basic_widgets/datepicker.py
+++ b/examples/pytde-sampler/basic_widgets/datepicker.py
@@ -1,5 +1,5 @@
-from qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL, TQLabel, TQSizePolicy, TQt
-from qttable import TQTable
+from python_tqt.qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL, TQLabel, TQSizePolicy, TQt
+from python_tqt.qttable 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 6bbc32e..e11c24f 100644
--- a/examples/pytde-sampler/basic_widgets/historycombo.py
+++ b/examples/pytde-sampler/basic_widgets/historycombo.py
@@ -1,4 +1,4 @@
-from qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQStringList, TQLabel, \
+from python_tqt.qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQStringList, TQLabel, \
      SIGNAL, SLOT
 from tdeui import KHistoryCombo, KTextEdit
 
diff --git a/examples/pytde-sampler/dialogs/config.py b/examples/pytde-sampler/dialogs/config.py
index 0710d2d..425af82 100644
--- a/examples/pytde-sampler/dialogs/config.py
+++ b/examples/pytde-sampler/dialogs/config.py
@@ -1,5 +1,5 @@
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQString
+from python_tqt.qt 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 0dabb2f..0d3f097 100644
--- a/examples/pytde-sampler/dialogs/edfind.py
+++ b/examples/pytde-sampler/dialogs/edfind.py
@@ -1,5 +1,5 @@
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from python_tqt.qt 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 2cbc03e..b8c9c80 100644
--- a/examples/pytde-sampler/dialogs/edreplace.py
+++ b/examples/pytde-sampler/dialogs/edreplace.py
@@ -1,4 +1,4 @@
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from python_tqt.qt 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 6e870b7..e788cbd 100644
--- a/examples/pytde-sampler/dialogs/font.py
+++ b/examples/pytde-sampler/dialogs/font.py
@@ -1,5 +1,5 @@
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL, TQFont, TQString
+from python_tqt.qt 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/progress.py b/examples/pytde-sampler/dialogs/progress.py
index 948ad78..7a7f68b 100644
--- a/examples/pytde-sampler/dialogs/progress.py
+++ b/examples/pytde-sampler/dialogs/progress.py
@@ -2,7 +2,7 @@ iconName = 'go'
 labelText = 'KProgressDialog'
 
 
-from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL
+from python_tqt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, TQTimer, SIGNAL
 from tdecore import i18n
 from tdeui import KPushButton, KProgressDialog, KTextEdit
 
diff --git a/examples/pytde-sampler/misc/passivepop.py b/examples/pytde-sampler/misc/passivepop.py
index 3619fc4..3bf1241 100644
--- a/examples/pytde-sampler/misc/passivepop.py
+++ b/examples/pytde-sampler/misc/passivepop.py
@@ -1,4 +1,4 @@
-from qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL
+from python_tqt.qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL
 from tdeui import KPassivePopup, KTextEdit, KPushButton
 from tdecore import TDEGlobal, TDEIcon
 
diff --git a/examples/pytde-sampler/qt_widgets/table.py b/examples/pytde-sampler/qt_widgets/table.py
index 4a689d2..254f8da 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 qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL
-from qttable import TQTable
+from python_tqt.qt import TQFrame, TQStringList, TQVBoxLayout, SIGNAL
+from python_tqt.qttable import TQTable
 
 from tdeui import KTextEdit
 
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index a24650c..e4904a3 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -10,9 +10,9 @@ import inspect
 import os
 import sys
 
-from qt import SIGNAL, SLOT, PYSIGNAL, TQt
-from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
-from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
+from python_tqt.qt import SIGNAL, SLOT, PYSIGNAL, TQt
+from python_tqt.qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
+from python_tqt.qt 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/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py
index b9f79f4..8c8b429 100644
--- a/examples/uimodules/uiwidgets.py
+++ b/examples/uimodules/uiwidgets.py
@@ -1,6 +1,6 @@
 import time, sys
 
-from qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, TQt, TQString, TQChar,\
+from python_tqt.qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, TQt, TQString, TQChar,\
                TQWidget, TQTimer
 
 from tdecore import TDEApplication
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index 981ceb4..0cc355f 100644
--- a/examples/uiqxembed.py
+++ b/examples/uiqxembed.py
@@ -4,7 +4,7 @@
 """
 import sys
 
-from qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
+from python_tqt.qt 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 a41b87c..7b6c5ce 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -1,7 +1,7 @@
 import sys
 sys.path.append ("./uimodules")
 
-from qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
+from python_tqt.qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
 
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from tdeui import TDEMainWindow, TDEListView
diff --git a/pytdeconfig.py b/pytdeconfig.py
index 1eacb8d..a0f410a 100644
--- a/pytdeconfig.py
+++ b/pytdeconfig.py
@@ -22,7 +22,8 @@
 # modules that %Import PyKDE modules.
 
 
-import sipconfig, pyqtconfig
+from sip4_tqt import sipconfig
+from python_tqt import pyqtconfig
 
 
 # These are installation specific values created when PyTQt was configured.