Properly import python_tqt module - second part

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b7a62620df)

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    
     

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

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
 
 
 

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,\

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
 

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
 
 

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
 
 

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):

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 

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

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
 

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
 
 

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
 

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
 

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
 
 

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

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):

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):

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
 

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

examples/uimodules/uimenus.py

@@ -1,6 +1,6 @@
 import os
 
-from qt import TQLabel
+from python_tqt.qt import TQLabel
 
 from tdecore import TDEApplication
 

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
 

examples/uimodules/uixml.py

@@ -1,6 +1,6 @@
 import os
 
-from qt import TQLabel
+from python_tqt.qt import TQLabel
 
 from tdecore import TDEApplication
 

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
 

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,\

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",

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,

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):

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

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

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

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
 

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
 

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
 

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

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

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

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
 

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