From f303e4dc2ba3075192db2ab1fc570abd10ba224a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 25 Sep 2016 11:01:09 +0200 Subject: [PATCH] Fix examples to properly import python_tqt module This resolves bug 2693 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit e790d08307644b6718b2a547c21370b82aa4f376) --- examples2/aclock.py | 2 +- examples2/addressbook.py | 2 +- examples2/application.py | 10 +++++----- examples2/buttongroups.py | 2 +- examples2/dclock.py | 2 +- examples2/desktop.py | 2 +- examples2/dirview.py | 2 +- examples2/dragdrop.py | 2 +- examples2/dropsite.py | 2 +- examples2/gears.py | 4 ++-- examples2/menu.py | 2 +- examples2/secret.py | 2 +- examples2/semaphore.py | 4 ++-- examples2/splitter.py | 2 +- examples2/table.py | 2 +- examples2/themes.py | 2 +- examples2/tut1.py | 2 +- examples2/tut10.py | 2 +- examples2/tut11.py | 2 +- examples2/tut12.py | 2 +- examples2/tut13.py | 2 +- examples2/tut14.py | 2 +- examples2/tut2.py | 2 +- examples2/tut3.py | 2 +- examples2/tut4.py | 2 +- examples2/tut5.py | 2 +- examples2/tut6.py | 2 +- examples2/tut7.py | 2 +- examples2/tut8.py | 2 +- examples2/tut9.py | 2 +- examples2/widgets.py | 2 +- examples3/SQL/dbconnect.py | 4 ++-- examples3/SQL/frmconnect.py | 2 +- examples3/SQL/runform1.py | 2 +- examples3/SQL/runform2.py | 2 +- examples3/SQL/runsqlex.py | 4 ++-- examples3/SQL/sqlcustom1.py | 4 ++-- examples3/SQL/sqlsubclass5.py | 4 ++-- examples3/SQL/sqltable4.py | 4 ++-- examples3/aclock.py | 2 +- examples3/addressbook.py | 2 +- examples3/application.py | 2 +- examples3/biff.py | 2 +- examples3/bigtable.py | 4 ++-- examples3/buttongroups.py | 2 +- examples3/canvas/canvas.py | 4 ++-- examples3/checklists.py | 2 +- examples3/cursor.py | 2 +- examples3/dclock.py | 2 +- examples3/desktop.py | 2 +- examples3/dirview.py | 2 +- examples3/dragdrop.py | 2 +- examples3/drawlines.py | 2 +- examples3/dropsite.py | 2 +- examples3/fontdisplayer.py | 2 +- examples3/fonts.py | 2 +- examples3/gears.py | 4 ++-- examples3/i18n/i18n.py | 2 +- examples3/i18n/mywidget.py | 2 +- examples3/lineedits.py | 2 +- examples3/listbox.py | 2 +- examples3/listboxcombo.py | 2 +- examples3/mdi.py | 2 +- examples3/menu.py | 2 +- examples3/progress.py | 2 +- examples3/progressbar.py | 2 +- examples3/qdir.py | 2 +- examples3/qmag.py | 2 +- examples3/rangecontrols.py | 2 +- examples3/richtext.py | 2 +- examples3/secret.py | 2 +- examples3/semaphore.py | 4 ++-- examples3/smalltable.py | 4 ++-- examples3/splitter.py | 2 +- examples3/tabdialog.py | 2 +- examples3/tablestatistics.py | 4 ++-- examples3/tooltip.py | 2 +- examples3/tut1.py | 2 +- examples3/tut10.py | 4 ++-- examples3/tut11.py | 4 ++-- examples3/tut12.py | 4 ++-- examples3/tut13.py | 4 ++-- examples3/tut14.py | 6 +++--- examples3/tut2.py | 2 +- examples3/tut3.py | 2 +- examples3/tut4.py | 4 ++-- examples3/tut5.py | 4 ++-- examples3/tut6.py | 4 ++-- examples3/tut7.py | 4 ++-- examples3/tut8.py | 4 ++-- examples3/tut9.py | 4 ++-- examples3/webbrowser/mainwindow.py | 4 ++-- examples3/webbrowser/webbrowser.py | 4 ++-- examples3/widgets.py | 2 +- 94 files changed, 125 insertions(+), 125 deletions(-) diff --git a/examples2/aclock.py b/examples2/aclock.py index 9fc773b..3c04e20 100755 --- a/examples2/aclock.py +++ b/examples2/aclock.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * def TQMIN(x, y): if y > x: return y diff --git a/examples2/addressbook.py b/examples2/addressbook.py index 6d7309b..96746c0 100755 --- a/examples2/addressbook.py +++ b/examples2/addressbook.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples2/application.py b/examples2/application.py index 97d07bf..291231e 100755 --- a/examples2/application.py +++ b/examples2/application.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * fileopen = [ @@ -104,13 +104,13 @@ class ApplicationWindow(TQMainWindow): self.fileTools = TQToolBar(self,'file operations') openIcon = TQPixmap(fileopen) - self.fileOpen = TQToolButton(openIcon,'Open File',TQString.null,self.load,self.fileTools,'open file') + self.fileOpen = TQToolButton(TQIconSet(openIcon),'Open File',TQString.null,self.load,self.fileTools,'open file') saveIcon = TQPixmap(filesave) - self.fileSave = TQToolButton(saveIcon,'Save File',TQString.null,self.save,self.fileTools,'save file') - + self.fileSave = TQToolButton(TQIconSet(saveIcon),'Save File',TQString.null,self.save,self.fileTools,'save file') + printIcon = TQPixmap(fileprint) - self.filePrint = TQToolButton(printIcon,'Print File',TQString.null,self.printDoc,self.fileTools,'print file') + self.filePrint = TQToolButton(TQIconSet(printIcon),'Print File',TQString.null,self.printDoc,self.fileTools,'print file') TQWhatsThis.whatsThisButton(self.fileTools) diff --git a/examples2/buttongroups.py b/examples2/buttongroups.py index 147952a..88836c6 100755 --- a/examples2/buttongroups.py +++ b/examples2/buttongroups.py @@ -10,7 +10,7 @@ #*****************************************************************************/ import sys -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples2/dclock.py b/examples2/dclock.py index d129681..eb4e990 100755 --- a/examples2/dclock.py +++ b/examples2/dclock.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * class DigitalClock(TQLCDNumber): diff --git a/examples2/desktop.py b/examples2/desktop.py index a2cccb1..049f39d 100755 --- a/examples2/desktop.py +++ b/examples2/desktop.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * seed = 0.353535353535 KINDA_RAND_MAX = 32767 diff --git a/examples2/dirview.py b/examples2/dirview.py index 66beda1..11e7eed 100755 --- a/examples2/dirview.py +++ b/examples2/dirview.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * class Directory(TQListViewItem): def __init__(self, parent, name=None): diff --git a/examples2/dragdrop.py b/examples2/dragdrop.py index 0a7177b..a715170 100755 --- a/examples2/dragdrop.py +++ b/examples2/dragdrop.py @@ -3,7 +3,7 @@ # Ported to PyTQt by Issac Trotts on Jan 1, 2002 import sys -from qt import * +from python_tqt.qt import * import dropsite, secret diff --git a/examples2/dropsite.py b/examples2/dropsite.py index 8dcbabc..94b7e57 100644 --- a/examples2/dropsite.py +++ b/examples2/dropsite.py @@ -1,7 +1,7 @@ # This is part of the dragdrop example. -from qt import * +from python_tqt.qt import * import secret diff --git a/examples2/gears.py b/examples2/gears.py index 3e10a67..60f313c 100755 --- a/examples2/gears.py +++ b/examples2/gears.py @@ -3,8 +3,8 @@ import sys import math -from qt import * -from qtgl import * +from python_tqt.qt import * +from python_tqt.qtgl import * from OpenGL.GL import * def gear(inner_radius,outer_radius,width,teeth,tooth_depth): diff --git a/examples2/menu.py b/examples2/menu.py index 4f1cadd..b5c14d8 100755 --- a/examples2/menu.py +++ b/examples2/menu.py @@ -11,7 +11,7 @@ #*****************************************************************************/ import sys, string -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples2/secret.py b/examples2/secret.py index b405737..8c8de85 100644 --- a/examples2/secret.py +++ b/examples2/secret.py @@ -1,7 +1,7 @@ # This is part of the dragdrop example. -from qt import * +from python_tqt.qt import * def canDecode(e): diff --git a/examples2/semaphore.py b/examples2/semaphore.py index 9aaf6d5..6a16347 100755 --- a/examples2/semaphore.py +++ b/examples2/semaphore.py @@ -7,12 +7,12 @@ import sys # Check if thread support was enabled. try: - from qt import TQThread + from python_tqt.qt import TQThread except: print "Thread support not enabled" sys.exit(1) -from qt import * +from python_tqt.qt import * # The semaphore instances. diff --git a/examples2/splitter.py b/examples2/splitter.py index b2e30cc..36a7556 100755 --- a/examples2/splitter.py +++ b/examples2/splitter.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * class Test(TQWidget): def __init__(self, parent=None, name='Test', f=0): diff --git a/examples2/table.py b/examples2/table.py index f9502b7..36e2cf9 100755 --- a/examples2/table.py +++ b/examples2/table.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * class Table(TQTableView): def __init__(self, numRows, numCols, parent=None, name=''): diff --git a/examples2/themes.py b/examples2/themes.py index e1fb529..4465348 100755 --- a/examples2/themes.py +++ b/examples2/themes.py @@ -13,7 +13,7 @@ import os, sys # include files for QT -from qt import * +from python_tqt.qt import * class ButtonsGroups(TQVBox): diff --git a/examples2/tut1.py b/examples2/tut1.py index 43649bf..f6e4b47 100755 --- a/examples2/tut1.py +++ b/examples2/tut1.py @@ -3,7 +3,7 @@ # TQt tutorial 1. import sys -from qt import * +from python_tqt.qt import * a = TQApplication(sys.argv) diff --git a/examples2/tut10.py b/examples2/tut10.py index dda42b1..b6213a5 100755 --- a/examples2/tut10.py +++ b/examples2/tut10.py @@ -3,7 +3,7 @@ # TQt tutorial 10. import sys -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut11.py b/examples2/tut11.py index 99c0290..0f60d72 100755 --- a/examples2/tut11.py +++ b/examples2/tut11.py @@ -4,7 +4,7 @@ import sys import math -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut12.py b/examples2/tut12.py index 4adcd1f..95f90b1 100755 --- a/examples2/tut12.py +++ b/examples2/tut12.py @@ -5,7 +5,7 @@ import sys import math import random -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut13.py b/examples2/tut13.py index 9147c45..1584443 100755 --- a/examples2/tut13.py +++ b/examples2/tut13.py @@ -5,7 +5,7 @@ import sys import math import random -from qt import * +from python_tqt.qt import * class LCDRange(TQWidget): diff --git a/examples2/tut14.py b/examples2/tut14.py index a61c0dd..1ee3a5c 100755 --- a/examples2/tut14.py +++ b/examples2/tut14.py @@ -5,7 +5,7 @@ import sys import math import random -from qt import * +from python_tqt.qt import * class LCDRange(TQWidget): diff --git a/examples2/tut2.py b/examples2/tut2.py index 48ddb89..730b047 100755 --- a/examples2/tut2.py +++ b/examples2/tut2.py @@ -3,7 +3,7 @@ # TQt tutorial 2. import sys -from qt import * +from python_tqt.qt import * a = TQApplication(sys.argv) diff --git a/examples2/tut3.py b/examples2/tut3.py index 5284840..b1fe6ee 100755 --- a/examples2/tut3.py +++ b/examples2/tut3.py @@ -3,7 +3,7 @@ # TQt tutorial 3. import sys -from qt import * +from python_tqt.qt import * a = TQApplication(sys.argv) diff --git a/examples2/tut4.py b/examples2/tut4.py index 71a5b65..76d99bb 100755 --- a/examples2/tut4.py +++ b/examples2/tut4.py @@ -3,7 +3,7 @@ # TQt tutorial 4. import sys -from qt import * +from python_tqt.qt import * class MyWidget(TQWidget): diff --git a/examples2/tut5.py b/examples2/tut5.py index 16577b4..c77d843 100755 --- a/examples2/tut5.py +++ b/examples2/tut5.py @@ -3,7 +3,7 @@ # TQt tutorial 5. import sys -from qt import * +from python_tqt.qt import * class MyWidget(TQVBox): diff --git a/examples2/tut6.py b/examples2/tut6.py index d97d842..b26121a 100755 --- a/examples2/tut6.py +++ b/examples2/tut6.py @@ -3,7 +3,7 @@ # TQt tutorial 6. import sys -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut7.py b/examples2/tut7.py index fd0705a..03098aa 100755 --- a/examples2/tut7.py +++ b/examples2/tut7.py @@ -3,7 +3,7 @@ # TQt tutorial 7. import sys -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut8.py b/examples2/tut8.py index 09ea0d3..d252e55 100755 --- a/examples2/tut8.py +++ b/examples2/tut8.py @@ -3,7 +3,7 @@ # TQt tutorial 8. import sys -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/tut9.py b/examples2/tut9.py index 5938004..5bad8d8 100755 --- a/examples2/tut9.py +++ b/examples2/tut9.py @@ -3,7 +3,7 @@ # TQt tutorial 9. import sys -from qt import * +from python_tqt.qt import * class LCDRange(TQVBox): diff --git a/examples2/widgets.py b/examples2/widgets.py index 3dfa524..fc36e7a 100755 --- a/examples2/widgets.py +++ b/examples2/widgets.py @@ -2,7 +2,7 @@ import sys, string -from qt import * +from python_tqt.qt import * # ## Constructs an analog clock widget that uses an internal TQTimer. diff --git a/examples3/SQL/dbconnect.py b/examples3/SQL/dbconnect.py index 6986d08..db922de 100755 --- a/examples3/SQL/dbconnect.py +++ b/examples3/SQL/dbconnect.py @@ -1,8 +1,8 @@ #!/usr/bin/env python import sys -from qt import * -from qtsql import * +from python_tqt.qt import * +from python_tqt.qtsql import * from frmconnect import frmConnect from dbpar import * diff --git a/examples3/SQL/frmconnect.py b/examples3/SQL/frmconnect.py index 92cf3f6..97fb406 100644 --- a/examples3/SQL/frmconnect.py +++ b/examples3/SQL/frmconnect.py @@ -6,7 +6,7 @@ # WARNING! All changes made in this file will be lost! -from qt import * +from python_tqt.qt import * class frmConnect(TQDialog): diff --git a/examples3/SQL/runform1.py b/examples3/SQL/runform1.py index b2b9951..2e01b7e 100755 --- a/examples3/SQL/runform1.py +++ b/examples3/SQL/runform1.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * from form1 import Form1 from dbconnect import createConnection diff --git a/examples3/SQL/runform2.py b/examples3/SQL/runform2.py index 485eed3..0184e9d 100755 --- a/examples3/SQL/runform2.py +++ b/examples3/SQL/runform2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * from form2 import Form2 from dbconnect import createConnection diff --git a/examples3/SQL/runsqlex.py b/examples3/SQL/runsqlex.py index 0ac779f..2235699 100755 --- a/examples3/SQL/runsqlex.py +++ b/examples3/SQL/runsqlex.py @@ -1,8 +1,8 @@ #!/usr/bin/env python import sys -from qt import * -from qtsql import * +from python_tqt.qt import * +from python_tqt.qtsql import * from sqlex import SqlEx from connect import ConnectDialog diff --git a/examples3/SQL/sqlcustom1.py b/examples3/SQL/sqlcustom1.py index f708c1e..4da8f8a 100755 --- a/examples3/SQL/sqlcustom1.py +++ b/examples3/SQL/sqlcustom1.py @@ -11,8 +11,8 @@ #*****************************************************************************/ import sys -from qt import * -from qtsql import * +from python_tqt.qt import * +from python_tqt.qtsql import * from dbconnect import createConnection diff --git a/examples3/SQL/sqlsubclass5.py b/examples3/SQL/sqlsubclass5.py index 07cc90a..56f747e 100755 --- a/examples3/SQL/sqlsubclass5.py +++ b/examples3/SQL/sqlsubclass5.py @@ -11,8 +11,8 @@ #*****************************************************************************/ import sys -from qt import * -from qtsql import * +from python_tqt.qt import * +from python_tqt.qtsql import * from dbconnect import createConnection diff --git a/examples3/SQL/sqltable4.py b/examples3/SQL/sqltable4.py index 001e897..599f093 100755 --- a/examples3/SQL/sqltable4.py +++ b/examples3/SQL/sqltable4.py @@ -11,8 +11,8 @@ #*****************************************************************************/ import sys -from qt import * -from qtsql import * +from python_tqt.qt import * +from python_tqt.qtsql import * from dbconnect import createConnection diff --git a/examples3/aclock.py b/examples3/aclock.py index 9fc773b..3c04e20 100755 --- a/examples3/aclock.py +++ b/examples3/aclock.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * def TQMIN(x, y): if y > x: return y diff --git a/examples3/addressbook.py b/examples3/addressbook.py index 6d7309b..96746c0 100755 --- a/examples3/addressbook.py +++ b/examples3/addressbook.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/application.py b/examples3/application.py index eca45a9..2c9731c 100755 --- a/examples3/application.py +++ b/examples3/application.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * fileopen = [ diff --git a/examples3/biff.py b/examples3/biff.py index ed2aa2a..9397a0e 100755 --- a/examples3/biff.py +++ b/examples3/biff.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os, sys, string -from qt import * +from python_tqt.qt import * if TQT_VERSION < 0x030100: diff --git a/examples3/bigtable.py b/examples3/bigtable.py index 61fcb71..f2d9788 100755 --- a/examples3/bigtable.py +++ b/examples3/bigtable.py @@ -12,8 +12,8 @@ import sys import os -from qt import * -from qttable import * +from python_tqt.qt import * +from python_tqt.qttable import * TRUE = 1 FALSE = 0 diff --git a/examples3/buttongroups.py b/examples3/buttongroups.py index 65b8a96..7f9e079 100755 --- a/examples3/buttongroups.py +++ b/examples3/buttongroups.py @@ -10,7 +10,7 @@ #*****************************************************************************/ import sys -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/canvas/canvas.py b/examples3/canvas/canvas.py index dd39337..2fa3bf9 100755 --- a/examples3/canvas/canvas.py +++ b/examples3/canvas/canvas.py @@ -1,8 +1,8 @@ #!/usr/bin/env python import sys -from qt import * -from qtcanvas import * +from python_tqt.qt import * +from python_tqt.qtcanvas import * import random diff --git a/examples3/checklists.py b/examples3/checklists.py index d6378e6..8402d86 100755 --- a/examples3/checklists.py +++ b/examples3/checklists.py @@ -4,7 +4,7 @@ # Copyright (C) 2002 Oleksandr Yakovlyev (yshurik) import sys -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/cursor.py b/examples3/cursor.py index c9f42bc..ab87c32 100755 --- a/examples3/cursor.py +++ b/examples3/cursor.py @@ -10,7 +10,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * # cb_bits and cm_bits were generated by X bitmap program. diff --git a/examples3/dclock.py b/examples3/dclock.py index d129681..eb4e990 100755 --- a/examples3/dclock.py +++ b/examples3/dclock.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * class DigitalClock(TQLCDNumber): diff --git a/examples3/desktop.py b/examples3/desktop.py index 393558b..7ed96cd 100755 --- a/examples3/desktop.py +++ b/examples3/desktop.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * seed = 0.353535353535 KINDA_RAND_MAX = 32767 diff --git a/examples3/dirview.py b/examples3/dirview.py index 1783d51..e6b1f58 100755 --- a/examples3/dirview.py +++ b/examples3/dirview.py @@ -12,7 +12,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * folder_closed_xpm = [ "16 16 9 1", diff --git a/examples3/dragdrop.py b/examples3/dragdrop.py index 0a7177b..a715170 100755 --- a/examples3/dragdrop.py +++ b/examples3/dragdrop.py @@ -3,7 +3,7 @@ # Ported to PyTQt by Issac Trotts on Jan 1, 2002 import sys -from qt import * +from python_tqt.qt import * import dropsite, secret diff --git a/examples3/drawlines.py b/examples3/drawlines.py index bdbe814..c1553f2 100755 --- a/examples3/drawlines.py +++ b/examples3/drawlines.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys, random -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/dropsite.py b/examples3/dropsite.py index 523f7d0..8581e0e 100644 --- a/examples3/dropsite.py +++ b/examples3/dropsite.py @@ -1,7 +1,7 @@ # This is part of the dragdrop example. -from qt import * +from python_tqt.qt import * import secret diff --git a/examples3/fontdisplayer.py b/examples3/fontdisplayer.py index b11e520..7e66572 100755 --- a/examples3/fontdisplayer.py +++ b/examples3/fontdisplayer.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * class FontRowTable( TQFrame ): def __init__( self, parent=None, name=None ): diff --git a/examples3/fonts.py b/examples3/fonts.py index 84dffb4..68f0b54 100755 --- a/examples3/fonts.py +++ b/examples3/fonts.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * class Viewer( TQWidget ): def __init__( self ): diff --git a/examples3/gears.py b/examples3/gears.py index a9f6bba..05f0469 100755 --- a/examples3/gears.py +++ b/examples3/gears.py @@ -3,8 +3,8 @@ import sys import math -from qt import * -from qtgl import * +from python_tqt.qt import * +from python_tqt.qtgl import * from OpenGL.GL import * def gear(inner_radius,outer_radius,width,teeth,tooth_depth): diff --git a/examples3/i18n/i18n.py b/examples3/i18n/i18n.py index 866b097..74f3422 100755 --- a/examples3/i18n/i18n.py +++ b/examples3/i18n/i18n.py @@ -5,7 +5,7 @@ from whrandom import randint import sys -from qt import * +from python_tqt.qt import * from mywidget import MyWidget diff --git a/examples3/i18n/mywidget.py b/examples3/i18n/mywidget.py index c714910..8013c1c 100644 --- a/examples3/i18n/mywidget.py +++ b/examples3/i18n/mywidget.py @@ -1,6 +1,6 @@ # Copyright (c) 2002 Detlev Offenbach -from qt import * +from python_tqt.qt import * class MyWidget(TQMainWindow): diff --git a/examples3/lineedits.py b/examples3/lineedits.py index 5ff9538..0093f40 100755 --- a/examples3/lineedits.py +++ b/examples3/lineedits.py @@ -11,7 +11,7 @@ #*****************************************************************************/ import sys -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/listbox.py b/examples3/listbox.py index c83add0..fce0cc8 100755 --- a/examples3/listbox.py +++ b/examples3/listbox.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * FALSE = 0 TRUE = 1 diff --git a/examples3/listboxcombo.py b/examples3/listboxcombo.py index 1a39310..baca5d2 100755 --- a/examples3/listboxcombo.py +++ b/examples3/listboxcombo.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * FALSE = 0 TRUE = 1 diff --git a/examples3/mdi.py b/examples3/mdi.py index 8418678..8f1cf93 100755 --- a/examples3/mdi.py +++ b/examples3/mdi.py @@ -4,7 +4,7 @@ import sys, string -from qt import * +from python_tqt.qt import * fileopen = [ diff --git a/examples3/menu.py b/examples3/menu.py index a303fb2..31fadd9 100755 --- a/examples3/menu.py +++ b/examples3/menu.py @@ -11,7 +11,7 @@ #*****************************************************************************/ import sys, string -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/progress.py b/examples3/progress.py index b475020..eb5a832 100755 --- a/examples3/progress.py +++ b/examples3/progress.py @@ -13,7 +13,7 @@ #*****************************************************************************/ import sys -from qt import * +from python_tqt.qt import * from random import randint class AnimatedThingy(TQLabel): diff --git a/examples3/progressbar.py b/examples3/progressbar.py index 9887a97..e33362e 100755 --- a/examples3/progressbar.py +++ b/examples3/progressbar.py @@ -12,7 +12,7 @@ #import pdb import sys -from qt import * +from python_tqt.qt import * FALSE = 0 TRUE = 1 diff --git a/examples3/qdir.py b/examples3/qdir.py index 03cc5c9..62d452e 100755 --- a/examples3/qdir.py +++ b/examples3/qdir.py @@ -4,7 +4,7 @@ import os import pickle -from qt import * +from python_tqt.qt import * from dirview import Directory, DirectoryView bookmarks = [ diff --git a/examples3/qmag.py b/examples3/qmag.py index 28725e5..186a473 100755 --- a/examples3/qmag.py +++ b/examples3/qmag.py @@ -11,7 +11,7 @@ #*****************************************************************************/ import sys -from qt import * +from python_tqt.qt import * TRUE = 1 FALSE = 0 diff --git a/examples3/rangecontrols.py b/examples3/rangecontrols.py index 6250bf4..a56eff3 100755 --- a/examples3/rangecontrols.py +++ b/examples3/rangecontrols.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * INT_MAX = sys.maxint diff --git a/examples3/richtext.py b/examples3/richtext.py index 7c99ee2..78c0db7 100755 --- a/examples3/richtext.py +++ b/examples3/richtext.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * sayings = [ "Saying 1:
" diff --git a/examples3/secret.py b/examples3/secret.py index 434664b..34560ed 100644 --- a/examples3/secret.py +++ b/examples3/secret.py @@ -1,7 +1,7 @@ # This is part of the dragdrop example. -from qt import * +from python_tqt.qt import * def canDecode(e): diff --git a/examples3/semaphore.py b/examples3/semaphore.py index 68128d7..46cdace 100755 --- a/examples3/semaphore.py +++ b/examples3/semaphore.py @@ -7,12 +7,12 @@ import sys # Check if thread support was enabled. try: - from qt import TQThread + from python_tqt.qt import TQThread except: print "Thread support not enabled" sys.exit(1) -from qt import * +from python_tqt.qt import * # The semaphore instances. diff --git a/examples3/smalltable.py b/examples3/smalltable.py index 2fbda72..52f212a 100755 --- a/examples3/smalltable.py +++ b/examples3/smalltable.py @@ -12,8 +12,8 @@ import sys import os -from qt import * -from qttable import * +from python_tqt.qt import * +from python_tqt.qttable import * TRUE = 1 FALSE = 0 diff --git a/examples3/splitter.py b/examples3/splitter.py index 33d1aa2..709e960 100755 --- a/examples3/splitter.py +++ b/examples3/splitter.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import sys -from qt import * +from python_tqt.qt import * class Test(TQWidget): def __init__(self, parent=None, name='Test', f=0): diff --git a/examples3/tabdialog.py b/examples3/tabdialog.py index 19fd1a2..00e66f6 100755 --- a/examples3/tabdialog.py +++ b/examples3/tabdialog.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * class TabDialog( TQTabDialog ): def __init__( self, parent=None, name=None, filename=None ): diff --git a/examples3/tablestatistics.py b/examples3/tablestatistics.py index c0aa072..ee1f0f7 100755 --- a/examples3/tablestatistics.py +++ b/examples3/tablestatistics.py @@ -12,8 +12,8 @@ import sys import os -from qt import * -from qttable import * +from python_tqt.qt import * +from python_tqt.qttable import * TRUE = 1 FALSE = 0 diff --git a/examples3/tooltip.py b/examples3/tooltip.py index 040d548..03bcd4f 100755 --- a/examples3/tooltip.py +++ b/examples3/tooltip.py @@ -11,7 +11,7 @@ ***************************************************************************""" import sys -from qt import * +from python_tqt.qt import * from random import random class DynamicTip( TQToolTip ): diff --git a/examples3/tut1.py b/examples3/tut1.py index 34dada8..3e30fcc 100755 --- a/examples3/tut1.py +++ b/examples3/tut1.py @@ -3,7 +3,7 @@ # TQt tutorial 1. import sys -import qt +from python_tqt import qt a = qt.TQApplication(sys.argv) diff --git a/examples3/tut10.py b/examples3/tut10.py index 919ea7e..310f000 100755 --- a/examples3/tut10.py +++ b/examples3/tut10.py @@ -3,7 +3,7 @@ # TQt tutorial 10. import sys -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -101,7 +101,7 @@ class MyWidget(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange(self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/tut11.py b/examples3/tut11.py index 305994f..ca070fd 100755 --- a/examples3/tut11.py +++ b/examples3/tut11.py @@ -4,7 +4,7 @@ import sys import math -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -162,7 +162,7 @@ class MyWidget(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange(self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/tut12.py b/examples3/tut12.py index a16b088..7b13271 100755 --- a/examples3/tut12.py +++ b/examples3/tut12.py @@ -5,7 +5,7 @@ import sys import math import random -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -202,7 +202,7 @@ class MyWidget(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange("ANGLE", self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/tut13.py b/examples3/tut13.py index 5514a2e..daa5a9d 100755 --- a/examples3/tut13.py +++ b/examples3/tut13.py @@ -5,7 +5,7 @@ import sys import math import random -import qt +from python_tqt import qt class LCDRange(qt.TQWidget): @@ -237,7 +237,7 @@ class GameBoard(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange("ANGLE", self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/tut14.py b/examples3/tut14.py index c442767..9f89a9b 100755 --- a/examples3/tut14.py +++ b/examples3/tut14.py @@ -5,7 +5,7 @@ import sys import math import random -import qt +from python_tqt import qt class LCDRange(qt.TQWidget): @@ -277,7 +277,7 @@ class GameBoard(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange("ANGLE", self, "angle") self.angle.setRange(5, 70) @@ -316,7 +316,7 @@ class GameBoard(qt.TQWidget): accel = qt.TQAccel(self) accel.connectItem(accel.insertItem(qt.TQt.Key_Enter), self.fire) accel.connectItem(accel.insertItem(qt.TQt.Key_Return), self.fire) - accel.connectItem(accel.insertItem(qt.TQt.CTRL + qt.TQt.Key_Q), qt.qApp, qt.SLOT("quit()")) + accel.connectItem(accel.insertItem(qt.TQt.CTRL + qt.TQt.Key_Q), qt.tqApp, qt.SLOT("quit()")) grid = qt.TQGridLayout(self, 2, 2, 10) grid.addWidget(quit, 0, 0) diff --git a/examples3/tut2.py b/examples3/tut2.py index 0234d48..80fe48f 100755 --- a/examples3/tut2.py +++ b/examples3/tut2.py @@ -3,7 +3,7 @@ # TQt tutorial 2. import sys -import qt +from python_tqt import qt a = qt.TQApplication(sys.argv) diff --git a/examples3/tut3.py b/examples3/tut3.py index 4f69461..277c352 100755 --- a/examples3/tut3.py +++ b/examples3/tut3.py @@ -3,7 +3,7 @@ # TQt tutorial 3. import sys -import qt +from python_tqt import qt a = qt.TQApplication(sys.argv) diff --git a/examples3/tut4.py b/examples3/tut4.py index 968d325..41417f5 100755 --- a/examples3/tut4.py +++ b/examples3/tut4.py @@ -3,7 +3,7 @@ # TQt tutorial 4. import sys -import qt +from python_tqt import qt class MyWidget(qt.TQWidget): @@ -17,7 +17,7 @@ class MyWidget(qt.TQWidget): quit.setGeometry(62, 40, 75, 30) quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) a = qt.TQApplication(sys.argv) diff --git a/examples3/tut5.py b/examples3/tut5.py index f084cdb..19cb6f7 100755 --- a/examples3/tut5.py +++ b/examples3/tut5.py @@ -3,7 +3,7 @@ # TQt tutorial 5. import sys -import qt +from python_tqt import qt class MyWidget(qt.TQVBox): @@ -13,7 +13,7 @@ class MyWidget(qt.TQVBox): quit = qt.TQPushButton("Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) lcd = qt.TQLCDNumber(2, self, "lcd") diff --git a/examples3/tut6.py b/examples3/tut6.py index 022e408..d10eaa5 100755 --- a/examples3/tut6.py +++ b/examples3/tut6.py @@ -3,7 +3,7 @@ # TQt tutorial 6. import sys -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -24,7 +24,7 @@ class MyWidget(qt.TQVBox): quit = qt.TQPushButton("Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) grid = qt.TQGrid(4, self) diff --git a/examples3/tut7.py b/examples3/tut7.py index 20e5455..3c9deea 100755 --- a/examples3/tut7.py +++ b/examples3/tut7.py @@ -3,7 +3,7 @@ # TQt tutorial 7. import sys -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -31,7 +31,7 @@ class MyWidget(qt.TQVBox): quit = qt.TQPushButton("Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) grid = qt.TQGrid(4, self) diff --git a/examples3/tut8.py b/examples3/tut8.py index 2bbc7b9..b884093 100755 --- a/examples3/tut8.py +++ b/examples3/tut8.py @@ -3,7 +3,7 @@ # TQt tutorial 8. import sys -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -67,7 +67,7 @@ class MyWidget(qt.TQWidget): quit = qt.TQPushButton("Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange(self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/tut9.py b/examples3/tut9.py index 6c1880a..024f921 100755 --- a/examples3/tut9.py +++ b/examples3/tut9.py @@ -3,7 +3,7 @@ # TQt tutorial 9. import sys -import qt +from python_tqt import qt class LCDRange(qt.TQVBox): @@ -73,7 +73,7 @@ class MyWidget(qt.TQWidget): quit = qt.TQPushButton("&Quit", self, "quit") quit.setFont(qt.TQFont("Times", 18, qt.TQFont.Bold)) - self.connect(quit, qt.SIGNAL("clicked()"), qt.qApp, qt.SLOT("quit()")) + self.connect(quit, qt.SIGNAL("clicked()"), qt.tqApp, qt.SLOT("quit()")) self.angle = LCDRange(self, "angle") self.angle.setRange(5, 70) diff --git a/examples3/webbrowser/mainwindow.py b/examples3/webbrowser/mainwindow.py index 96f0213..31b11f1 100644 --- a/examples3/webbrowser/mainwindow.py +++ b/examples3/webbrowser/mainwindow.py @@ -8,8 +8,8 @@ # WARNING! All changes made in this file will be lost! -from qt import * -from qtaxcontainer import TQAxWidget +from python_tqt.qt import * +from python_tqt.qtaxcontainer import TQAxWidget image0_data = [ "32 32 3 1", diff --git a/examples3/webbrowser/webbrowser.py b/examples3/webbrowser/webbrowser.py index 17155b4..12f6f1c 100644 --- a/examples3/webbrowser/webbrowser.py +++ b/examples3/webbrowser/webbrowser.py @@ -7,8 +7,8 @@ import sys -import qt -import qtaxcontainer +from python_tqt import qt +from python_tqt import qtaxcontainer import mainwindow diff --git a/examples3/widgets.py b/examples3/widgets.py index 372a63c..0d3ce3a 100755 --- a/examples3/widgets.py +++ b/examples3/widgets.py @@ -2,7 +2,7 @@ import sys, string -from qt import * +from python_tqt.qt import * # ## Constructs an analog clock widget that uses an internal TQTimer.