Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 301b5380792b7a368488aa485d3bdb3df81e0808)

25 files changed, 76 insertions, 76 deletions

diff --git a/PerlTQt/tutorials/t10/LCDRange.pm b/PerlTQt/tutorials/t10/LCDRange.pm
index ab63af0..dc2c465 100644
--- a/PerlTQt/tutorials/t10/LCDRange.pm
+++ b/PerlTQt/tutorials/t10/LCDRange.pm
@@ -19,8 +19,8 @@ sub NEW {
     slider = TQt::Slider(&Horizontal, this, "slider");
     slider->setRange(0, 99);
     slider->setValue(0);
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 }
diff --git a/PerlTQt/tutorials/t10/t10.pl b/PerlTQt/tutorials/t10/t10.pl
index 7056680..2f9bc28 100644
--- a/PerlTQt/tutorials/t10/t10.pl
+++ b/PerlTQt/tutorials/t10/t10.pl
@@ -16,7 +16,7 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange(this, "angle");
     $angle->setRange(5, 70);
@@ -26,11 +26,11 @@ sub NEW {
 
     my $cannonField = CannonField(this, "cannonField");
 
-    $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect($cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)'));
-    $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($force, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setForce(int)'));
+    $force->connect($cannonField, TQ_SIGNAL('forceChanged(int)'), TQ_SLOT('setValue(int)'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);
diff --git a/PerlTQt/tutorials/t11/CannonField.pm b/PerlTQt/tutorials/t11/CannonField.pm
index 0806f66..a419bf4 100644
--- a/PerlTQt/tutorials/t11/CannonField.pm
+++ b/PerlTQt/tutorials/t11/CannonField.pm
@@ -31,7 +31,7 @@ sub NEW {
     f = 0;
     timerCount = 0;
     autoShootTimer = TQt::Timer(this, "movement handler");
-    this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()'));
+    this->connect(autoShootTimer, TQ_SIGNAL('timeout()'), TQ_SLOT('moveShot()'));
     shoot_ang = 0;
     shoot_f = 0;
     setPalette(TQt::Palette(TQt::Color(250, 250, 200)));
diff --git a/PerlTQt/tutorials/t11/LCDRange.pm b/PerlTQt/tutorials/t11/LCDRange.pm
index ab63af0..dc2c465 100644
--- a/PerlTQt/tutorials/t11/LCDRange.pm
+++ b/PerlTQt/tutorials/t11/LCDRange.pm
@@ -19,8 +19,8 @@ sub NEW {
     slider = TQt::Slider(&Horizontal, this, "slider");
     slider->setRange(0, 99);
     slider->setValue(0);
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 }
diff --git a/PerlTQt/tutorials/t11/t11.pl b/PerlTQt/tutorials/t11/t11.pl
index d493b1e..5d75c60 100644
--- a/PerlTQt/tutorials/t11/t11.pl
+++ b/PerlTQt/tutorials/t11/t11.pl
@@ -16,7 +16,7 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange(this, "angle");
     $angle->setRange(5, 70);
@@ -26,16 +26,16 @@ sub NEW {
 
     my $cannonField = CannonField(this, "cannonField");
 
-    $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect($cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)'));
-    $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($force, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setForce(int)'));
+    $force->connect($cannonField, TQ_SIGNAL('forceChanged(int)'), TQ_SLOT('setValue(int)'));
 
     my $shoot = TQt::PushButton('&Shoot', this, "shoot");
     $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    $cannonField->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('shoot()'));
+    $cannonField->connect($shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('shoot()'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);
diff --git a/PerlTQt/tutorials/t12/CannonField.pm b/PerlTQt/tutorials/t12/CannonField.pm
index 6cc1529..18d6bc5 100644
--- a/PerlTQt/tutorials/t12/CannonField.pm
+++ b/PerlTQt/tutorials/t12/CannonField.pm
@@ -35,7 +35,7 @@ sub NEW {
     f = 0;
     timerCount = 0;
     autoShootTimer = TQt::Timer(this, "movement handler");
-    this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()'));
+    this->connect(autoShootTimer, TQ_SIGNAL('timeout()'), TQ_SLOT('moveShot()'));
     shoot_ang = 0;
     shoot_f = 0;
     target = TQt::Point(0, 0);
diff --git a/PerlTQt/tutorials/t12/LCDRange.pm b/PerlTQt/tutorials/t12/LCDRange.pm
index d3a5166..1802be2 100644
--- a/PerlTQt/tutorials/t12/LCDRange.pm
+++ b/PerlTQt/tutorials/t12/LCDRange.pm
@@ -34,8 +34,8 @@ sub init {
     label = TQt::Label(" ", this, "label");
     label->setAlignment(&AlignCenter);
 
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 }
diff --git a/PerlTQt/tutorials/t12/t12.pl b/PerlTQt/tutorials/t12/t12.pl
index e8072ef..49b5bf0 100644
--- a/PerlTQt/tutorials/t12/t12.pl
+++ b/PerlTQt/tutorials/t12/t12.pl
@@ -16,7 +16,7 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange("ANGLE", this, "angle");
     $angle->setRange(5, 70);
@@ -26,16 +26,16 @@ sub NEW {
 
     my $cannonField = CannonField(this, "cannonField");
 
-    $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect($cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    $cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)'));
-    $force->connect($cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($force, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setForce(int)'));
+    $force->connect($cannonField, TQ_SIGNAL('forceChanged(int)'), TQ_SLOT('setValue(int)'));
 
     my $shoot = TQt::PushButton('&Shoot', this, "shoot");
     $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    $cannonField->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('shoot()'));
+    $cannonField->connect($shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('shoot()'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);
diff --git a/PerlTQt/tutorials/t13/CannonField.pm b/PerlTQt/tutorials/t13/CannonField.pm
index ec220bc..4d42016 100644
--- a/PerlTQt/tutorials/t13/CannonField.pm
+++ b/PerlTQt/tutorials/t13/CannonField.pm
@@ -40,7 +40,7 @@ sub NEW {
     f = 0;
     timerCount = 0;
     autoShootTimer = TQt::Timer(this, "movement handler");
-    this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()'));
+    this->connect(autoShootTimer, TQ_SIGNAL('timeout()'), TQ_SLOT('moveShot()'));
     shoot_ang = 0;
     shoot_f = 0;
     target = TQt::Point(0, 0);
diff --git a/PerlTQt/tutorials/t13/GameBoard.pm b/PerlTQt/tutorials/t13/GameBoard.pm
index 52f5e9b..855a6ee 100644
--- a/PerlTQt/tutorials/t13/GameBoard.pm
+++ b/PerlTQt/tutorials/t13/GameBoard.pm
@@ -22,7 +22,7 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange("ANGLE", this, "angle");
     $angle->setRange(5, 70);
@@ -32,26 +32,26 @@ sub NEW {
 
     cannonField = CannonField(this, "cannonField");
 
-    cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect(cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect(cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)'));
-    $force->connect(cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)'));
+    cannonField->connect($force, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setForce(int)'));
+    $force->connect(cannonField, TQ_SIGNAL('forceChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    this->connect(cannonField, TQT_SIGNAL('hit()'), TQT_SLOT('hit()'));
-    this->connect(cannonField, TQT_SIGNAL('missed()'), TQT_SLOT('missed()'));
+    this->connect(cannonField, TQ_SIGNAL('hit()'), TQ_SLOT('hit()'));
+    this->connect(cannonField, TQ_SIGNAL('missed()'), TQ_SLOT('missed()'));
 
     my $shoot = TQt::PushButton('&Shoot', this, "shoot");
     $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    this->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('fire()'));
+    this->connect($shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()'));
 
-    $shoot->connect(cannonField, TQT_SIGNAL('canShoot(bool)'), TQT_SLOT('setEnabled(bool)'));
+    $shoot->connect(cannonField, TQ_SIGNAL('canShoot(bool)'), TQ_SLOT('setEnabled(bool)'));
 
     my $restart = TQt::PushButton('&New Game', this, "newgame");
     $restart->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    this->connect($restart, TQT_SIGNAL('clicked()'), TQT_SLOT('newGame()'));
+    this->connect($restart, TQ_SIGNAL('clicked()'), TQ_SLOT('newGame()'));
 
     hits = TQt::LCDNumber(2, this, "hits");
     shotsLeft = TQt::LCDNumber(2, this, "shotsleft");
diff --git a/PerlTQt/tutorials/t13/LCDRange.pm b/PerlTQt/tutorials/t13/LCDRange.pm
index 1647e85..47eb510 100644
--- a/PerlTQt/tutorials/t13/LCDRange.pm
+++ b/PerlTQt/tutorials/t13/LCDRange.pm
@@ -34,8 +34,8 @@ sub init {
     label = TQt::Label(" ", this, "label");
     label->setAlignment(&AlignCenter);
 
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 
diff --git a/PerlTQt/tutorials/t14/CannonField.pm b/PerlTQt/tutorials/t14/CannonField.pm
index cbf675d..9d01929 100644
--- a/PerlTQt/tutorials/t14/CannonField.pm
+++ b/PerlTQt/tutorials/t14/CannonField.pm
@@ -43,7 +43,7 @@ sub NEW {
     f = 0;
     timerCount = 0;
     autoShootTimer = TQt::Timer(this, "movement handler");
-    this->connect(autoShootTimer, TQT_SIGNAL('timeout()'), TQT_SLOT('moveShot()'));
+    this->connect(autoShootTimer, TQ_SIGNAL('timeout()'), TQ_SLOT('moveShot()'));
     shoot_ang = 0;
     shoot_f = 0;
     target = TQt::Point(0, 0);
diff --git a/PerlTQt/tutorials/t14/GameBoard.pm b/PerlTQt/tutorials/t14/GameBoard.pm
index a81deef..064521d 100644
--- a/PerlTQt/tutorials/t14/GameBoard.pm
+++ b/PerlTQt/tutorials/t14/GameBoard.pm
@@ -22,7 +22,7 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange("ANGLE", this, "angle");
     $angle->setRange(5, 70);
@@ -35,26 +35,26 @@ sub NEW {
 
     cannonField = CannonField($box, "cannonField");
 
-    cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect(cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect(cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    cannonField->connect($force, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setForce(int)'));
-    $force->connect(cannonField, TQT_SIGNAL('forceChanged(int)'), TQT_SLOT('setValue(int)'));
+    cannonField->connect($force, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setForce(int)'));
+    $force->connect(cannonField, TQ_SIGNAL('forceChanged(int)'), TQ_SLOT('setValue(int)'));
 
-    this->connect(cannonField, TQT_SIGNAL('hit()'), TQT_SLOT('hit()'));
-    this->connect(cannonField, TQT_SIGNAL('missed()'), TQT_SLOT('missed()'));
+    this->connect(cannonField, TQ_SIGNAL('hit()'), TQ_SLOT('hit()'));
+    this->connect(cannonField, TQ_SIGNAL('missed()'), TQ_SLOT('missed()'));
 
     my $shoot = TQt::PushButton('&Shoot', this, "shoot");
     $shoot->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    this->connect($shoot, TQT_SIGNAL('clicked()'), TQT_SLOT('fire()'));
+    this->connect($shoot, TQ_SIGNAL('clicked()'), TQ_SLOT('fire()'));
 
-    $shoot->connect(cannonField, TQT_SIGNAL('canShoot(bool)'), TQT_SLOT('setEnabled(bool)'));
+    $shoot->connect(cannonField, TQ_SIGNAL('canShoot(bool)'), TQ_SLOT('setEnabled(bool)'));
 
     my $restart = TQt::PushButton('&New Game', this, "newgame");
     $restart->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    this->connect($restart, TQT_SIGNAL('clicked()'), TQT_SLOT('newGame()'));
+    this->connect($restart, TQ_SIGNAL('clicked()'), TQ_SLOT('newGame()'));
 
     hits = TQt::LCDNumber(2, this, "hits");
     shotsLeft = TQt::LCDNumber(2, this, "shotsleft");
@@ -63,11 +63,11 @@ sub NEW {
 
     my $accel = TQt::Accel(this);
     $accel->connectItem($accel->insertItem(TQt::KeySequence(int &Key_Enter)),
-			this, TQT_SLOT('fire()'));
+			this, TQ_SLOT('fire()'));
     $accel->connectItem($accel->insertItem(TQt::KeySequence(int &Key_Return)),
-			this, TQT_SLOT('fire()'));
+			this, TQ_SLOT('fire()'));
     $accel->connectItem($accel->insertItem(TQt::KeySequence(int &CTRL+&Key_Q)),
-			TQt::app, TQT_SLOT('quit()'));
+			TQt::app, TQ_SLOT('quit()'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);
diff --git a/PerlTQt/tutorials/t14/LCDRange.pm b/PerlTQt/tutorials/t14/LCDRange.pm
index 1647e85..47eb510 100644
--- a/PerlTQt/tutorials/t14/LCDRange.pm
+++ b/PerlTQt/tutorials/t14/LCDRange.pm
@@ -34,8 +34,8 @@ sub init {
     label = TQt::Label(" ", this, "label");
     label->setAlignment(&AlignCenter);
 
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 
diff --git a/PerlTQt/tutorials/t2/t2.pl b/PerlTQt/tutorials/t2/t2.pl
index c7b76e4..d75ce38 100644
--- a/PerlTQt/tutorials/t2/t2.pl
+++ b/PerlTQt/tutorials/t2/t2.pl
@@ -9,7 +9,7 @@ my $quit = TQt::PushButton("Quit", undef);
 $quit->resize(75, 30);
 $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-$a->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+$a->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
 $a->setMainWidget($quit);
 $quit->show;
diff --git a/PerlTQt/tutorials/t3/t3.pl b/PerlTQt/tutorials/t3/t3.pl
index 24fcdf0..bef3c37 100644
--- a/PerlTQt/tutorials/t3/t3.pl
+++ b/PerlTQt/tutorials/t3/t3.pl
@@ -11,7 +11,7 @@ $box->resize(200, 120);
 my $quit = TQt::PushButton("Quit", $box);
 $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-$a->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+$a->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
 $a->setMainWidget($box);
 $box->show;
diff --git a/PerlTQt/tutorials/t4/t4.pl b/PerlTQt/tutorials/t4/t4.pl
index b4b0b1e..ff280e5 100644
--- a/PerlTQt/tutorials/t4/t4.pl
+++ b/PerlTQt/tutorials/t4/t4.pl
@@ -16,7 +16,7 @@ sub NEW {
     $quit->setGeometry(62, 40, 75, 30);
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 }
 
 package main;
diff --git a/PerlTQt/tutorials/t5/t5.pl b/PerlTQt/tutorials/t5/t5.pl
index 9990c3e..146070c 100644
--- a/PerlTQt/tutorials/t5/t5.pl
+++ b/PerlTQt/tutorials/t5/t5.pl
@@ -12,7 +12,7 @@ sub NEW {
     my $quit = TQt::PushButton("Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $lcd = TQt::LCDNumber(2, this, "lcd");
 
@@ -20,7 +20,7 @@ sub NEW {
     $slider->setRange(0, 99);
     $slider->setValue(0);
 
-    $lcd->connect($slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
+    $lcd->connect($slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
 }
 
 package main;
diff --git a/PerlTQt/tutorials/t6/t6.pl b/PerlTQt/tutorials/t6/t6.pl
index b50c415..feef6d9 100644
--- a/PerlTQt/tutorials/t6/t6.pl
+++ b/PerlTQt/tutorials/t6/t6.pl
@@ -13,7 +13,7 @@ sub NEW {
     my $slider = TQt::Slider(&Horizontal, this, "slider");
     $slider->setRange(0, 99);
     $slider->setValue(0);
-    $lcd->connect($slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
+    $lcd->connect($slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
 }
 
 package MyWidget;
@@ -27,7 +27,7 @@ sub NEW {
     my $quit = TQt::PushButton("Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $grid = TQt::Grid(4, this);
 
diff --git a/PerlTQt/tutorials/t7/LCDRange.pm b/PerlTQt/tutorials/t7/LCDRange.pm
index 9bc48cb..33883e6 100644
--- a/PerlTQt/tutorials/t7/LCDRange.pm
+++ b/PerlTQt/tutorials/t7/LCDRange.pm
@@ -15,8 +15,8 @@ sub NEW {
     slider = $slider;
     slider->setRange(0, 99);
     slider->setValue(0);
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 }
 
 sub value { slider->value }
diff --git a/PerlTQt/tutorials/t7/t7.pl b/PerlTQt/tutorials/t7/t7.pl
index 0d0d0d2..99c6ff2 100644
--- a/PerlTQt/tutorials/t7/t7.pl
+++ b/PerlTQt/tutorials/t7/t7.pl
@@ -14,7 +14,7 @@ sub NEW {
     my $quit = TQt::PushButton("Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $grid = TQt::Grid(4, this);
 
@@ -23,8 +23,8 @@ sub NEW {
 	for my $c (0..3) {
 	    my $lr = LCDRange($grid);
 	    $previous->connect(
-		$lr, TQT_SIGNAL('valueChanged(int)'),
-		TQT_SLOT('setValue(int)')) if $previous;
+		$lr, TQ_SIGNAL('valueChanged(int)'),
+		TQ_SLOT('setValue(int)')) if $previous;
 	    $previous = $lr;
 	}
     }
diff --git a/PerlTQt/tutorials/t8/LCDRange.pm b/PerlTQt/tutorials/t8/LCDRange.pm
index ab63af0..dc2c465 100644
--- a/PerlTQt/tutorials/t8/LCDRange.pm
+++ b/PerlTQt/tutorials/t8/LCDRange.pm
@@ -19,8 +19,8 @@ sub NEW {
     slider = TQt::Slider(&Horizontal, this, "slider");
     slider->setRange(0, 99);
     slider->setValue(0);
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 }
diff --git a/PerlTQt/tutorials/t8/t8.pl b/PerlTQt/tutorials/t8/t8.pl
index 620f912..763c0ed 100644
--- a/PerlTQt/tutorials/t8/t8.pl
+++ b/PerlTQt/tutorials/t8/t8.pl
@@ -16,15 +16,15 @@ sub NEW {
     my $quit = TQt::PushButton("Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange(this, "angle");
     $angle->setRange(5, 70);
 
     my $cannonField = CannonField(this, "cannonField");
 
-    $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect($cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);
diff --git a/PerlTQt/tutorials/t9/LCDRange.pm b/PerlTQt/tutorials/t9/LCDRange.pm
index ab63af0..dc2c465 100644
--- a/PerlTQt/tutorials/t9/LCDRange.pm
+++ b/PerlTQt/tutorials/t9/LCDRange.pm
@@ -19,8 +19,8 @@ sub NEW {
     slider = TQt::Slider(&Horizontal, this, "slider");
     slider->setRange(0, 99);
     slider->setValue(0);
-    $lcd->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('display(int)'));
-    this->connect(slider, TQT_SIGNAL('valueChanged(int)'), TQT_SIGNAL('valueChanged(int)'));
+    $lcd->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('display(int)'));
+    this->connect(slider, TQ_SIGNAL('valueChanged(int)'), TQ_SIGNAL('valueChanged(int)'));
 
     setFocusProxy(slider);
 }
diff --git a/PerlTQt/tutorials/t9/t9.pl b/PerlTQt/tutorials/t9/t9.pl
index 779d859..1efdea0 100644
--- a/PerlTQt/tutorials/t9/t9.pl
+++ b/PerlTQt/tutorials/t9/t9.pl
@@ -16,15 +16,15 @@ sub NEW {
     my $quit = TQt::PushButton("&Quit", this, "quit");
     $quit->setFont(TQt::Font("Times", 18, &TQt::Font::Bold));
 
-    TQt::app->connect($quit, TQT_SIGNAL('clicked()'), TQT_SLOT('quit()'));
+    TQt::app->connect($quit, TQ_SIGNAL('clicked()'), TQ_SLOT('quit()'));
 
     my $angle = LCDRange(this, "angle");
     $angle->setRange(5, 70);
 
     my $cannonField = CannonField(this, "cannonField");
 
-    $cannonField->connect($angle, TQT_SIGNAL('valueChanged(int)'), TQT_SLOT('setAngle(int)'));
-    $angle->connect($cannonField, TQT_SIGNAL('angleChanged(int)'), TQT_SLOT('setValue(int)'));
+    $cannonField->connect($angle, TQ_SIGNAL('valueChanged(int)'), TQ_SLOT('setAngle(int)'));
+    $angle->connect($cannonField, TQ_SIGNAL('angleChanged(int)'), TQ_SLOT('setValue(int)'));
 
     my $grid = TQt::GridLayout(this, 2, 2, 10);
     $grid->addWidget($quit, 0, 0);