Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 14 insertions, 14 deletions

diff --git a/qtruby/rubylib/tutorial/t11/cannon.rb b/qtruby/rubylib/tutorial/t11/cannon.rb
index 89a2ca24..8429159b 100644
--- a/qtruby/rubylib/tutorial/t11/cannon.rb
+++ b/qtruby/rubylib/tutorial/t11/cannon.rb
@@ -12,8 +12,8 @@ class CannonField < TQt::Widget
         @f = 0
         @timerCount = 0;
         @autoShootTimer = TQt::Timer.new( self, 'movement handler' )
-        connect( @autoShootTimer, SIGNAL('timeout()'),
-                 self, SLOT('moveShot()') );
+        connect( @autoShootTimer, TQ_SIGNAL('timeout()'),
+                 self, TQ_SLOT('moveShot()') );
         @shoot_ang = 0
         @shoot_f = 0        
         setPalette( TQt::Palette.new( TQt::Color.new( 250, 250, 200) ) )
diff --git a/qtruby/rubylib/tutorial/t11/lcdrange.rb b/qtruby/rubylib/tutorial/t11/lcdrange.rb
index 85ed3c0b..98e80fbd 100644
--- a/qtruby/rubylib/tutorial/t11/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t11/lcdrange.rb
@@ -10,8 +10,8 @@ class LCDRange < TQt::VBox
         @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, '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)
     end
 
diff --git a/qtruby/rubylib/tutorial/t11/t11.rb b/qtruby/rubylib/tutorial/t11/t11.rb
index 4b400026..d7ed74c9 100755
--- a/qtruby/rubylib/tutorial/t11/t11.rb
+++ b/qtruby/rubylib/tutorial/t11/t11.rb
@@ -11,7 +11,7 @@ class MyWidget < TQt::Widget
         quit = TQt::PushButton.new('Quit', self, 'quit')
         quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold))
     
-        connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
+        connect(quit, TQ_SIGNAL('clicked()'), $qApp, TQ_SLOT('quit()'))
     
         angle = LCDRange.new( self, 'angle' )
         angle.setRange( 5, 70 )
@@ -21,20 +21,20 @@ class MyWidget < TQt::Widget
         
         cannonField = CannonField.new( self, '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)') )
         
         shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' )
         shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) )
 
-        connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') )
+        connect( shoot, TQ_SIGNAL('clicked()'), cannonField, TQ_SLOT('shoot()') )
             
         grid = TQt::GridLayout.new( self, 2, 2, 10 )
         grid.addWidget( quit, 0, 0 )