summaryrefslogtreecommitdiffstats
path: root/tutorial
diff options
context:
space:
mode:
Diffstat (limited to 'tutorial')
-rw-r--r--tutorial/t10/lcdrange.cpp8
-rw-r--r--tutorial/t10/main.cpp18
-rw-r--r--tutorial/t11/cannon.cpp4
-rw-r--r--tutorial/t11/lcdrange.cpp8
-rw-r--r--tutorial/t11/main.cpp20
-rw-r--r--tutorial/t12/cannon.cpp4
-rw-r--r--tutorial/t12/lcdrange.cpp8
-rw-r--r--tutorial/t12/main.cpp20
-rw-r--r--tutorial/t13/cannon.cpp4
-rw-r--r--tutorial/t13/gamebrd.cpp34
-rw-r--r--tutorial/t13/lcdrange.cpp8
-rw-r--r--tutorial/t14/cannon.cpp4
-rw-r--r--tutorial/t14/gamebrd.cpp40
-rw-r--r--tutorial/t14/lcdrange.cpp8
-rw-r--r--tutorial/t15/main.cpp8
-rw-r--r--tutorial/t2/main.cpp2
-rw-r--r--tutorial/t3/main.cpp2
-rw-r--r--tutorial/t4/main.cpp2
-rw-r--r--tutorial/t5/main.cpp4
-rw-r--r--tutorial/t6/main.cpp4
-rw-r--r--tutorial/t7/lcdrange.cpp8
-rw-r--r--tutorial/t7/main.cpp6
-rw-r--r--tutorial/t8/lcdrange.cpp8
-rw-r--r--tutorial/t8/main.cpp10
-rw-r--r--tutorial/t9/lcdrange.cpp8
-rw-r--r--tutorial/t9/main.cpp10
26 files changed, 130 insertions, 130 deletions
diff --git a/tutorial/t10/lcdrange.cpp b/tutorial/t10/lcdrange.cpp
index cbb60a99..2a56b9ad 100644
--- a/tutorial/t10/lcdrange.cpp
+++ b/tutorial/t10/lcdrange.cpp
@@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
}
diff --git a/tutorial/t10/main.cpp b/tutorial/t10/main.cpp
index 7b14dc14..4138a2f2 100644
--- a/tutorial/t10/main.cpp
+++ b/tutorial/t10/main.cpp
@@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( this, "angle" );
angle->setRange( 5, 70 );
@@ -37,15 +37,15 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
CannonField *cannonField = new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
- connect( force, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setForce(int)) );
- connect( cannonField, SIGNAL(forceChanged(int)),
- force, SLOT(setValue(int)) );
+ connect( force, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setForce(int)) );
+ connect( cannonField, TQ_SIGNAL(forceChanged(int)),
+ force, TQ_SLOT(setValue(int)) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( quit, 0, 0 );
diff --git a/tutorial/t11/cannon.cpp b/tutorial/t11/cannon.cpp
index bfbc12a1..a61b2bb6 100644
--- a/tutorial/t11/cannon.cpp
+++ b/tutorial/t11/cannon.cpp
@@ -19,8 +19,8 @@ CannonField::CannonField( TQWidget *parent, const char *name )
f = 0;
timerCount = 0;
autoShootTimer = new TQTimer( this, "movement handler" );
- connect( autoShootTimer, SIGNAL(timeout()),
- this, SLOT(moveShot()) );
+ connect( autoShootTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(moveShot()) );
shoot_ang = 0;
shoot_f = 0;
setPalette( TQPalette( TQColor( 250, 250, 200) ) );
diff --git a/tutorial/t11/lcdrange.cpp b/tutorial/t11/lcdrange.cpp
index cbb60a99..2a56b9ad 100644
--- a/tutorial/t11/lcdrange.cpp
+++ b/tutorial/t11/lcdrange.cpp
@@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
}
diff --git a/tutorial/t11/main.cpp b/tutorial/t11/main.cpp
index 4ddd2938..c909ad74 100644
--- a/tutorial/t11/main.cpp
+++ b/tutorial/t11/main.cpp
@@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( this, "angle" );
angle->setRange( 5, 70 );
@@ -37,20 +37,20 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
CannonField *cannonField = new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
- connect( force, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setForce(int)) );
- connect( cannonField, SIGNAL(forceChanged(int)),
- force, SLOT(setValue(int)) );
+ connect( force, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setForce(int)) );
+ connect( cannonField, TQ_SIGNAL(forceChanged(int)),
+ force, TQ_SLOT(setValue(int)) );
TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" );
shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( shoot, SIGNAL(clicked()), cannonField, SLOT(shoot()) );
+ connect( shoot, TQ_SIGNAL(clicked()), cannonField, TQ_SLOT(shoot()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( quit, 0, 0 );
diff --git a/tutorial/t12/cannon.cpp b/tutorial/t12/cannon.cpp
index 597c5464..f3d05ca1 100644
--- a/tutorial/t12/cannon.cpp
+++ b/tutorial/t12/cannon.cpp
@@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name )
f = 0;
timerCount = 0;
autoShootTimer = new TQTimer( this, "movement handler" );
- connect( autoShootTimer, SIGNAL(timeout()),
- this, SLOT(moveShot()) );
+ connect( autoShootTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(moveShot()) );
shoot_ang = 0;
shoot_f = 0;
target = TQPoint( 0, 0 );
diff --git a/tutorial/t12/lcdrange.cpp b/tutorial/t12/lcdrange.cpp
index 79614365..dfa7f6e9 100644
--- a/tutorial/t12/lcdrange.cpp
+++ b/tutorial/t12/lcdrange.cpp
@@ -37,10 +37,10 @@ void LCDRange::init()
label = new TQLabel( " ", this, "label" );
label->setAlignment( AlignCenter );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
}
diff --git a/tutorial/t12/main.cpp b/tutorial/t12/main.cpp
index 5401d997..2026126f 100644
--- a/tutorial/t12/main.cpp
+++ b/tutorial/t12/main.cpp
@@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( "ANGLE", this, "angle" );
angle->setRange( 5, 70 );
@@ -37,20 +37,20 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
CannonField *cannonField = new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
- connect( force, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setForce(int)) );
- connect( cannonField, SIGNAL(forceChanged(int)),
- force, SLOT(setValue(int)) );
+ connect( force, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setForce(int)) );
+ connect( cannonField, TQ_SIGNAL(forceChanged(int)),
+ force, TQ_SLOT(setValue(int)) );
TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" );
shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( shoot, SIGNAL(clicked()), cannonField, SLOT(shoot()) );
+ connect( shoot, TQ_SIGNAL(clicked()), cannonField, TQ_SLOT(shoot()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( quit, 0, 0 );
diff --git a/tutorial/t13/cannon.cpp b/tutorial/t13/cannon.cpp
index 85a038f0..9ca28f16 100644
--- a/tutorial/t13/cannon.cpp
+++ b/tutorial/t13/cannon.cpp
@@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name )
f = 0;
timerCount = 0;
autoShootTimer = new TQTimer( this, "movement handler" );
- connect( autoShootTimer, SIGNAL(timeout()),
- this, SLOT(moveShot()) );
+ connect( autoShootTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(moveShot()) );
shoot_ang = 0;
shoot_f = 0;
target = TQPoint( 0, 0 );
diff --git a/tutorial/t13/gamebrd.cpp b/tutorial/t13/gamebrd.cpp
index a8ee16c5..587dd2ea 100644
--- a/tutorial/t13/gamebrd.cpp
+++ b/tutorial/t13/gamebrd.cpp
@@ -22,7 +22,7 @@ GameBoard::GameBoard( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( "ANGLE", this, "angle" );
angle->setRange( 5, 70 );
@@ -32,33 +32,33 @@ GameBoard::GameBoard( TQWidget *parent, const char *name )
cannonField = new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
- connect( force, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setForce(int)) );
- connect( cannonField, SIGNAL(forceChanged(int)),
- force, SLOT(setValue(int)) );
+ connect( force, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setForce(int)) );
+ connect( cannonField, TQ_SIGNAL(forceChanged(int)),
+ force, TQ_SLOT(setValue(int)) );
- connect( cannonField, SIGNAL(hit()),
- this, SLOT(hit()) );
- connect( cannonField, SIGNAL(missed()),
- this, SLOT(missed()) );
+ connect( cannonField, TQ_SIGNAL(hit()),
+ this, TQ_SLOT(hit()) );
+ connect( cannonField, TQ_SIGNAL(missed()),
+ this, TQ_SLOT(missed()) );
TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" );
shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( shoot, SIGNAL(clicked()), SLOT(fire()) );
- connect( cannonField, SIGNAL(canShoot(bool)),
- shoot, SLOT(setEnabled(bool)) );
+ connect( shoot, TQ_SIGNAL(clicked()), TQ_SLOT(fire()) );
+ connect( cannonField, TQ_SIGNAL(canShoot(bool)),
+ shoot, TQ_SLOT(setEnabled(bool)) );
TQPushButton *restart
= new TQPushButton( "&New Game", this, "newgame" );
restart->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( restart, SIGNAL(clicked()), this, SLOT(newGame()) );
+ connect( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) );
hits = new TQLCDNumber( 2, this, "hits" );
shotsLeft = new TQLCDNumber( 2, this, "shotsleft" );
diff --git a/tutorial/t13/lcdrange.cpp b/tutorial/t13/lcdrange.cpp
index fb601592..5ce3e37e 100644
--- a/tutorial/t13/lcdrange.cpp
+++ b/tutorial/t13/lcdrange.cpp
@@ -37,10 +37,10 @@ void LCDRange::init()
label = new TQLabel( " ", this, "label" );
label->setAlignment( AlignCenter );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
diff --git a/tutorial/t14/cannon.cpp b/tutorial/t14/cannon.cpp
index 37bc274e..1feacd9b 100644
--- a/tutorial/t14/cannon.cpp
+++ b/tutorial/t14/cannon.cpp
@@ -21,8 +21,8 @@ CannonField::CannonField( TQWidget *parent, const char *name )
f = 0;
timerCount = 0;
autoShootTimer = new TQTimer( this, "movement handler" );
- connect( autoShootTimer, SIGNAL(timeout()),
- this, SLOT(moveShot()) );
+ connect( autoShootTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(moveShot()) );
shoot_ang = 0;
shoot_f = 0;
target = TQPoint( 0, 0 );
diff --git a/tutorial/t14/gamebrd.cpp b/tutorial/t14/gamebrd.cpp
index 2aebec56..05f661b4 100644
--- a/tutorial/t14/gamebrd.cpp
+++ b/tutorial/t14/gamebrd.cpp
@@ -24,7 +24,7 @@ GameBoard::GameBoard( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( "ANGLE", this, "angle" );
angle->setRange( 5, 70 );
@@ -37,34 +37,34 @@ GameBoard::GameBoard( TQWidget *parent, const char *name )
cannonField = new CannonField( box, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
- connect( force, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setForce(int)) );
- connect( cannonField, SIGNAL(forceChanged(int)),
- force, SLOT(setValue(int)) );
+ connect( force, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setForce(int)) );
+ connect( cannonField, TQ_SIGNAL(forceChanged(int)),
+ force, TQ_SLOT(setValue(int)) );
- connect( cannonField, SIGNAL(hit()),
- this, SLOT(hit()) );
- connect( cannonField, SIGNAL(missed()),
- this, SLOT(missed()) );
+ connect( cannonField, TQ_SIGNAL(hit()),
+ this, TQ_SLOT(hit()) );
+ connect( cannonField, TQ_SIGNAL(missed()),
+ this, TQ_SLOT(missed()) );
TQPushButton *shoot = new TQPushButton( "&Shoot", this, "shoot" );
shoot->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( shoot, SIGNAL(clicked()), SLOT(fire()) );
+ connect( shoot, TQ_SIGNAL(clicked()), TQ_SLOT(fire()) );
- connect( cannonField, SIGNAL(canShoot(bool)),
- shoot, SLOT(setEnabled(bool)) );
+ connect( cannonField, TQ_SIGNAL(canShoot(bool)),
+ shoot, TQ_SLOT(setEnabled(bool)) );
TQPushButton *restart
= new TQPushButton( "&New Game", this, "newgame" );
restart->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( restart, SIGNAL(clicked()), this, SLOT(newGame()) );
+ connect( restart, TQ_SIGNAL(clicked()), this, TQ_SLOT(newGame()) );
hits = new TQLCDNumber( 2, this, "hits" );
shotsLeft = new TQLCDNumber( 2, this, "shotsleft" );
@@ -74,11 +74,11 @@ GameBoard::GameBoard( TQWidget *parent, const char *name )
TQAccel *accel = new TQAccel( this );
accel->connectItem( accel->insertItem( Key_Enter ),
- this, SLOT(fire()) );
+ this, TQ_SLOT(fire()) );
accel->connectItem( accel->insertItem( Key_Return ),
- this, SLOT(fire()) );
+ this, TQ_SLOT(fire()) );
accel->connectItem( accel->insertItem( CTRL+Key_Q ),
- tqApp, SLOT(quit()) );
+ tqApp, TQ_SLOT(quit()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( quit, 0, 0 );
diff --git a/tutorial/t14/lcdrange.cpp b/tutorial/t14/lcdrange.cpp
index fb601592..5ce3e37e 100644
--- a/tutorial/t14/lcdrange.cpp
+++ b/tutorial/t14/lcdrange.cpp
@@ -37,10 +37,10 @@ void LCDRange::init()
label = new TQLabel( " ", this, "label" );
label->setAlignment( AlignCenter );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
diff --git a/tutorial/t15/main.cpp b/tutorial/t15/main.cpp
index 9277ce17..6fcbc1e7 100644
--- a/tutorial/t15/main.cpp
+++ b/tutorial/t15/main.cpp
@@ -23,7 +23,7 @@ void WorkerObject::run()
if (!eventLoop) return;
TQTimer *t = new TQTimer(this);
- connect( t, SIGNAL(timeout()), SLOT(timerHandler()) );
+ connect( t, TQ_SIGNAL(timeout()), TQ_SLOT(timerHandler()) );
t->start( 1000, FALSE );
for( int count = 0; count < 5; count++ ) {
@@ -61,8 +61,8 @@ void MainObject::buttonClicked()
WorkerObject x; \
x.threadFriendlyName = y; \
x.moveToThread(&z); \
- TQObject::connect(&x, SIGNAL(displayMessage(TQString,TQString)), &mainobject, SLOT(emitMessage(TQString,TQString))); \
- TQTimer::singleShot(0, &x, SLOT(run()));
+ TQObject::connect(&x, TQ_SIGNAL(displayMessage(TQString,TQString)), &mainobject, TQ_SLOT(emitMessage(TQString,TQString))); \
+ TQTimer::singleShot(0, &x, TQ_SLOT(run()));
int main( int argc, char **argv )
{
@@ -142,7 +142,7 @@ int main( int argc, char **argv )
workerthread19.start();
a.setMainWidget( &hello );
- TQObject::connect(&hello, SIGNAL(clicked()), &mainobject, SLOT(buttonClicked()));
+ TQObject::connect(&hello, TQ_SIGNAL(clicked()), &mainobject, TQ_SLOT(buttonClicked()));
hello.show();
a.exec();
hello.hide();
diff --git a/tutorial/t2/main.cpp b/tutorial/t2/main.cpp
index e7f13ffe..ab32ea98 100644
--- a/tutorial/t2/main.cpp
+++ b/tutorial/t2/main.cpp
@@ -17,7 +17,7 @@ int main( int argc, char **argv )
quit.resize( 75, 30 );
quit.setFont( TQFont( "Times", 18, TQFont::Bold ) );
- TQObject::connect( &quit, SIGNAL(clicked()), &a, SLOT(quit()) );
+ TQObject::connect( &quit, TQ_SIGNAL(clicked()), &a, TQ_SLOT(quit()) );
a.setMainWidget( &quit );
quit.show();
diff --git a/tutorial/t3/main.cpp b/tutorial/t3/main.cpp
index a007cd28..531f6262 100644
--- a/tutorial/t3/main.cpp
+++ b/tutorial/t3/main.cpp
@@ -19,7 +19,7 @@ int main( int argc, char **argv )
TQPushButton quit( "Quit", &box );
quit.setFont( TQFont( "Times", 18, TQFont::Bold ) );
- TQObject::connect( &quit, SIGNAL(clicked()), &a, SLOT(quit()) );
+ TQObject::connect( &quit, TQ_SIGNAL(clicked()), &a, TQ_SLOT(quit()) );
a.setMainWidget( &box );
box.show();
diff --git a/tutorial/t4/main.cpp b/tutorial/t4/main.cpp
index e72550b9..fb89b924 100644
--- a/tutorial/t4/main.cpp
+++ b/tutorial/t4/main.cpp
@@ -26,7 +26,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
quit->setGeometry( 62, 40, 75, 30 );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
}
diff --git a/tutorial/t5/main.cpp b/tutorial/t5/main.cpp
index cbc5c00a..2b9a710d 100644
--- a/tutorial/t5/main.cpp
+++ b/tutorial/t5/main.cpp
@@ -25,7 +25,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
TQLCDNumber *lcd = new TQLCDNumber( 2, this, "lcd" );
@@ -33,7 +33,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)), lcd, SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)), lcd, TQ_SLOT(display(int)) );
}
int main( int argc, char **argv )
diff --git a/tutorial/t6/main.cpp b/tutorial/t6/main.cpp
index 75d1440e..0b17bbea 100644
--- a/tutorial/t6/main.cpp
+++ b/tutorial/t6/main.cpp
@@ -25,7 +25,7 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
TQSlider * slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)), lcd, SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)), lcd, TQ_SLOT(display(int)) );
}
class MyWidget : public TQVBox
@@ -41,7 +41,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
TQGrid *grid = new TQGrid( 4, this );
diff --git a/tutorial/t7/lcdrange.cpp b/tutorial/t7/lcdrange.cpp
index 4bb78ab0..c8a29e0e 100644
--- a/tutorial/t7/lcdrange.cpp
+++ b/tutorial/t7/lcdrange.cpp
@@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
}
int LCDRange::value() const
diff --git a/tutorial/t7/main.cpp b/tutorial/t7/main.cpp
index 773e9111..0a346560 100644
--- a/tutorial/t7/main.cpp
+++ b/tutorial/t7/main.cpp
@@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
TQGrid *grid = new TQGrid( 4, this );
@@ -36,8 +36,8 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
for( int c = 0 ; c < 4 ; c++ ) {
LCDRange* lr = new LCDRange( grid );
if ( previous )
- connect( lr, SIGNAL(valueChanged(int)),
- previous, SLOT(setValue(int)) );
+ connect( lr, TQ_SIGNAL(valueChanged(int)),
+ previous, TQ_SLOT(setValue(int)) );
previous = lr;
}
}
diff --git a/tutorial/t8/lcdrange.cpp b/tutorial/t8/lcdrange.cpp
index cbb60a99..2a56b9ad 100644
--- a/tutorial/t8/lcdrange.cpp
+++ b/tutorial/t8/lcdrange.cpp
@@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
}
diff --git a/tutorial/t8/main.cpp b/tutorial/t8/main.cpp
index 97947afe..0af6d334 100644
--- a/tutorial/t8/main.cpp
+++ b/tutorial/t8/main.cpp
@@ -27,7 +27,7 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( this, "angle" );
angle->setRange( 5, 70 );
@@ -35,10 +35,10 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
CannonField *cannonField
= new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
//2x2, 10 pixel border
diff --git a/tutorial/t9/lcdrange.cpp b/tutorial/t9/lcdrange.cpp
index cbb60a99..2a56b9ad 100644
--- a/tutorial/t9/lcdrange.cpp
+++ b/tutorial/t9/lcdrange.cpp
@@ -16,10 +16,10 @@ LCDRange::LCDRange( TQWidget *parent, const char *name )
slider = new TQSlider( Horizontal, this, "slider" );
slider->setRange( 0, 99 );
slider->setValue( 0 );
- connect( slider, SIGNAL(valueChanged(int)),
- lcd, SLOT(display(int)) );
- connect( slider, SIGNAL(valueChanged(int)),
- SIGNAL(valueChanged(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ lcd, TQ_SLOT(display(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)),
+ TQ_SIGNAL(valueChanged(int)) );
setFocusProxy( slider );
}
diff --git a/tutorial/t9/main.cpp b/tutorial/t9/main.cpp
index ffd6739b..7d81b6cf 100644
--- a/tutorial/t9/main.cpp
+++ b/tutorial/t9/main.cpp
@@ -27,17 +27,17 @@ MyWidget::MyWidget( TQWidget *parent, const char *name )
TQPushButton *quit = new TQPushButton( "&Quit", this, "quit" );
quit->setFont( TQFont( "Times", 18, TQFont::Bold ) );
- connect( quit, SIGNAL(clicked()), tqApp, SLOT(quit()) );
+ connect( quit, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
LCDRange *angle = new LCDRange( this, "angle" );
angle->setRange( 5, 70 );
CannonField *cannonField = new CannonField( this, "cannonField" );
- connect( angle, SIGNAL(valueChanged(int)),
- cannonField, SLOT(setAngle(int)) );
- connect( cannonField, SIGNAL(angleChanged(int)),
- angle, SLOT(setValue(int)) );
+ connect( angle, TQ_SIGNAL(valueChanged(int)),
+ cannonField, TQ_SLOT(setAngle(int)) );
+ connect( cannonField, TQ_SIGNAL(angleChanged(int)),
+ angle, TQ_SLOT(setValue(int)) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
grid->addWidget( quit, 0, 0 );