diff --git a/doc/PyTQt.html b/doc/PyTQt.html
index b2de50f..53c859a 100644
--- a/doc/PyTQt.html
+++ b/doc/PyTQt.html
@@ -1771,7 +1771,7 @@ NAME="AEN589"
>A signal may be either a TQt signal (specified using
SIGNAL()TQ_SIGNAL()) or a Python signal (specified using
A slot can be either a Python callable object, a TQt signal (specified using
SIGNAL()TQ_SIGNAL()), a Python signal (specified using
), or a TQt slot (specified using
SLOT()TQ_SLOT()).You connect signals to slots (and other signals) as you would from C++. For
@@ -1802,14 +1802,14 @@ WIDTH="100%"
>
TQObject.connect(a,SIGNAL("TQtSig()"),pyFunction)
-TQObject.connect(a,SIGNAL("TQtSig()"),pyClass.pyMethod)
-TQObject.connect(a,SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
-TQObject.connect(a,SIGNAL("TQtSig()"),SLOT("TQtSlot()"))
+>TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyFunction)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyClass.pyMethod)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),TQ_SLOT("TQtSlot()"))
TQObject.connect(a,PYSIGNAL("PySig"),pyFunction)
TQObject.connect(a,PYSIGNAL("PySig"),pyClass.pyMethod)
-TQObject.connect(a,PYSIGNAL("PySig"),SIGNAL("TQtSig()"))
-TQObject.connect(a,PYSIGNAL("PySig"),SLOT("TQtSlot()")) | sbar = TQScrollBar()
lcd = TQLCDNumber()
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd.display)
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd,SLOT("display(int)"))a.emit(SIGNAL("clicked()"),())
+>a.emit(TQ_SIGNAL("clicked()"),())
a.emit(PYSIGNAL("pySig"),("Hello","World")) | pytquic uses
Signal and Slot Support
A signal may be either a TQt signal (specified using
-SIGNAL()) or a Python signal (specified using
+TQ_SIGNAL()) or a Python signal (specified using
PYSIGNAL()).
A slot can be either a Python callable object, a TQt signal (specified using
-SIGNAL()), a Python signal (specified using
+TQ_SIGNAL()), a Python signal (specified using
PYSIGNAL()), or a TQt slot (specified using
-SLOT()).
+TQ_SLOT()).
@@ -1121,14 +1121,14 @@ example:
-TQObject.connect(a,SIGNAL("TQtSig()"),pyFunction)
-TQObject.connect(a,SIGNAL("TQtSig()"),pyClass.pyMethod)
-TQObject.connect(a,SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
-TQObject.connect(a,SIGNAL("TQtSig()"),SLOT("TQtSlot()"))
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyFunction)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyClass.pyMethod)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),TQ_SLOT("TQtSlot()"))
TQObject.connect(a,PYSIGNAL("PySig"),pyFunction)
TQObject.connect(a,PYSIGNAL("PySig"),pyClass.pyMethod)
-TQObject.connect(a,PYSIGNAL("PySig"),SIGNAL("TQtSig()"))
-TQObject.connect(a,PYSIGNAL("PySig"),SLOT("TQtSlot()"))
+TQObject.connect(a,PYSIGNAL("PySig"),TQ_SIGNAL("TQtSig()"))
+TQObject.connect(a,PYSIGNAL("PySig"),TQ_SLOT("TQtSlot()"))
@@ -1141,8 +1141,8 @@ connections achieve the same effect.
sbar = TQScrollBar()
lcd = TQLCDNumber()
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd.display)
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd,SLOT("display(int)"))
+TQObject.connect(sbar,TQ_SIGNAL("valueChanged(int)"),lcd.display)
+TQObject.connect(sbar,TQ_SIGNAL("valueChanged(int)"),lcd,TQ_SLOT("display(int)"))
@@ -1162,7 +1162,7 @@ tuple which are the arguments to the signal. For example:
-a.emit(SIGNAL("clicked()"),())
+a.emit(TQ_SIGNAL("clicked()"),())
a.emit(PYSIGNAL("pySig"),("Hello","World"))
diff --git a/doc/tqtdocs.sip b/doc/tqtdocs.sip
index d04ca25..d0525cc 100644
--- a/doc/tqtdocs.sip
+++ b/doc/tqtdocs.sip
@@ -1137,15 +1137,15 @@ Note that the code generated by pytquic uses
Signal and Slot Support
A signal may be either a TQt signal (specified using
-SIGNAL()) or a Python signal (specified using
+TQ_SIGNAL()) or a Python signal (specified using
PYSIGNAL()).
A slot can be either a Python callable object, a TQt signal (specified using
-SIGNAL()), a Python signal (specified using
+TQ_SIGNAL()), a Python signal (specified using
PYSIGNAL()), or a TQt slot (specified using
-SLOT()).
+TQ_SLOT()).
@@ -1154,14 +1154,14 @@ example:
-TQObject.connect(a,SIGNAL("TQtSig()"),pyFunction)
-TQObject.connect(a,SIGNAL("TQtSig()"),pyClass.pyMethod)
-TQObject.connect(a,SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
-TQObject.connect(a,SIGNAL("TQtSig()"),SLOT("TQtSlot()"))
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyFunction)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),pyClass.pyMethod)
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),PYSIGNAL("PySig"))
+TQObject.connect(a,TQ_SIGNAL("TQtSig()"),TQ_SLOT("TQtSlot()"))
TQObject.connect(a,PYSIGNAL("PySig"),pyFunction)
TQObject.connect(a,PYSIGNAL("PySig"),pyClass.pyMethod)
-TQObject.connect(a,PYSIGNAL("PySig"),SIGNAL("TQtSig()"))
-TQObject.connect(a,PYSIGNAL("PySig"),SLOT("TQtSlot()"))
+TQObject.connect(a,PYSIGNAL("PySig"),TQ_SIGNAL("TQtSig()"))
+TQObject.connect(a,PYSIGNAL("PySig"),TQ_SLOT("TQtSlot()"))
@@ -1174,8 +1174,8 @@ connections achieve the same effect.
sbar = TQScrollBar()
lcd = TQLCDNumber()
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd.display)
-TQObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd,SLOT("display(int)"))
+TQObject.connect(sbar,TQ_SIGNAL("valueChanged(int)"),lcd.display)
+TQObject.connect(sbar,TQ_SIGNAL("valueChanged(int)"),lcd,TQ_SLOT("display(int)"))
@@ -1195,7 +1195,7 @@ tuple which are the arguments to the signal. For example:
-a.emit(SIGNAL("clicked()"),())
+a.emit(TQ_SIGNAL("clicked()"),())
a.emit(PYSIGNAL("pySig"),("Hello","World"))
diff --git a/examples/SQL/dbconnect.py b/examples/SQL/dbconnect.py
index 75887e6..557d3d6 100755
--- a/examples/SQL/dbconnect.py
+++ b/examples/SQL/dbconnect.py
@@ -42,7 +42,7 @@ class dbConnect(frmConnect):
self.txtPasswd.setText(self.password)
list(map(self.cmbServer.insertItem, self.hostnames))
list(map(self.cmbDatabase.insertItem, self.databases))
- self.connect(self.buttonHelp, SIGNAL("clicked()"),
+ self.connect(self.buttonHelp, TQ_SIGNAL("clicked()"),
self.buttonHelp_clicked)
def accept(self):
diff --git a/examples/SQL/frmconnect.py b/examples/SQL/frmconnect.py
index 430f5b2..7945f42 100644
--- a/examples/SQL/frmconnect.py
+++ b/examples/SQL/frmconnect.py
@@ -104,8 +104,8 @@ class frmConnect(TQDialog):
frmConnectLayout.addWidget(self.grpConnection,0,0)
- self.connect(self.buttonOK,SIGNAL("clicked()"),self,SLOT("accept()"))
- self.connect(self.buttonCancel,SIGNAL("clicked()"),self,SLOT("reject()"))
+ self.connect(self.buttonOK,TQ_SIGNAL("clicked()"),self,TQ_SLOT("accept()"))
+ self.connect(self.buttonCancel,TQ_SIGNAL("clicked()"),self,TQ_SLOT("reject()"))
self.setTabOrder(self.txtName,self.txtPasswd)
self.setTabOrder(self.txtPasswd,self.cmbServer)
diff --git a/examples/SQL/runform1.py b/examples/SQL/runform1.py
index 8ef4908..95113b9 100755
--- a/examples/SQL/runform1.py
+++ b/examples/SQL/runform1.py
@@ -13,7 +13,7 @@ class mainWindow(Form1):
if __name__ == "__main__":
a = TQApplication(sys.argv)
if createConnection():
- TQObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
+ TQObject.connect(a,TQ_SIGNAL("lastWindowClosed()"),a,TQ_SLOT("quit()"))
w = mainWindow()
a.setMainWidget(w)
w.show()
diff --git a/examples/SQL/runform2.py b/examples/SQL/runform2.py
index 112d04f..659034a 100755
--- a/examples/SQL/runform2.py
+++ b/examples/SQL/runform2.py
@@ -13,7 +13,7 @@ class mainWindow(Form2):
if __name__ == "__main__":
a = TQApplication(sys.argv)
if createConnection():
- TQObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
+ TQObject.connect(a,TQ_SIGNAL("lastWindowClosed()"),a,TQ_SLOT("quit()"))
w = mainWindow()
a.setMainWidget(w)
w.show()
diff --git a/examples/SQL/runsqlex.py b/examples/SQL/runsqlex.py
index 4f35e52..989b8c3 100755
--- a/examples/SQL/runsqlex.py
+++ b/examples/SQL/runsqlex.py
@@ -143,7 +143,7 @@ class MainWindow(SqlEx):
if __name__ == "__main__":
a = TQApplication(sys.argv)
- TQObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
+ TQObject.connect(a,TQ_SIGNAL("lastWindowClosed()"),a,TQ_SLOT("quit()"))
w = MainWindow()
a.setMainWidget(w)
w.show()
diff --git a/examples/SQL/sqlcustom1.py b/examples/SQL/sqlcustom1.py
index 0c37911..7803114 100755
--- a/examples/SQL/sqlcustom1.py
+++ b/examples/SQL/sqlcustom1.py
@@ -22,7 +22,7 @@ FALSE = 0
class CustomEdit(TQLineEdit):
def __init__(self, parent = None, name = None):
TQLineEdit.__init__(self, parent, name)
- TQObject.connect(self, SIGNAL("textChanged(const TQString &)"),
+ TQObject.connect(self, TQ_SIGNAL("textChanged(const TQString &)"),
self.changed)
def changed(self, line):
@@ -44,7 +44,7 @@ class FormDialog(TQDialog):
salaryEdit = TQLineEdit(self)
salaryEdit.setAlignment(TQt.AlignRight)
saveButton = TQPushButton("&Save", self)
- self.connect(saveButton, SIGNAL("clicked()"), self.save)
+ self.connect(saveButton, TQ_SIGNAL("clicked()"), self.save)
grid = TQGridLayout(self)
grid.addWidget(forenameLabel, 0, 0)
diff --git a/examples/aclock.py b/examples/aclock.py
index ca81eb3..7754c32 100755
--- a/examples/aclock.py
+++ b/examples/aclock.py
@@ -11,7 +11,7 @@ class AnalogClock(TQWidget):
TQWidget.__init__(*(self,) + args)
self.time = TQTime.currentTime()
internalTimer = TQTimer(self)
- self.connect(internalTimer, SIGNAL("timeout()"), self.timeout)
+ self.connect(internalTimer, TQ_SIGNAL("timeout()"), self.timeout)
internalTimer.start(5000)
def timeout(self):
diff --git a/examples/addressbook.py b/examples/addressbook.py
index 22683d4..103a627 100755
--- a/examples/addressbook.py
+++ b/examples/addressbook.py
@@ -152,7 +152,7 @@ class ABCentralWidget( TQWidget ):
self.add = TQPushButton( '&Add', self.input )
self.add.resize( self.add.sizeHint() )
self.grid1.addWidget( self.add, 0, 4 )
- self.connect( self.add, SIGNAL( 'clicked()' ), self.addEntry )
+ self.connect( self.add, TQ_SIGNAL( 'clicked()' ), self.addEntry )
self.iFirstName = TQLineEdit( self.input )
self.iFirstName.resize( self.iFirstName.sizeHint() )
@@ -177,7 +177,7 @@ class ABCentralWidget( TQWidget ):
self.change = TQPushButton( '&Change', self.input )
self.change.resize( self.change.sizeHint() )
self.grid1.addWidget( self.change, 1, 4 )
- self.connect( self.change, SIGNAL( 'clicked()' ), self.changeEntry )
+ self.connect( self.change, TQ_SIGNAL( 'clicked()' ), self.changeEntry )
self.tabWidget.addTab( self.input, '&Add/Change Entry' )
@@ -189,22 +189,22 @@ class ABCentralWidget( TQWidget ):
self.cFirstName = TQCheckBox( 'First &Name', self.search )
self.cFirstName.resize( self.cFirstName.sizeHint() )
self.grid2.addWidget( self.cFirstName, 0, 0 )
- self.connect( self.cFirstName, SIGNAL( 'clicked()' ), self.toggleFirstName )
+ self.connect( self.cFirstName, TQ_SIGNAL( 'clicked()' ), self.toggleFirstName )
self.cLastName = TQCheckBox( '&Last Name', self.search )
self.cLastName.resize( self.cLastName.sizeHint() )
self.grid2.addWidget( self.cLastName, 0, 1 )
- self.connect( self.cLastName, SIGNAL( 'clicked()' ), self.toggleLastName )
+ self.connect( self.cLastName, TQ_SIGNAL( 'clicked()' ), self.toggleLastName )
self.cAddress = TQCheckBox( '&Address', self.search )
self.cAddress.resize( self.cAddress.sizeHint() )
self.grid2.addWidget( self.cAddress, 0, 2 )
- self.connect( self.cAddress, SIGNAL( 'clicked()' ), self.toggleAddress )
+ self.connect( self.cAddress, TQ_SIGNAL( 'clicked()' ), self.toggleAddress )
self.cEMail = TQCheckBox( '&E-Mail', self.search )
self.cEMail.resize( self.cEMail.sizeHint() )
self.grid2.addWidget( self.cEMail, 0, 3 )
- self.connect( self.cEMail, SIGNAL( 'clicked()' ), self.toggleEMail )
+ self.connect( self.cEMail, TQ_SIGNAL( 'clicked()' ), self.toggleEMail )
self.sFirstName = TQLineEdit( self.search )
self.sFirstName.resize( self.sFirstName.sizeHint() )
@@ -225,7 +225,7 @@ class ABCentralWidget( TQWidget ):
self.find = TQPushButton( '&Find', self.search )
self.find.resize( self.find.sizeHint() )
self.grid2.addWidget( self.find, 1, 4 )
- self.connect( self.find, SIGNAL( 'clicked()' ), self.findEntries )
+ self.connect( self.find, TQ_SIGNAL( 'clicked()' ), self.findEntries )
self.cFirstName.setChecked( TRUE )
self.sFirstName.setEnabled( TRUE )
@@ -246,7 +246,7 @@ class ABCentralWidget( TQWidget ):
self.listView.setSelectionMode( TQListView.Extended )
- self.connect( self.listView, SIGNAL( 'clicked( TQListViewItem* )' ), self.itemSelected )
+ self.connect( self.listView, TQ_SIGNAL( 'clicked( TQListViewItem* )' ), self.itemSelected )
self.mainGrid.addWidget( self.listView, 1, 0 )
self.listView.setAllColumnsShowFocus( TRUE )
@@ -395,8 +395,8 @@ class ABMainWindow(TQMainWindow):
self.file.insertItem( printIcon, 'Print...', self.filePrint, TQt.CTRL + TQt.Key_P )
self.file.insertSeparator()
#self.file.insertItem( 'Close', self.closeWindow, TQt.CTRL + TQt.Key_W )
- self.file.insertItem('Close', self, SLOT('close()'), TQt.CTRL+TQt.Key_W)
- self.file.insertItem( 'Quit', tqApp, SLOT( 'quit()' ), TQt.CTRL + TQt.Key_Q )
+ self.file.insertItem('Close', self, TQ_SLOT('close()'), TQt.CTRL+TQt.Key_W)
+ self.file.insertItem( 'Quit', tqApp, TQ_SLOT( 'quit()' ), TQt.CTRL + TQt.Key_Q )
def setupFileTools( self ):
pass
@@ -453,5 +453,5 @@ mw.setCaption( 'Addressbook 1' )
a.setMainWidget( mw )
mw.show()
-a.connect( a, SIGNAL( 'lastWindowClosed()' ), a, SLOT( 'quit()' ) )
+a.connect( a, TQ_SIGNAL( 'lastWindowClosed()' ), a, TQ_SLOT( 'quit()' ) )
a.exec_loop()
diff --git a/examples/application.py b/examples/application.py
index 6e8a638..7fd1450 100755
--- a/examples/application.py
+++ b/examples/application.py
@@ -140,8 +140,8 @@ class ApplicationWindow(TQMainWindow):
self.file.insertSeparator()
- self.file.insertItem('&Close',self,SLOT('close()'),TQt.CTRL + TQt.Key_W)
- self.file.insertItem('&Quit',tqApp,SLOT('closeAllWindows()'),TQt.CTRL + TQt.Key_Q)
+ self.file.insertItem('&Close',self,TQ_SLOT('close()'),TQt.CTRL + TQt.Key_W)
+ self.file.insertItem('&Quit',tqApp,TQ_SLOT('closeAllWindows()'),TQt.CTRL + TQt.Key_Q)
self.help = TQPopupMenu(self)
self.menuBar().insertSeparator()
@@ -273,5 +273,5 @@ a = TQApplication(sys.argv)
mw = ApplicationWindow()
mw.setCaption('Document 1')
mw.show()
-a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()'))
+a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()'))
a.exec_loop()
diff --git a/examples/buttongroups.py b/examples/buttongroups.py
index 7b780c2..1c29034 100755
--- a/examples/buttongroups.py
+++ b/examples/buttongroups.py
@@ -72,8 +72,8 @@ class ButtonsGroups( TQWidget ):
# insert a checkbox...
self.state = TQCheckBox( "E&nable Radiobuttons", self.grp3 )
self.state.setChecked( TRUE )
- # ...and connect its SIGNAL clicked() with the SLOT slotChangeGrp3State()
- self.connect( self.state, SIGNAL( "clicked()" ), self.slotChangeGrp3State )
+ # ...and connect its signal clicked() with the slot slotChangeGrp3State()
+ self.connect( self.state, TQ_SIGNAL( "clicked()" ), self.slotChangeGrp3State )
# ------------ fourth group
@@ -103,7 +103,7 @@ class ButtonsGroups( TQWidget ):
self.tb4.setPopup(menu)
#
- # SLOT slotChangeGrp3State()
+ # slot slotChangeGrp3State()
# enables/disables the radiobuttons of the third buttongroup
#
diff --git a/examples/canvas/canvas.py b/examples/canvas/canvas.py
index 50797e5..6232a33 100755
--- a/examples/canvas/canvas.py
+++ b/examples/canvas/canvas.py
@@ -210,7 +210,7 @@ class Main (TQMainWindow):
file.insertSeparator();
file.insertItem("&Print", self._print, TQt.CTRL+TQt.Key_P)
file.insertSeparator()
- file.insertItem("E&xit", tqApp, SLOT("quit()"), TQt.CTRL+TQt.Key_Q)
+ file.insertItem("E&xit", tqApp, TQ_SLOT("quit()"), TQt.CTRL+TQt.Key_Q)
self.menuBar().insertItem("&File", file)
edit = TQPopupMenu(self.menuBar() )
@@ -605,7 +605,7 @@ if __name__=='__main__':
#// m.help();
tqApp.setMainWidget(None);
- TQObject.connect( tqApp, SIGNAL("lastWindowClosed()"), tqApp, SLOT("quit()") )
+ TQObject.connect( tqApp, TQ_SIGNAL("lastWindowClosed()"), tqApp, TQ_SLOT("quit()") )
app.exec_loop()
diff --git a/examples/checklists.py b/examples/checklists.py
index 52b93e8..f042a16 100755
--- a/examples/checklists.py
+++ b/examples/checklists.py
@@ -57,8 +57,8 @@ class CheckLists(TQWidget):
copy1 = TQPushButton( " -> ", self )
tmp1.addWidget( copy1 )
copy1.setMaximumWidth( copy1.sizeHint().width() );
- # connect the SIGNAL clicked() of the pushbutton with the SLOT copy1to2()
- self.connect( copy1, SIGNAL('clicked()'), self.copy1to2 )
+ # connect the signal clicked() of the pushbutton with the slot copy1to2()
+ self.connect( copy1, TQ_SIGNAL('clicked()'), self.copy1to2 )
# another widget for layouting
vbox2 = TQVBoxLayout( lay )
@@ -81,8 +81,8 @@ class CheckLists(TQWidget):
copy2 = TQPushButton( " -> ", self )
lay.addWidget( copy2 )
copy2.setMaximumWidth( copy2.sizeHint().width() )
- # ...and connect its clicked() SIGNAL to the copy2to3() SLOT
- self.connect( copy2, SIGNAL('clicked()'), self.copy2to3 )
+ # ...and connect its clicked() signal to the copy2to3() slot
+ self.connect( copy2, TQ_SIGNAL('clicked()'), self.copy2to3 )
tmp3 = TQVBoxLayout( lay )
tmp3.setMargin( 5 )
diff --git a/examples/dirview.py b/examples/dirview.py
index a147f3c..e10fe64 100755
--- a/examples/dirview.py
+++ b/examples/dirview.py
@@ -255,15 +255,15 @@ class DirectoryView( TQListView ):
folderOpened = TQPixmap( folder_open_xpm )
fileNormal = TQPixmap( pix_file )
- self.connect( self, SIGNAL("doubleClicked(TQListViewItem *)"),
+ self.connect( self, TQ_SIGNAL("doubleClicked(TQListViewItem *)"),
self.slotFolderSelected )
- self.connect( self, SIGNAL("returnPressed(TQListViewItem *)"),
+ self.connect( self, TQ_SIGNAL("returnPressed(TQListViewItem *)"),
self.slotFolderSelected )
self.setAcceptDrops( True )
self.viewport().setAcceptDrops( True )
- self.connect( self.autoopen_timer, SIGNAL("timeout()"), self.openFolder )
+ self.connect( self.autoopen_timer, TQ_SIGNAL("timeout()"), self.openFolder )
def showDirsOnly( self ):
return self.dirsOnly
diff --git a/examples/dragdrop.py b/examples/dragdrop.py
index 439e92d..7932d90 100755
--- a/examples/dragdrop.py
+++ b/examples/dragdrop.py
@@ -32,7 +32,7 @@ def addStuff( parent, yn_image, yn_secret = 0 ):
parent.resize( parent.sizeHint() )
TQObject.connect( d, PYSIGNAL('message(TQString &)'),
- format, SLOT('setText(TQString &)') )
+ format, TQ_SLOT('setText(TQString &)') )
app = TQApplication( sys.argv )
@@ -52,6 +52,6 @@ addStuff( mw3, 1, 1 )
mw3.setCaption( "TQt Example - Drag and Drop" )
mw3.show()
-TQObject.connect(tqApp,SIGNAL('lastWindowClosed()'),tqApp,SLOT('quit()'))
+TQObject.connect(tqApp,TQ_SIGNAL('lastWindowClosed()'),tqApp,TQ_SLOT('quit()'))
app.exec_loop()
diff --git a/examples/fontdisplayer.py b/examples/fontdisplayer.py
index 381b4d0..bcf9d18 100755
--- a/examples/fontdisplayer.py
+++ b/examples/fontdisplayer.py
@@ -123,10 +123,10 @@ class FontDisplayer( TQMainWindow ) :
fontbutton = TQPushButton(self.tr("Font..."), controls)
status = TQStatusBar(self)
- self.connect( self.row, SIGNAL("valueChanged(int)"), table.setRow )
- self.connect( fontbutton, SIGNAL("clicked()"), table.chooseFont )
+ self.connect( self.row, TQ_SIGNAL("valueChanged(int)"), table.setRow )
+ self.connect( fontbutton, TQ_SIGNAL("clicked()"), table.chooseFont )
self.connect( table, PYSIGNAL("fontInformation"),
- status, SLOT("message(const TQString&)") )
+ status, TQ_SLOT("message(const TQString&)") )
table.setRow(0)
self.setCentralWidget(table)
diff --git a/examples/fonts.py b/examples/fonts.py
index 7cb3cd1..44eb3dd 100755
--- a/examples/fonts.py
+++ b/examples/fonts.py
@@ -35,15 +35,15 @@ class Viewer( TQWidget ):
self.defaultButton = TQPushButton( "Default", self, "pushbutton1" )
self.defaultButton.setFont( TQFont( "times" ) )
- self.connect( self.defaultButton, SIGNAL("clicked()"), self.setDefault )
+ self.connect( self.defaultButton, TQ_SIGNAL("clicked()"), self.setDefault )
self.sansSerifButton = TQPushButton( "Sans Serif", self, "pushbutton2" )
self.sansSerifButton.setFont( TQFont( "Helvetica", 12 ) )
- self.connect( self.sansSerifButton, SIGNAL("clicked()"), self.setSansSerif )
+ self.connect( self.sansSerifButton, TQ_SIGNAL("clicked()"), self.setSansSerif )
self.italicsButton = TQPushButton( "Italics", self, "pushbutton3" )
self.italicsButton.setFont( TQFont( "lucida", 12, TQFont.Bold, True ) )
- self.connect( self.italicsButton, SIGNAL("clicked()"), self.setItalics )
+ self.connect( self.italicsButton, TQ_SIGNAL("clicked()"), self.setItalics )
self.layout()
diff --git a/examples/i18n/i18n.py b/examples/i18n/i18n.py
index ba64098..ef17d27 100755
--- a/examples/i18n/i18n.py
+++ b/examples/i18n/i18n.py
@@ -46,7 +46,7 @@ class TQVDialog(TQDialog):
self.hb = TQHBox(self)
c = TQPushButton(text, self.hb)
self.setMapping(c, result)
- self.connect(c, SIGNAL('clicked()'), self.mapit)
+ self.connect(c, TQ_SIGNAL('clicked()'), self.mapit)
def setMapping(self, c, result):
self.map[c] = result
@@ -119,7 +119,7 @@ def main(argv):
if w == None:
sys.exit(0)
- app.connect(app, SIGNAL('lastWindowClosed()'), tqApp, SLOT('quit()'))
+ app.connect(app, TQ_SIGNAL('lastWindowClosed()'), tqApp, TQ_SLOT('quit()'))
w.setGeometry(x,y,197,356)
w.show()
if tight:
diff --git a/examples/i18n/mywidget.py b/examples/i18n/mywidget.py
index a06a9ee..681d98a 100644
--- a/examples/i18n/mywidget.py
+++ b/examples/i18n/mywidget.py
@@ -15,7 +15,7 @@ class MyWidget(TQMainWindow):
self.setCaption(self.trUtf8("""Internationalization Example"""))
self.file = TQPopupMenu(self)
- self.file.insertItem(self.trUtf8("E&xit"), tqApp, SLOT("quit()"),
+ self.file.insertItem(self.trUtf8("E&xit"), tqApp, TQ_SLOT("quit()"),
TQKeySequence(self.trUtf8("Ctrl+Q","File|Quit")))
self.menuBar().insertItem(self.trUtf8("&File"), self.file)
diff --git a/examples/lineedits.py b/examples/lineedits.py
index fe566ba..811a99a 100755
--- a/examples/lineedits.py
+++ b/examples/lineedits.py
@@ -36,7 +36,7 @@ class LineEdits(TQGroupBox):
combo1.insertItem("Password", -1)
combo1.insertItem("No Echo", -1)
- self.connect(combo1, SIGNAL("activated(int)"), self.slotEchoChanged)
+ self.connect(combo1, TQ_SIGNAL("activated(int)"), self.slotEchoChanged)
self.lined1 = TQLineEdit(self)
box.addWidget(self.lined1)
@@ -52,7 +52,7 @@ class LineEdits(TQGroupBox):
combo2.insertItem("Integer Validator", -1)
combo2.insertItem("Double Validator", -1)
- self.connect(combo2, SIGNAL("activated(int)"), self.slotValidatorChanged)
+ self.connect(combo2, TQ_SIGNAL("activated(int)"), self.slotValidatorChanged)
self.lined2 = TQLineEdit(self)
box.addWidget(self.lined2)
@@ -69,7 +69,7 @@ class LineEdits(TQGroupBox):
combo3.insertItem("Centered", -1)
combo3.insertItem("Right", -1)
- self.connect(combo3, SIGNAL("activated(int)"), self.slotAlignmentChanged)
+ self.connect(combo3, TQ_SIGNAL("activated(int)"), self.slotAlignmentChanged)
self.lined3 = TQLineEdit(self)
box.addWidget(self.lined3)
@@ -83,7 +83,7 @@ class LineEdits(TQGroupBox):
combo4.insertItem("False", -1)
combo4.insertItem("True", -1)
- self.connect(combo4, SIGNAL("activated(int)"), self.slotReadOnlyChanged)
+ self.connect(combo4, TQ_SIGNAL("activated(int)"), self.slotReadOnlyChanged)
self.lined4 = TQLineEdit(self)
box.addWidget(self.lined4)
diff --git a/examples/listbox.py b/examples/listbox.py
index d5bf2e1..9dc2515 100755
--- a/examples/listbox.py
+++ b/examples/listbox.py
@@ -40,7 +40,7 @@ class ListBoxDemo( TQWidget ):
bg.insert( b )
v.addWidget( b )
b.setChecked( TRUE )
- self.connect( b, SIGNAL("clicked()"), self.setNumCols )
+ self.connect( b, TQ_SIGNAL("clicked()"), self.setNumCols )
h = TQHBoxLayout()
v.addLayout( h )
h.addSpacing( 30 )
@@ -56,7 +56,7 @@ class ListBoxDemo( TQWidget ):
self )
bg.insert( b )
v.addWidget( b )
- self.connect( b, SIGNAL("clicked()"), self.setColsByWidth )
+ self.connect( b, TQ_SIGNAL("clicked()"), self.setColsByWidth )
v.addSpacing( 12 )
@@ -65,7 +65,7 @@ class ListBoxDemo( TQWidget ):
self )
bg.insert( b )
v.addWidget( b )
- self.connect( b, SIGNAL("clicked()"), self.setNumRows )
+ self.connect( b, TQ_SIGNAL("clicked()"), self.setNumRows )
h = TQHBoxLayout()
v.addLayout( h )
h.addSpacing( 30 )
@@ -82,30 +82,30 @@ class ListBoxDemo( TQWidget ):
self )
bg.insert( b )
v.addWidget( b )
- self.connect( b, SIGNAL("clicked()"), self.setRowsByHeight )
+ self.connect( b, TQ_SIGNAL("clicked()"), self.setRowsByHeight )
v.addSpacing( 12 )
cb = TQCheckBox( "Variable-height rows", self )
cb.setChecked( TRUE )
- self.connect( cb, SIGNAL("toggled(bool)"), self.setVariableHeight )
+ self.connect( cb, TQ_SIGNAL("toggled(bool)"), self.setVariableHeight )
v.addWidget( cb )
v.addSpacing( 6 )
cb = TQCheckBox( "Variable-width columns", self )
- self.connect( cb, SIGNAL("toggled(bool)"), self.setVariableWidth )
+ self.connect( cb, TQ_SIGNAL("toggled(bool)"), self.setVariableWidth )
v.addWidget( cb )
cb = TQCheckBox( "Extended-Selection", self )
- self.connect( cb, SIGNAL("toggled(bool)"), self.setMultiSelection )
+ self.connect( cb, TQ_SIGNAL("toggled(bool)"), self.setMultiSelection )
v.addWidget( cb )
pb = TQPushButton( "Sort ascending", self )
- self.connect( pb, SIGNAL("clicked()"), self.sortAscending )
+ self.connect( pb, TQ_SIGNAL("clicked()"), self.sortAscending )
v.addWidget( pb )
pb = TQPushButton( "Sort descending", self )
- self.connect( pb, SIGNAL("clicked()"), self.sortDescending )
+ self.connect( pb, TQ_SIGNAL("clicked()"), self.sortDescending )
v.addWidget( pb )
v.addStretch( 100 )
@@ -119,8 +119,8 @@ class ListBoxDemo( TQWidget ):
self.rows.setRange( 1, 256 )
self.rows.setValue( 256 )
- self.connect( self.columns, SIGNAL("valueChanged(int)"), self.setNumCols )
- self.connect( self.rows, SIGNAL("valueChanged(int)"), self.setNumRows )
+ self.connect( self.columns, TQ_SIGNAL("valueChanged(int)"), self.setNumCols )
+ self.connect( self.rows, TQ_SIGNAL("valueChanged(int)"), self.setNumRows )
# slots
def setNumCols( self ):
diff --git a/examples/listboxcombo.py b/examples/listboxcombo.py
index b6b546e..e608a73 100755
--- a/examples/listboxcombo.py
+++ b/examples/listboxcombo.py
@@ -48,8 +48,8 @@ class ListBoxCombo( TQVBox ):
# Create a pushbutton...
arrow1 = TQPushButton( " -> ", row1 )
- # ...and connect the clicked SIGNAL with the SLOT slotLeft2Right
- self.connect( arrow1, SIGNAL("clicked()"), self.slotLeft2Right )
+ # ...and connect the clicked signal with the slot slotLeft2Right
+ self.connect( arrow1, TQ_SIGNAL("clicked()"), self.slotLeft2Right )
# create an empty single-selection ListBox
self.lb2 = TQListBox( row1 )
@@ -92,10 +92,10 @@ class ListBoxCombo( TQVBox ):
cb2.insertItem( txt )
# Connect the activated SIGNALs of the Comboboxes with SLOTs
- self.connect( cb1, SIGNAL("activated( const TQString & )"), self.slotCombo1Activated )
- self.connect( cb2, SIGNAL("activated( const TQString & )"), self.slotCombo2Activated )
+ self.connect( cb1, TQ_SIGNAL("activated( const TQString & )"), self.slotCombo1Activated )
+ self.connect( cb2, TQ_SIGNAL("activated( const TQString & )"), self.slotCombo2Activated )
- """ SLOT slotLeft2Right
+ """ TQ_SLOT slotLeft2Right
* Copies all selected items of the first ListBox into the second ListBox
"""
def slotLeft2Right( self ):
@@ -112,14 +112,14 @@ class ListBoxCombo( TQVBox ):
elif item.text().isEmpty() :
self.lb2.insertItem( item.pixmap() )
- """ SLOT slotCombo1Activated( const TQString &s )
+ """ TQ_SLOT slotCombo1Activated( const TQString &s )
* Sets the text of the item which the user just selected in the
* first Combobox (and is now the value of s) to the first Label.
"""
def slotCombo1Activated( self, s ) :
self.label1.setText( str(TQString( "Current Item: %1" ).arg( s ) ) )
- """ SLOT slotCombo2Activated( const TQString &s )
+ """ TQ_SLOT slotCombo2Activated( const TQString &s )
* Sets the text of the item which the user just selected in the
* second Combobox (and is now the value of s) to the second Label.
"""
diff --git a/examples/mdi.py b/examples/mdi.py
index 591a4eb..961c54a 100755
--- a/examples/mdi.py
+++ b/examples/mdi.py
@@ -163,13 +163,13 @@ class ApplicationWindow(TQMainWindow):
self.file.insertSeparator()
- self.file.insertItem('&Close',self,SLOT('close()'),TQt.CTRL + TQt.Key_W)
- self.file.insertItem('&Quit',tqApp,SLOT('closeAllWindows()'),TQt.CTRL + TQt.Key_Q)
+ self.file.insertItem('&Close',self,TQ_SLOT('close()'),TQt.CTRL + TQt.Key_W)
+ self.file.insertItem('&Quit',tqApp,TQ_SLOT('closeAllWindows()'),TQt.CTRL + TQt.Key_Q)
self.menuBar().insertSeparator()
self.windows = TQPopupMenu( self )
self.windows.setCheckable( True )
- self.connect( self.windows, SIGNAL( "aboutToShow()" ),
+ self.connect( self.windows, TQ_SIGNAL( "aboutToShow()" ),
self.windowsMenuAboutToShow )
self.menuBar().insertItem( "&Windows", self.windows )
@@ -180,7 +180,7 @@ class ApplicationWindow(TQMainWindow):
self.help.insertItem('&About',self.about,TQt.Key_F1)
self.help.insertItem('About &TQt',self.aboutTQt)
self.help.insertSeparator()
- self.help.insertItem( "What's &This", self, SLOT("whatsThis()"), TQt.SHIFT+TQt.Key_F1)
+ self.help.insertItem( "What's &This", self, TQ_SLOT("whatsThis()"), TQt.SHIFT+TQt.Key_F1)
self.menuBar().insertSeparator()
@@ -195,7 +195,7 @@ class ApplicationWindow(TQMainWindow):
def newDoc(self):
w = MDIWindow( self.ws, "", TQt.WDestructiveClose )
- self.connect( w, PYSIGNAL( "message" ), self.statusBar(), SLOT( "message(const TQString&, int )") )
+ self.connect( w, PYSIGNAL( "message" ), self.statusBar(), TQ_SLOT( "message(const TQString&, int )") )
w.setCaption("unnamed document")
w.setIcon( TQPixmap(document) )
# show the very first window in maximized mode
@@ -243,8 +243,8 @@ class ApplicationWindow(TQMainWindow):
def windowsMenuAboutToShow(self):
self.windows.clear()
- cascadeId = self.windows.insertItem("&Cascade", self.ws, SLOT("cascade() ") )
- tileId = self.windows.insertItem("&Tile", self.ws, SLOT("tile()" ) )
+ cascadeId = self.windows.insertItem("&Cascade", self.ws, TQ_SLOT("cascade() ") )
+ tileId = self.windows.insertItem("&Tile", self.ws, TQ_SLOT("tile()" ) )
if len(self.ws.windowList())==0 :
self.windows.setItemEnabled( cascadeId, False )
self.windows.setItemEnabled( tileId, False )
@@ -356,5 +356,5 @@ if __name__=='__main__':
mw = ApplicationWindow()
mw.setCaption("PyTQt Example - Multiple Documents Interface (MDI)")
mw.show()
- a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()'))
+ a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()'))
a.exec_loop()
diff --git a/examples/menu.py b/examples/menu.py
index f363195..ff3f9d9 100755
--- a/examples/menu.py
+++ b/examples/menu.py
@@ -131,7 +131,7 @@ class MenuExample( TQWidget ):
self.file.insertSeparator()
self.file.insertItem( "&Print", self.printer, TQt.CTRL+TQt.Key_P )
self.file.insertSeparator()
- self.file.insertItem( "E&xit", tqApp, SLOT( "quit()" ), TQt.CTRL+TQt.Key_Q )
+ self.file.insertItem( "E&xit", tqApp, TQ_SLOT( "quit()" ), TQt.CTRL+TQt.Key_Q )
self.edit = TQPopupMenu( self )
undoID = self.edit.insertItem( "&Undo", self.undo )
@@ -187,7 +187,7 @@ class MenuExample( TQWidget ):
self.label.setLineWidth( 1 )
self.label.setAlignment( TQt.AlignCenter )
- self.connect( self, PYSIGNAL( "explain" ), self.label, SLOT( "setText(const TQString &" ) )
+ self.connect( self, PYSIGNAL( "explain" ), self.label, TQ_SLOT( "setText(const TQString &" ) )
self.setMinimumSize( 100, 80 )
self.setFocusPolicy( TQWidget.ClickFocus )
diff --git a/examples/progress.py b/examples/progress.py
index e2344cc..51b9c22 100755
--- a/examples/progress.py
+++ b/examples/progress.py
@@ -124,9 +124,9 @@ class CPUWaster(TQWidget):
file_.insertItem(self.drawItemText(i), i)
file_.setAccel(TQKeySequence(
"Ctrl+%s" % (i - self.first_draw_item)), i)
- self.connect(menubar, SIGNAL("activated(int)"), self.doMenuItem)
+ self.connect(menubar, TQ_SIGNAL("activated(int)"), self.doMenuItem)
file_.insertSeparator()
- file_.insertItem("Quit", tqApp, SLOT("quit()"), TQKeySequence("Ctrl+Q"))
+ file_.insertItem("Quit", tqApp, TQ_SLOT("quit()"), TQKeySequence("Ctrl+Q"))
self.options = options = TQPopupMenu()
menubar.insertItem("&Options", options)
self.ld_id = options.insertItem("Loop driven", self.loopDriven,
@@ -216,7 +216,7 @@ class CPUWaster(TQWidget):
self.rects = n
self.pb = self.newProgressDialog("Drawing rectangles.\n"
"Using timer event.", n, False)
- self.connect(self.pb, SIGNAL("cancelled()"), self.stopDrawing)
+ self.connect(self.pb, TQ_SIGNAL("cancelled()"), self.stopDrawing)
self.enableDrawingItems(False)
self.startTimer(0)
self.got_stop = False
diff --git a/examples/progressbar.py b/examples/progressbar.py
index b507d08..9c42db7 100755
--- a/examples/progressbar.py
+++ b/examples/progressbar.py
@@ -57,11 +57,11 @@ class ProgressBar( TQButtonGroup ):
toplayout.addMultiCellWidget( self.progress, 1, 1, 0, 1 )
# connect the clicked() SIGNALs of the pushbuttons to SLOTs
- self.connect( self.start, SIGNAL("clicked()"), self.slotStart )
- self.connect( self.reset, SIGNAL("clicked()"), self.slotReset )
+ self.connect( self.start, TQ_SIGNAL("clicked()"), self.slotStart )
+ self.connect( self.reset, TQ_SIGNAL("clicked()"), self.slotReset )
- # connect the timeout() SIGNAL of the progress-timer to a SLOT
- self.connect( self.timer, SIGNAL("timeout()"), self.slotTimeout )
+ # connect the timeout() signal of the progress-timer to a slot
+ self.connect( self.timer, TQ_SIGNAL("timeout()"), self.slotTimeout )
# Let's start with normal speed...
self.normal.setChecked( TRUE )
@@ -69,8 +69,8 @@ class ProgressBar( TQButtonGroup ):
self.start.setFixedWidth( 80 )
self.setMinimumWidth( 300 )
- # SLOT slotStart
- # This SLOT is called if the user clicks start/pause/continue button
+ # Slot slotStart
+ # This slot is called if the user clicks start/pause/continue button
def slotStart( self ):
# If the progress bar is at the beginning...
if self.progress.progress() == -1 :
@@ -100,8 +100,8 @@ class ProgressBar( TQButtonGroup ):
# ...and rename the start/pause/continue button to Continue
self.start.setText( "&Continue" )
- # SLOT slotReset
- # This SLOT is called when the user clicks the reset button
+ # Slot slotReset
+ # This slot is called when the user clicks the reset button
def slotReset( self ):
# stop the timer and progress
self.timer.stop()
@@ -119,8 +119,8 @@ class ProgressBar( TQButtonGroup ):
# reset the progressbar
self.progress.reset()
- # SLOT slotTimeout
- # This SLOT is called each ms when the timer is
+ # Slot slotTimeout
+ # This slot is called each ms when the timer is
# active (== progress is running)
def slotTimeout( self ):
p = self.progress.progress()
diff --git a/examples/rangecontrols.py b/examples/rangecontrols.py
index e7983e2..67af821 100755
--- a/examples/rangecontrols.py
+++ b/examples/rangecontrols.py
@@ -54,7 +54,7 @@ class RangeControls( TQVBox ):
lcd2 = TQLCDNumber( 2, cell3 )
lcd2.display( 33 )
lcd2.setSegmentStyle( TQLCDNumber.Filled )
- self.connect( hslider, SIGNAL("valueChanged( int )"), lcd2, SLOT("display( int )") )
+ self.connect( hslider, TQ_SIGNAL("valueChanged( int )"), lcd2, TQ_SLOT("display( int )") )
cell4 = TQHBox( row2 )
cell4.setFrameStyle( TQFrame.WinPanel | TQFrame.Sunken )
@@ -62,7 +62,7 @@ class RangeControls( TQVBox ):
vslider = TQSlider( 0, 64, 1, 8, TQt.Vertical, cell4 )
lcd3 = TQLCDNumber( 3, cell4 )
lcd3.display( 8 )
- self.connect( vslider, SIGNAL("valueChanged( int )"), lcd3, SLOT("display( int )") )
+ self.connect( vslider, TQ_SIGNAL("valueChanged( int )"), lcd3, TQ_SLOT("display( int )") )
def main( args ):
a = TQApplication( args )
diff --git a/examples/richtext.py b/examples/richtext.py
index 14728ab..7a346c1 100755
--- a/examples/richtext.py
+++ b/examples/richtext.py
@@ -97,9 +97,9 @@ class MyRichText( TQVBox ):
self.bPrev.setEnabled( False )
- self.connect( self.bClose, SIGNAL("clicked()"), tqApp, SLOT("quit()") )
- self.connect( self.bPrev, SIGNAL("clicked()"), self.prev )
- self.connect( self.bNext, SIGNAL("clicked()"), self.__next__ )
+ self.connect( self.bClose, TQ_SIGNAL("clicked()"), tqApp, TQ_SLOT("quit()") )
+ self.connect( self.bPrev, TQ_SIGNAL("clicked()"), self.prev )
+ self.connect( self.bNext, TQ_SIGNAL("clicked()"), self.__next__ )
self.num = 0
diff --git a/examples/semaphore.py b/examples/semaphore.py
index 99b9bc6..952f233 100755
--- a/examples/semaphore.py
+++ b/examples/semaphore.py
@@ -119,7 +119,7 @@ class SemaphoreExample(TQWidget):
greenSem = TQSemaphore(1)
self.button = TQPushButton("&Ignition!",self)
- self.connect(self.button,SIGNAL("clicked()"),self.startExample)
+ self.connect(self.button,TQ_SIGNAL("clicked()"),self.startExample)
self.mlineedit = TQMultiLineEdit(self)
self.label = TQLabel(self)
diff --git a/examples/tabdialog.py b/examples/tabdialog.py
index 05365ff..d2aecc3 100755
--- a/examples/tabdialog.py
+++ b/examples/tabdialog.py
@@ -21,7 +21,7 @@ class TabDialog( TQTabDialog ):
self.setupTab1()
self.setupTab2()
self.setupTab3()
- self.connect( self, SIGNAL("applyButtonPressed()"), tqApp, SLOT("quit()" ) )
+ self.connect( self, TQ_SIGNAL("applyButtonPressed()"), tqApp, TQ_SLOT("quit()" ) )
def setupTab1( self ):
tab1 = TQVBox( self )
diff --git a/examples/tablestatistics.py b/examples/tablestatistics.py
index dd3058d..890ea09 100755
--- a/examples/tablestatistics.py
+++ b/examples/tablestatistics.py
@@ -47,7 +47,7 @@ class Table(TQTable):
self.adjustColumn(TB_FILE)
# if the user edited something we might need to recalculate the sum
- self.connect(self, SIGNAL("valueChanged(int, int)"), self.recalcSum)
+ self.connect(self, TQ_SIGNAL("valueChanged(int, int)"), self.recalcSum)
def initTable(self):
# read all the TQt source and header files into a list
@@ -131,8 +131,8 @@ class ComboItem(TQTableItem):
def createEditor(self):
# create an editor - a combobox in our case
self.cb = TQComboBox(self.table().viewport())
- TQObject.connect(self.cb, SIGNAL("activated(int)"),
- self.table(), SLOT("doValueChanged()"))
+ TQObject.connect(self.cb, TQ_SIGNAL("activated(int)"),
+ self.table(), TQ_SLOT("doValueChanged()"))
self.cb.insertItem("Yes")
self.cb.insertItem("No")
# and initialize it
diff --git a/examples/tqdir.py b/examples/tqdir.py
index 99875d0..bc9ddbc 100755
--- a/examples/tqdir.py
+++ b/examples/tqdir.py
@@ -174,7 +174,7 @@ class CustomFileDialog(TQFileDialog):
p.setPixmap(TQPixmap(bookmarks))
TQToolTip.add(p, "Bookmarks")
self.bookmarkMenu = TQPopupMenu(self)
- self.connect(self.bookmarkMenu, SIGNAL("activated(int)"),
+ self.connect(self.bookmarkMenu, TQ_SIGNAL("activated(int)"),
self.bookmarkChosen)
self.addId = self.bookmarkMenu.insertItem("Add bookmark")
self.bookmarkMenu.insertSeparator()
@@ -184,12 +184,12 @@ class CustomFileDialog(TQFileDialog):
self.addToolButton(p, True)
self.connect(self.dirView, PYSIGNAL("folderSelected(const TQString &)"),
self.setDir2)
- self.connect(self, SIGNAL("dirEntered(const TQString &)"),
+ self.connect(self, TQ_SIGNAL("dirEntered(const TQString &)"),
self.dirView.setDir)
b = TQToolButton(self)
TQToolTip.add(b, "Go Home!")
b.setPixmap(TQPixmap(home))
- self.connect(b, SIGNAL("clicked()"), self.goHome)
+ self.connect(b, TQ_SIGNAL("clicked()"), self.goHome)
self.addToolButton(b)
if preview:
diff --git a/examples/tqmag.py b/examples/tqmag.py
index 1a7e448..1d7d4c0 100755
--- a/examples/tqmag.py
+++ b/examples/tqmag.py
@@ -40,12 +40,12 @@ class MagWidget(TQWidget):
self.zoom = TQComboBox(FALSE, self)
self.zoom.insertStrList(zoomfactors, len(zoomfactors))
- self.connect(self.zoom, SIGNAL("activated(int)"),
+ self.connect(self.zoom, TQ_SIGNAL("activated(int)"),
self.setZoom)
self.refresh = TQComboBox(FALSE, self)
self.refresh.insertStrList(refreshrates, len(refreshrates))
- self.connect(self.refresh, SIGNAL("activated(int)"),
+ self.connect(self.refresh, TQ_SIGNAL("activated(int)"),
self.setRefresh)
x = 0
@@ -64,13 +64,13 @@ class MagWidget(TQWidget):
self.refresh.setGeometry(x, 2, w + 30, h)
self.saveButton = TQPushButton(self)
- self.connect(self.saveButton, SIGNAL("clicked()"), self.save)
+ self.connect(self.saveButton, TQ_SIGNAL("clicked()"), self.save)
self.saveButton.setText("Save")
self.saveButton.setGeometry(x + w + 30 + 2, 2,
10 + self.saveButton.fontMetrics().width("Save"), h)
self.quitButton = TQPushButton(self)
- self.connect(self.quitButton, SIGNAL("clicked()"), self.tqApp, SLOT("quit()"))
+ self.connect(self.quitButton, TQ_SIGNAL("clicked()"), self.tqApp, TQ_SLOT("quit()"))
self.quitButton.setText("Quit")
self.quitButton.setGeometry(self.saveButton.geometry().right() + 2, 2,
10 + self.quitButton.fontMetrics().width("Quit"), h)
diff --git a/examples/tut10.py b/examples/tut10.py
index e17e66d..3b7a627 100755
--- a/examples/tut10.py
+++ b/examples/tut10.py
@@ -14,8 +14,8 @@ class LCDRange(tqt.TQVBox):
self.slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
self.slider.setRange(0, 99)
self.slider.setValue(0)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -101,7 +101,7 @@ class MyWidget(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange(self, "angle")
self.angle.setRange(5, 70)
diff --git a/examples/tut11.py b/examples/tut11.py
index 1f7422e..f0d5010 100755
--- a/examples/tut11.py
+++ b/examples/tut11.py
@@ -15,8 +15,8 @@ class LCDRange(tqt.TQVBox):
self.slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
self.slider.setRange(0, 99)
self.slider.setValue(0)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -41,7 +41,7 @@ class CannonField(tqt.TQWidget):
self.timerCount = 0
self.autoShootTimer = tqt.TQTimer(self, "movement handler")
- self.connect(self.autoShootTimer, tqt.SIGNAL("timeout()"), self.moveShot)
+ self.connect(self.autoShootTimer, tqt.TQ_SIGNAL("timeout()"), self.moveShot)
self.shoot_ang = 0
self.shoot_f = 0
@@ -162,7 +162,7 @@ class MyWidget(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange(self, "angle")
self.angle.setRange(5, 70)
@@ -180,7 +180,7 @@ class MyWidget(tqt.TQWidget):
shoot = tqt.TQPushButton("&Shoot", self, "shoot")
shoot.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(shoot, tqt.SIGNAL("clicked()"), self.cannonField.shoot)
+ self.connect(shoot, tqt.TQ_SIGNAL("clicked()"), self.cannonField.shoot)
grid = tqt.TQGridLayout(self, 2, 2, 10)
diff --git a/examples/tut12.py b/examples/tut12.py
index 8228802..8dcca8d 100755
--- a/examples/tut12.py
+++ b/examples/tut12.py
@@ -20,8 +20,8 @@ class LCDRange(tqt.TQVBox):
self.label = tqt.TQLabel(" ", self, "label")
self.label.setAlignment(tqt.TQt.AlignCenter)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -56,7 +56,7 @@ class CannonField(tqt.TQWidget):
self.timerCount = 0
self.autoShootTimer = tqt.TQTimer(self, "movement handler")
- self.connect(self.autoShootTimer, tqt.SIGNAL("timeout()"), self.moveShot)
+ self.connect(self.autoShootTimer, tqt.TQ_SIGNAL("timeout()"), self.moveShot)
self.shoot_ang = 0
self.shoot_f = 0
@@ -202,7 +202,7 @@ class MyWidget(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange("ANGLE", self, "angle")
self.angle.setRange(5, 70)
@@ -220,7 +220,7 @@ class MyWidget(tqt.TQWidget):
shoot = tqt.TQPushButton("&Shoot", self, "shoot")
shoot.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(shoot, tqt.SIGNAL("clicked()"), self.cannonField.shoot)
+ self.connect(shoot, tqt.TQ_SIGNAL("clicked()"), self.cannonField.shoot)
grid = tqt.TQGridLayout(self, 2, 2, 10)
diff --git a/examples/tut13.py b/examples/tut13.py
index 6b4d485..8eed43c 100755
--- a/examples/tut13.py
+++ b/examples/tut13.py
@@ -20,8 +20,8 @@ class LCDRange(tqt.TQWidget):
self.label = tqt.TQLabel(" ", self, "label")
self.label.setAlignment(tqt.TQt.AlignCenter)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -61,7 +61,7 @@ class CannonField(tqt.TQWidget):
self.timerCount = 0
self.autoShootTimer = tqt.TQTimer(self, "movement handler")
- self.connect(self.autoShootTimer, tqt.SIGNAL("timeout()"), self.moveShot)
+ self.connect(self.autoShootTimer, tqt.TQ_SIGNAL("timeout()"), self.moveShot)
self.shoot_ang = 0
self.shoot_f = 0
@@ -237,7 +237,7 @@ class GameBoard(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange("ANGLE", self, "angle")
self.angle.setRange(5, 70)
@@ -258,12 +258,12 @@ class GameBoard(tqt.TQWidget):
self.shoot = tqt.TQPushButton("&Shoot", self, "shoot")
self.shoot.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(self.shoot, tqt.SIGNAL("clicked()"), self.fire)
- self.connect(self.cannonField, tqt.PYSIGNAL("canShoot(bool)"), self.shoot, tqt.SLOT("setEnabled(bool)"))
+ self.connect(self.shoot, tqt.TQ_SIGNAL("clicked()"), self.fire)
+ self.connect(self.cannonField, tqt.PYSIGNAL("canShoot(bool)"), self.shoot, tqt.TQ_SLOT("setEnabled(bool)"))
restart = tqt.TQPushButton("&New Game", self, "newgame")
restart.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(restart, tqt.SIGNAL("clicked()"), self.newGame)
+ self.connect(restart, tqt.TQ_SIGNAL("clicked()"), self.newGame)
self.hits = tqt.TQLCDNumber(2, self, "hits")
self.shotsLeft = tqt.TQLCDNumber(2, self, "shotsleft")
diff --git a/examples/tut14.py b/examples/tut14.py
index 11da6fa..a9bf1c9 100755
--- a/examples/tut14.py
+++ b/examples/tut14.py
@@ -20,8 +20,8 @@ class LCDRange(tqt.TQWidget):
self.label = tqt.TQLabel(" ", self, "label")
self.label.setAlignment(tqt.TQt.AlignCenter)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -61,7 +61,7 @@ class CannonField(tqt.TQWidget):
self.timerCount = 0
self.autoShootTimer = tqt.TQTimer(self, "movement handler")
- self.connect(self.autoShootTimer, tqt.SIGNAL("timeout()"), self.moveShot)
+ self.connect(self.autoShootTimer, tqt.TQ_SIGNAL("timeout()"), self.moveShot)
self.shoot_ang = 0
self.shoot_f = 0
@@ -277,7 +277,7 @@ class GameBoard(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange("ANGLE", self, "angle")
self.angle.setRange(5, 70)
@@ -301,12 +301,12 @@ class GameBoard(tqt.TQWidget):
self.shoot = tqt.TQPushButton("&Shoot", self, "shoot")
self.shoot.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(self.shoot, tqt.SIGNAL("clicked()"), self.fire)
- self.connect(self.cannonField, tqt.PYSIGNAL("canShoot(bool)"), self.shoot, tqt.SLOT("setEnabled(bool)"))
+ self.connect(self.shoot, tqt.TQ_SIGNAL("clicked()"), self.fire)
+ self.connect(self.cannonField, tqt.PYSIGNAL("canShoot(bool)"), self.shoot, tqt.TQ_SLOT("setEnabled(bool)"))
restart = tqt.TQPushButton("&New Game", self, "newgame")
restart.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(restart, tqt.SIGNAL("clicked()"), self.newGame)
+ self.connect(restart, tqt.TQ_SIGNAL("clicked()"), self.newGame)
self.hits = tqt.TQLCDNumber(2, self, "hits")
self.shotsLeft = tqt.TQLCDNumber(2, self, "shotsleft")
@@ -316,7 +316,7 @@ class GameBoard(tqt.TQWidget):
accel = tqt.TQAccel(self)
accel.connectItem(accel.insertItem(tqt.TQt.Key_Enter), self.fire)
accel.connectItem(accel.insertItem(tqt.TQt.Key_Return), self.fire)
- accel.connectItem(accel.insertItem(tqt.TQt.CTRL + tqt.TQt.Key_Q), tqt.tqApp, tqt.SLOT("quit()"))
+ accel.connectItem(accel.insertItem(tqt.TQt.CTRL + tqt.TQt.Key_Q), tqt.tqApp, tqt.TQ_SLOT("quit()"))
grid = tqt.TQGridLayout(self, 2, 2, 10)
grid.addWidget(quit, 0, 0)
diff --git a/examples/tut2.py b/examples/tut2.py
index ddfe5b1..e122c3f 100755
--- a/examples/tut2.py
+++ b/examples/tut2.py
@@ -12,7 +12,7 @@ quit = tqt.TQPushButton("Quit", None)
quit.resize(75, 30)
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
-tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
+tqt.TQObject.connect(quit, tqt.TQ_SIGNAL("clicked()"), a, tqt.TQ_SLOT("quit()"))
a.setMainWidget(quit)
quit.show()
diff --git a/examples/tut3.py b/examples/tut3.py
index 1eb6ca3..58ec009 100755
--- a/examples/tut3.py
+++ b/examples/tut3.py
@@ -14,7 +14,7 @@ box.resize(200, 120)
quit = tqt.TQPushButton("Quit", box)
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
-tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
+tqt.TQObject.connect(quit, tqt.TQ_SIGNAL("clicked()"), a, tqt.TQ_SLOT("quit()"))
a.setMainWidget(box)
box.show()
diff --git a/examples/tut4.py b/examples/tut4.py
index f61a054..ca1c577 100755
--- a/examples/tut4.py
+++ b/examples/tut4.py
@@ -17,7 +17,7 @@ class MyWidget(tqt.TQWidget):
quit.setGeometry(62, 40, 75, 30)
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
a = tqt.TQApplication(sys.argv)
diff --git a/examples/tut5.py b/examples/tut5.py
index fe12295..c0b4a6b 100755
--- a/examples/tut5.py
+++ b/examples/tut5.py
@@ -13,7 +13,7 @@ class MyWidget(tqt.TQVBox):
quit = tqt.TQPushButton("Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
lcd = tqt.TQLCDNumber(2, self, "lcd")
@@ -21,7 +21,7 @@ class MyWidget(tqt.TQVBox):
slider.setRange(0, 99)
slider.setValue(0)
- self.connect(slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
+ self.connect(slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
a = tqt.TQApplication(sys.argv)
diff --git a/examples/tut6.py b/examples/tut6.py
index 7c6c682..e7a57e3 100755
--- a/examples/tut6.py
+++ b/examples/tut6.py
@@ -14,7 +14,7 @@ class LCDRange(tqt.TQVBox):
slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
slider.setRange(0, 99)
slider.setValue(0)
- self.connect(slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
+ self.connect(slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
class MyWidget(tqt.TQVBox):
@@ -24,7 +24,7 @@ class MyWidget(tqt.TQVBox):
quit = tqt.TQPushButton("Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
grid = tqt.TQGrid(4, self)
diff --git a/examples/tut7.py b/examples/tut7.py
index ed8da51..81b7640 100755
--- a/examples/tut7.py
+++ b/examples/tut7.py
@@ -14,8 +14,8 @@ class LCDRange(tqt.TQVBox):
self.slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
self.slider.setRange(0, 99)
self.slider.setValue(0)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
def value(self):
return self.slider.value()
@@ -31,7 +31,7 @@ class MyWidget(tqt.TQVBox):
quit = tqt.TQPushButton("Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
grid = tqt.TQGrid(4, self)
diff --git a/examples/tut8.py b/examples/tut8.py
index ca4a912..3d90516 100755
--- a/examples/tut8.py
+++ b/examples/tut8.py
@@ -14,8 +14,8 @@ class LCDRange(tqt.TQVBox):
self.slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
self.slider.setRange(0, 99)
self.slider.setValue(0)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -67,7 +67,7 @@ class MyWidget(tqt.TQWidget):
quit = tqt.TQPushButton("Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange(self, "angle")
self.angle.setRange(5, 70)
diff --git a/examples/tut9.py b/examples/tut9.py
index f95227f..bf62060 100755
--- a/examples/tut9.py
+++ b/examples/tut9.py
@@ -14,8 +14,8 @@ class LCDRange(tqt.TQVBox):
self.slider = tqt.TQSlider(tqt.TQt.Horizontal, self, "slider")
self.slider.setRange(0, 99)
self.slider.setValue(0)
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), lcd, tqt.SLOT("display(int)"))
- self.connect(self.slider, tqt.SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), lcd, tqt.TQ_SLOT("display(int)"))
+ self.connect(self.slider, tqt.TQ_SIGNAL("valueChanged(int)"), self, tqt.PYSIGNAL("valueChanged(int)"))
self.setFocusProxy(self.slider)
@@ -73,7 +73,7 @@ class MyWidget(tqt.TQWidget):
quit = tqt.TQPushButton("&Quit", self, "quit")
quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
- self.connect(quit, tqt.SIGNAL("clicked()"), tqt.tqApp, tqt.SLOT("quit()"))
+ self.connect(quit, tqt.TQ_SIGNAL("clicked()"), tqt.tqApp, tqt.TQ_SLOT("quit()"))
self.angle = LCDRange(self, "angle")
self.angle.setRange(5, 70)
diff --git a/examples/webbrowser/mainwindow.py b/examples/webbrowser/mainwindow.py
index 2d4e740..4078aca 100644
--- a/examples/webbrowser/mainwindow.py
+++ b/examples/webbrowser/mainwindow.py
@@ -1002,24 +1002,24 @@ class MainWindow(TQMainWindow):
self.resize(TQSize(812,605).expandedTo(self.minimumSizeHint()))
self.clearWState(TQt.WState_Polished)
- self.connect(self.actionHome,SIGNAL("activated()"),self.WebBrowser,SLOT("GoHome()"))
- self.connect(self.actionRefresh,SIGNAL("activated()"),self.WebBrowser,SLOT("Refresh()"))
- self.connect(self.actionStop,SIGNAL("activated()"),self.WebBrowser,SLOT("Stop()"))
- self.connect(self.actionForward,SIGNAL("activated()"),self.WebBrowser,SLOT("GoForward()"))
- self.connect(self.actionBack,SIGNAL("activated()"),self.WebBrowser,SLOT("GoBack()"))
- self.connect(self.actionGo,SIGNAL("activated()"),self.go)
- self.connect(self.actionFileClose,SIGNAL("activated()"),self.close)
- self.connect(self.actionSearch,SIGNAL("activated()"),self.WebBrowser,SLOT("GoSearch()"))
- self.connect(self.addressEdit,SIGNAL("returnPressed()"),self.go)
- self.connect(self.WebBrowser,SIGNAL("NavigateComplete(const TQString&)"),self.addressEdit.setText)
- self.connect(self.WebBrowser,SIGNAL("TitleChange(const TQString&)"),self.setTitle)
- self.connect(self.WebBrowser,SIGNAL("NavigateComplete(const TQString&)"),self.navigateComplete)
- self.connect(self.WebBrowser,SIGNAL("CommandStateChange(int,bool)"),self.setCommandState)
- self.connect(self.WebBrowser,SIGNAL("BeforeNavigate(const TQString&,int,const TQString&,const TQVariant&,const TQString&,bool&)"),self.navigateBegin)
- self.connect(self.actionStop,SIGNAL("activated()"),self.navigateComplete)
- self.connect(self.actionNewWindow,SIGNAL("activated()"),self.newWindow)
- self.connect(self.actionAbout,SIGNAL("activated()"),self.aboutSlot)
- self.connect(self.actionAboutTQt,SIGNAL("activated()"),self.aboutTQtSlot)
+ self.connect(self.actionHome,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("GoHome()"))
+ self.connect(self.actionRefresh,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("Refresh()"))
+ self.connect(self.actionStop,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("Stop()"))
+ self.connect(self.actionForward,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("GoForward()"))
+ self.connect(self.actionBack,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("GoBack()"))
+ self.connect(self.actionGo,TQ_SIGNAL("activated()"),self.go)
+ self.connect(self.actionFileClose,TQ_SIGNAL("activated()"),self.close)
+ self.connect(self.actionSearch,TQ_SIGNAL("activated()"),self.WebBrowser,TQ_SLOT("GoSearch()"))
+ self.connect(self.addressEdit,TQ_SIGNAL("returnPressed()"),self.go)
+ self.connect(self.WebBrowser,TQ_SIGNAL("NavigateComplete(const TQString&)"),self.addressEdit.setText)
+ self.connect(self.WebBrowser,TQ_SIGNAL("TitleChange(const TQString&)"),self.setTitle)
+ self.connect(self.WebBrowser,TQ_SIGNAL("NavigateComplete(const TQString&)"),self.navigateComplete)
+ self.connect(self.WebBrowser,TQ_SIGNAL("CommandStateChange(int,bool)"),self.setCommandState)
+ self.connect(self.WebBrowser,TQ_SIGNAL("BeforeNavigate(const TQString&,int,const TQString&,const TQVariant&,const TQString&,bool&)"),self.navigateBegin)
+ self.connect(self.actionStop,TQ_SIGNAL("activated()"),self.navigateComplete)
+ self.connect(self.actionNewWindow,TQ_SIGNAL("activated()"),self.newWindow)
+ self.connect(self.actionAbout,TQ_SIGNAL("activated()"),self.aboutSlot)
+ self.connect(self.actionAboutTQt,TQ_SIGNAL("activated()"),self.aboutTQtSlot)
self.init()
diff --git a/examples/webbrowser/webbrowser.py b/examples/webbrowser/webbrowser.py
index 0ae8702..95b09ab 100644
--- a/examples/webbrowser/webbrowser.py
+++ b/examples/webbrowser/webbrowser.py
@@ -20,8 +20,8 @@ class MainWindowImpl(mainwindow.MainWindow):
self.pb.hide()
self.statusBar().addWidget(self.pb, 0, True)
- self.connect(self.WebBrowser, tqt.SIGNAL("ProgressChange(int,int)"), self.setProgress)
- self.connect(self.WebBrowser, tqt.SIGNAL("StatusTextChange(const TQString&)"), self.statusBar(), tqt.SLOT("message(const TQString&)"))
+ self.connect(self.WebBrowser, tqt.TQ_SIGNAL("ProgressChange(int,int)"), self.setProgress)
+ self.connect(self.WebBrowser, tqt.TQ_SIGNAL("StatusTextChange(const TQString&)"), self.statusBar(), tqt.TQ_SLOT("message(const TQString&)"))
self.WebBrowser.dynamicCall("GoHome()");
diff --git a/examples/widgets.py b/examples/widgets.py
index 59a44c4..eca0e5b 100755
--- a/examples/widgets.py
+++ b/examples/widgets.py
@@ -21,7 +21,7 @@ class AnalogClock( TQWidget ):
TQWidget.__init__(*(self,) + args)
self.time = TQTime.currentTime() # get current time
internalTimer = TQTimer( self ) # create internal timer
- self.connect( internalTimer, SIGNAL("timeout()"), self.timeout )
+ self.connect( internalTimer, TQ_SIGNAL("timeout()"), self.timeout )
internalTimer.start( 5000 ) # emit signal every 5 seconds
#
@@ -160,7 +160,7 @@ class WidgetView ( TQWidget ):
self.id = self.popup.insertItem( "&Open" )
self.popup.setItemEnabled( self.id, FALSE )
self.popup.insertSeparator()
- self.popup.insertItem( "&Quit", tqApp, SLOT("quit()"), TQt.CTRL+TQt.Key_Q )
+ self.popup.insertItem( "&Quit", tqApp, TQ_SLOT("quit()"), TQt.CTRL+TQt.Key_Q )
self.menubar.insertItem( "&File", self.popup )
@@ -189,7 +189,7 @@ class WidgetView ( TQWidget ):
self.pb.setText( "Push button 1" )
self.pb.setFixedHeight( self.pb.sizeHint().height() )
self.grid.addWidget( self.pb, 0, 0, TQt.AlignVCenter )
- self.connect( self.pb, SIGNAL("clicked()"), self.button1Clicked )
+ self.connect( self.pb, TQ_SIGNAL("clicked()"), self.button1Clicked )
TQToolTip.add( self.pb, "push button 1" )
self.pm = TQPixmap()
self.pix = self.pm.load( "tqt.png" ) # load pixmap for button 2
@@ -239,7 +239,7 @@ class WidgetView ( TQWidget ):
self.bg.setMinimumSize( self.bg.childrenRect().size() )
self.vbox.activate()
- self.connect( self.bg, SIGNAL("clicked(int)"), self.checkBoxClicked )
+ self.connect( self.bg, TQ_SIGNAL("clicked(int)"), self.checkBoxClicked )
TQToolTip.add( self.cb[0], "check box 1" )
TQToolTip.add( self.cb[1], "check box 2" )
@@ -272,7 +272,7 @@ class WidgetView ( TQWidget ):
self.rb.setMinimumSize( self.rb.sizeHint() )
self.vbox.activate()
- self.connect( self.bg, SIGNAL("clicked(int)"), self.radioButtonClicked )
+ self.connect( self.bg, TQ_SIGNAL("clicked(int)"), self.radioButtonClicked )
TQToolTip.add( self.rb, "radio button 3" )
# Create a list box
@@ -286,7 +286,7 @@ class WidgetView ( TQWidget ):
self.lb.insertItem( txt )
self.grid.addMultiCellWidget( self.lb, 2, 4, 0, 0 )
- self.connect( self.lb, SIGNAL("selected(int)"), self.listBoxItemSelected )
+ self.connect( self.lb, TQ_SIGNAL("selected(int)"), self.listBoxItemSelected )
TQToolTip.add( self.lb, "list box" )
self.vbox = TQVBoxLayout( 8 )
@@ -300,7 +300,7 @@ class WidgetView ( TQWidget ):
self.sb.setFixedHeight( self.sb.sizeHint().height() )
self.vbox.addWidget( self.sb )
- self.connect( self.sb, SIGNAL("valueChanged(int)"), self.sliderValueChanged )
+ self.connect( self.sb, TQ_SIGNAL("valueChanged(int)"), self.sliderValueChanged )
TQToolTip.add( self.sb, "slider" )
# Create a combo box
@@ -312,7 +312,7 @@ class WidgetView ( TQWidget ):
self.combo.insertItem( "red" )
self.combo.setFixedHeight( self.combo.sizeHint().height() )
self.vbox.addWidget( self.combo )
- self.connect( self.combo, SIGNAL("activated(int)"), self.comboBoxItemActivated )
+ self.connect( self.combo, TQ_SIGNAL("activated(int)"), self.comboBoxItemActivated )
TQToolTip.add( self.combo, "read-only combo box" )
# Create an editable combo box
@@ -324,7 +324,7 @@ class WidgetView ( TQWidget ):
self.edCombo.insertItem( "Inconstant" )
self.edCombo.setFixedHeight( self.edCombo.sizeHint().height() )
self.vbox.addWidget( self.edCombo )
- self.connect( self.edCombo, SIGNAL("activated(const TQString &)"), self.edComboBoxItemActivated)
+ self.connect( self.edCombo, TQ_SIGNAL("activated(const TQString &)"), self.edComboBoxItemActivated)
TQToolTip.add( self.edCombo, "editable combo box" )
self.edCombo.setAutoCompletion( TRUE )
@@ -339,7 +339,7 @@ class WidgetView ( TQWidget ):
self.spin.setSuffix( " mm" )
self.spin.setSpecialValueText( "Auto" )
self.spin.setMinimumSize( self.spin.sizeHint() )
- self.connect( self.spin, SIGNAL( "valueChanged(const TQString &)" ), self.spinBoxValueChanged )
+ self.connect( self.spin, TQ_SIGNAL( "valueChanged(const TQString &)" ), self.spinBoxValueChanged )
TQToolTip.add( self.spin, "spin box" )
self.vbox.addWidget( self.spin )
@@ -359,7 +359,7 @@ class WidgetView ( TQWidget ):
self.le = TQLineEdit( self, "lineEdit" )
self.grid.addMultiCellWidget( self.le, 4, 4, 1, 2 )
self.le.setFixedHeight( self.le.sizeHint().height() )
- self.connect( self.le, SIGNAL("textChanged(const TQString &)"), self.lineEditTextChanged )
+ self.connect( self.le, TQ_SIGNAL("textChanged(const TQString &)"), self.lineEditTextChanged )
TQToolTip.add( self.le, "single line editor" )
# Create a horizontal line (sort of TQFrame) above the message line
diff --git a/pytquic3/form.cpp b/pytquic3/form.cpp
index 0d1255a..b0de614 100644
--- a/pytquic3/form.cpp
+++ b/pytquic3/form.cpp
@@ -598,14 +598,14 @@ void Uic::createFormImpl( const TQDomElement &e )
receiver = "self." + receiver;
out << indent << "self.connect(" << sender
- << ",SIGNAL(\"" << signal << "\")," << receiver;
+ << ",TQ_SIGNAL(\"" << signal << "\")," << receiver;
- // Normally we never use the SLOT() macro in case the
+ // Normally we never use the TQ_SLOT() macro in case the
// connection is to a method of a Python custom widget. The
// exception is if the receiver is a TQAxWidget where it must be
// used because the slots are dynamic.
if (isaxwidget)
- out << ",SLOT(\"" << slot << "\")";
+ out << ",TQ_SLOT(\"" << slot << "\")";
else
{
TQString mname = slot.left(slot.find('('));
diff --git a/pytquic3/main.cpp b/pytquic3/main.cpp
index 24fbbf3..826b1ef 100644
--- a/pytquic3/main.cpp
+++ b/pytquic3/main.cpp
@@ -228,7 +228,7 @@ int main( int argc, char * argv[] )
out << indent << "if __name__ == \"__main__\":" << endl;
++indent;
out << indent << "a = TQApplication(sys.argv)" << endl;
- out << indent << "TQObject.connect(a,SIGNAL(\"lastWindowClosed()\"),a,SLOT(\"quit()\"))" << endl;
+ out << indent << "TQObject.connect(a,TQ_SIGNAL(\"lastWindowClosed()\"),a,TQ_SLOT(\"quit()\"))" << endl;
out << indent << "w = " << (subcl ? className : uicClass) << "()" << endl;
out << indent << "a.setMainWidget(w)" << endl;
diff --git a/sip/tqt/tqobject.sip b/sip/tqt/tqobject.sip
index e879c01..20aa579 100644
--- a/sip/tqt/tqobject.sip
+++ b/sip/tqt/tqobject.sip
@@ -606,11 +606,11 @@ SIP_PYOBJECT TQT_TRANSLATE_NOOP(SIP_PYOBJECT,SIP_PYOBJECT);
%End
-SIP_PYOBJECT SLOT(const char * /Encoding="ASCII"/) /TypeHint="TQT_SLOT"/;
+SIP_PYOBJECT TQ_SLOT(const char * /Encoding="ASCII"/) /TypeHint="TQ_SLOT"/;
%MethodCode
if (!a0)
{
- PyErr_Format(PyExc_TypeError,"tqt.SLOT() slot name cannot be None");
+ PyErr_Format(PyExc_TypeError,"tqt.TQ_SLOT() slot name cannot be None");
sipIsErr = 1;
}
else
@@ -631,11 +631,11 @@ SIP_PYOBJECT SLOT(const char * /Encoding="ASCII"/) /TypeHint="TQT_SLOT"/;
%End
-SIP_PYOBJECT SIGNAL(const char * /Encoding="ASCII"/) /TypeHint="TQT_SIGNAL"/;
+SIP_PYOBJECT TQ_SIGNAL(const char * /Encoding="ASCII"/) /TypeHint="TQ_SIGNAL"/;
%MethodCode
if (!a0)
{
- PyErr_Format(PyExc_TypeError,"tqt.SIGNAL() signal cannot be None");
+ PyErr_Format(PyExc_TypeError,"tqt.TQ_SIGNAL() signal cannot be None");
sipIsErr = 1;
}
else
@@ -1149,10 +1149,10 @@ UniversalSlot::UniversalSlot(TQObject *tqtx, pytqt3SlotConnection *connection, c
// Detect when the transmitter is destroyed.
if (tqtx)
- connect(tqtx, SIGNAL(destroyed(TQObject *)), SLOT(deleteLater()));
+ connect(tqtx, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(deleteLater()));
// Return the slot to connect to.
- *member = SLOT(unislot());
+ *member = TQ_SLOT(unislot());
// Add this one to the global list.
nextus = unislots;
@@ -1793,7 +1793,7 @@ static void *sipTQtFindSlot(void *tx, const char *sig, PyObject *rxObj,
if (sipSameSlot(&conn->sc_slot, rxObj, slot))
{
- *member = SLOT(unislot());
+ *member = TQ_SLOT(unislot());
return us;
}
}