Rename ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY in ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 67520f2b70)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

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

doc/classref/tdefile/KAppTreeListItem.html

@@ -35,7 +35,7 @@
         </tr>
         </table>
         <h3>methods</h3><ul>
-<li><b>KAppTreeListItem</b> (a0, a1, a2, a3, a4, a5, a6)
+<li><b>KAppTreeListItem</b> (a0, a1, a2, a3, a4, a5, a6, a7)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KAppTreeListItem instance</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
@@ -46,9 +46,10 @@
 <tr><td>a4</td><td>bool</td><td></td></tr>
 <tr><td>a5</td><td>TQString</td><td></td></tr>
 <tr><td>a6</td><td>TQString</td><td></td></tr>
+<tr><td>a7</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>KAppTreeListItem</b> (a0, a1, a2, a3, a4, a5, a6)
+<li><b>KAppTreeListItem</b> (a0, a1, a2, a3, a4, a5, a6, a7)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KAppTreeListItem instance</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
@@ -59,13 +60,14 @@
 <tr><td>a4</td><td>bool</td><td></td></tr>
 <tr><td>a5</td><td>TQString</td><td></td></tr>
 <tr><td>a6</td><td>TQString</td><td></td></tr>
+<tr><td>a7</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>activate</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>init</b> (a0, a1, a2, a3, a4)
+<li><b>init</b> (a0, a1, a2, a3, a4, a5)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
@@ -74,6 +76,7 @@
 <tr><td>a2</td><td>bool</td><td></td></tr>
 <tr><td>a3</td><td>TQString</td><td></td></tr>
 <tr><td>a4</td><td>TQString</td><td></td></tr>
+<tr><td>a5</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>isDirectory</b> ()

doc/classref/tdefile/KOpenWithDlg.html

@@ -106,21 +106,23 @@
 <li><b>slotDbClick</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>slotHighlighted</b> (_name, _exec)
+<li><b>slotHighlighted</b> (_name, _exec, _desktopPath)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>_name</td><td>TQString</td><td></td></tr>
 <tr><td>_exec</td><td>TQString</td><td></td></tr>
+<tr><td>_desktopPath</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>slotOK</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>slotSelected</b> (_name, _exec)
+<li><b>slotSelected</b> (_name, _exec, _desktopPath)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>_name</td><td>TQString</td><td></td></tr>
 <tr><td>_exec</td><td>TQString</td><td></td></tr>
+<tr><td>_desktopPath</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>slotTerminalToggled</b> (a0)

doc/classref/tdefile/TDEApplicationTree.html

@@ -50,12 +50,13 @@
 <tr><td>a1</td><td>KAppTreeListItem</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>highlighted</b> (a0, a1)
+<li><b>highlighted</b> (a0, a1, a2)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>a0</td><td>TQString</td><td></td></tr>
 <tr><td>a1</td><td>TQString</td><td></td></tr>
+<tr><td>a2</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>isDirSel</b> ()
@@ -69,12 +70,13 @@
 <tr><td>a0</td><td>TQResizeEvent</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>selected</b> (a0, a1)
+<li><b>selected</b> (a0, a1, a2)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions <i>less than</i> KDE 3.1.0 only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>a0</td><td>TQString</td><td></td></tr>
 <tr><td>a1</td><td>TQString</td><td></td></tr>
+<tr><td>a2</td><td>TQString</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>slotItemHighlighted</b> (a0)

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/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

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/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
 
 

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
 

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/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
 

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
 

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
 

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
 

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/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
 

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/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
 

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/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
 

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/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

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/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

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/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

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

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,
@@ -40,7 +40,7 @@ from tdecore import dcop_add, dcop_next
 #
 #      I think 64 bit types would be:
 #      long long, unsigned long long, long long int, unsigned long long int,
-#      TQ_LLONG, TQ_ULLONG, TTQ_INT64, TTQ_UINT64
+#      TQ_LLONG, TQ_ULLONG, TQ_INT64, TQ_UINT64
 #
 #      and on some (most?) systems:
 #      TQtOffset

extra/kde300/kicontheme.h

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
+/*
  * $Id: kicontheme.h,v 1.19 2002/03/05 23:13:26 rich Exp $
  *
  * This file is part of the KDE project, module tdecore.

extra/kde300/tderecentdirs.h

@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * Copyright (C)2000 Waldo Bastian <bastian@kde.org>
  *
  * All rights reserved.

extra/kde301/kicontheme.h

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
+/*
  * $Id: kicontheme.h,v 1.19 2002/03/05 23:13:26 rich Exp $
  *
  * This file is part of the KDE project, module tdecore.

extra/kde301/tderecentdirs.h

@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * Copyright (C)2000 Waldo Bastian <bastian@kde.org>
  *
  * All rights reserved.

extra/kde303/kicontheme.h

@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
+/*
  * $Id: kicontheme.h,v 1.19 2002/03/05 23:13:26 rich Exp $
  *
  * This file is part of the KDE project, module tdecore.

extra/kde303/tderecentdirs.h

@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * Copyright (C)2000 Waldo Bastian <bastian@kde.org>
  *
  * All rights reserved.