Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

4 files changed, 11 insertions, 11 deletions

diff --git a/PerlTQt/t/c_qapp.t b/PerlTQt/t/c_qapp.t
index 01d6b39..3515253 100644
--- a/PerlTQt/t/c_qapp.t
+++ b/PerlTQt/t/c_qapp.t
@@ -18,6 +18,6 @@ print +$@ ? "not ok\n" : "ok 2\n";
 
 # one second test of the event loop
 
-TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" );
+TQt::Timer::singleShot( 300, TQt::app(), TQ_SLOT "quit()" );
 
 print TQt::app()->exec ? "not ok\n" : "ok 3\n";
diff --git a/PerlTQt/t/d_sigslot.t b/PerlTQt/t/d_sigslot.t
index acd3c4a..e655f8e 100644
--- a/PerlTQt/t/d_sigslot.t
+++ b/PerlTQt/t/d_sigslot.t
@@ -15,10 +15,10 @@ sub NEW {
      # 1) testing correct subclassing of TQt::Application and this pointer
      print +(ref(this) eq " MyApp")? "ok 1\n" : "not ok\n";
      
-     this->connect(this, TQT_SIGNAL 'bar(int)', TQT_SLOT 'foo(int)');
+     this->connect(this, TQ_SIGNAL 'bar(int)', TQ_SLOT 'foo(int)');
 
      # 3) automatic quitting will test TQt sig to custom slot 
-     this->connect(this, TQT_SIGNAL 'aboutToQuit()', TQT_SLOT 'baz()');
+     this->connect(this, TQ_SIGNAL 'aboutToQuit()', TQ_SLOT 'baz()');
 
      # 2) testing custom sig to custom slot 
      emit bar(3);
@@ -44,6 +44,6 @@ use MyApp;
 $a = 0;
 $a = MyApp(\@ARGV);
 
-TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" );
+TQt::Timer::singleShot( 300, TQt::app(), TQ_SLOT "quit()" );
 
 exit TQt::app()->exec;
diff --git a/PerlTQt/t/e_sigslot_inherit.t b/PerlTQt/t/e_sigslot_inherit.t
index 338a405..f99b1bf 100644
--- a/PerlTQt/t/e_sigslot_inherit.t
+++ b/PerlTQt/t/e_sigslot_inherit.t
@@ -12,8 +12,8 @@ use TQt::signals
 sub NEW
 {
      shift->SUPER::NEW(@_);
-     this->connect(this, TQT_SIGNAL 'bar(int)', TQT_SLOT 'foo(int)');
-     this->connect(this, TQT_SIGNAL 'aboutToQuit()', TQT_SLOT 'baz()');
+     this->connect(this, TQ_SIGNAL 'bar(int)', TQ_SLOT 'foo(int)');
+     this->connect(this, TQ_SIGNAL 'aboutToQuit()', TQ_SLOT 'baz()');
 }
 
 sub foo
@@ -67,6 +67,6 @@ use MySubApp;
 $a = 0;
 $a = MySubApp(\@ARGV);
 
-TQt::Timer::singleShot( 300, TQt::app(), TQT_SLOT "quit()" );
+TQt::Timer::singleShot( 300, TQt::app(), TQ_SLOT "quit()" );
 
 exit TQt::app()->exec;
diff --git a/PerlTQt/t/g_gui.t b/PerlTQt/t/g_gui.t
index f3a7d05..8ef2a0d 100644
--- a/PerlTQt/t/g_gui.t
+++ b/PerlTQt/t/g_gui.t
@@ -70,8 +70,8 @@ sub NEW {
     # insert a checkbox
     state = TQt::CheckBox("E&nable Radiobuttons", $bgrp3);
     state->setChecked(1);
-    # ...and connect its TQT_SIGNAL clicked() with the TQT_SLOT slotChangeGrp3State()
-    this->connect(state, TQT_SIGNAL('clicked()'), TQT_SLOT('slotChangeGrp3State()'));
+    # ...and connect its TQ_SIGNAL clicked() with the TQ_SLOT slotChangeGrp3State()
+    this->connect(state, TQ_SIGNAL('clicked()'), TQ_SLOT('slotChangeGrp3State()'));
 
     # ----------- fourth group
 
@@ -93,7 +93,7 @@ sub NEW {
 }
 
 #
-# TQT_SLOT slotChangeGrp3State()
+# TQ_SLOT slotChangeGrp3State()
 #
 # enables/disables the radiobuttons of the third buttongroup
 #
@@ -121,7 +121,7 @@ $buttonsgroups->setCaption("PerlTQt Test - Please wait");
 $a->setMainWidget($buttonsgroups);
 $buttonsgroups->show;
 
-TQt::Timer::singleShot( 2000, TQt::app(), TQT_SLOT "quit()" );
+TQt::Timer::singleShot( 2000, TQt::app(), TQ_SLOT "quit()" );
 my $r = $a->exec;
 print +$r?"not ok\n" : "ok 1\n";
 exit $r;