Initial TQt conversion

3 files changed, 44 insertions, 44 deletions

diff --git a/qtruby/rubylib/tutorial/t12/cannon.rb b/qtruby/rubylib/tutorial/t12/cannon.rb
index 1b72cbc0..28afb5c6 100644
--- a/qtruby/rubylib/tutorial/t12/cannon.rb
+++ b/qtruby/rubylib/tutorial/t12/cannon.rb
@@ -1,7 +1,7 @@
 include Math
-require 'Qt'
+retquire 'Qt'
 
-class CannonField < Qt::Widget
+class CannonField < TQt::Widget
     
     signals 'hit()', 'missed()', 'angleChanged(int)', 'forceChanged(int)'
     slots 'setAngle(int)', 'setForce(int)', 'shoot()', 'moveShot()', 'newTarget()'
@@ -11,15 +11,15 @@ class CannonField < Qt::Widget
         @ang = 45
         @f = 0
         @timerCount = 0;
-        @autoShootTimer = Qt::Timer.new( self, 'movement handler' )
+        @autoShootTimer = TQt::Timer.new( self, 'movement handler' )
         connect( @autoShootTimer, SIGNAL('timeout()'),
                  self, SLOT('moveShot()') );
         @shoot_ang = 0
         @shoot_f = 0
-        @target = Qt::Point.new(0, 0)        
-        setPalette( Qt::Palette.new( Qt::Color.new( 250, 250, 200) ) )
+        @target = TQt::Point.new(0, 0)        
+        setPalette( TQt::Palette.new( TQt::Color.new( 250, 250, 200) ) )
         newTarget()
-        @barrelRect = Qt::Rect.new(33, -4, 15, 8)
+        @barrelRect = TQt::Rect.new(33, -4, 15, 8)
     end
 
     def setAngle( degrees )
@@ -62,17 +62,17 @@ class CannonField < Qt::Widget
     def newTarget()
         if @@first_time
             @@first_time = false
-            midnight = Qt::Time.new( 0, 0, 0 )
-            srand( midnight.secsTo(Qt::Time.currentTime()) )
+            midnight = TQt::Time.new( 0, 0, 0 )
+            srand( midnight.secsTo(TQt::Time.currentTime()) )
         end
-        r = Qt::Region.new( targetRect() )
-        @target = Qt::Point.new( 200 + rand(190),
+        r = TQt::Region.new( targetRect() )
+        @target = TQt::Point.new( 200 + rand(190),
                      10  + rand(255) )
-        repaint( r.unite( Qt::Region.new(targetRect()) ) )
+        repaint( r.unite( TQt::Region.new(targetRect()) ) )
     end
     
     def moveShot()
-        r = Qt::Region.new( shotRect() )
+        r = TQt::Region.new( shotRect() )
         @timerCount += 1
 
         shotR = shotRect()
@@ -84,7 +84,7 @@ class CannonField < Qt::Widget
             @autoShootTimer.stop()
             emit missed()
         else
-            r = r.unite( Qt::Region.new( shotR ) )
+            r = r.unite( TQt::Region.new( shotR ) )
         end
         
         repaint( r )
@@ -92,7 +92,7 @@ class CannonField < Qt::Widget
 
     def paintEvent( e )
         updateR = e.rect()
-        p = Qt::Painter.new( self )
+        p = TQt::Painter.new( self )
 
         if updateR.intersects( cannonRect() )
             paintCannon( p )
@@ -109,7 +109,7 @@ class CannonField < Qt::Widget
 
     def paintShot( p )
         p.setBrush( black )
-        p.setPen( Qt::NoPen )
+        p.setPen( TQt::NoPen )
         p.drawRect( shotRect() )
     end
 
@@ -121,14 +121,14 @@ class CannonField < Qt::Widget
     
     def paintCannon(p)                
         cr = cannonRect()
-        pix = Qt::Pixmap.new( cr.size() )
+        pix = TQt::Pixmap.new( cr.size() )
         pix.fill( self, cr.topLeft() )
         
-        tmp = Qt::Painter.new( pix )
+        tmp = TQt::Painter.new( pix )
         tmp.setBrush( blue )
-        tmp.setPen( Qt::NoPen )
+        tmp.setPen( TQt::NoPen )
         tmp.translate( 0, pix.height() - 1 )
-        tmp.drawPie( Qt::Rect.new(-35, -35, 70, 70), 0, 90*16 )
+        tmp.drawPie( TQt::Rect.new(-35, -35, 70, 70), 0, 90*16 )
         tmp.rotate( - @ang )
         tmp.drawRect( @barrelRect )
         tmp.end()
@@ -137,7 +137,7 @@ class CannonField < Qt::Widget
     end
 
     def cannonRect()
-        r = Qt::Rect.new( 0, 0, 50, 50)
+        r = TQt::Rect.new( 0, 0, 50, 50)
         r.moveBottomLeft( rect().bottomLeft() )
         return r
     end
@@ -156,18 +156,18 @@ class CannonField < Qt::Widget
         x         = x0 + velx*time
         y         = y0 + vely*time - 0.5*gravity*time*time
 
-        r = Qt::Rect.new( 0, 0, 6, 6 );
-        r.moveCenter( Qt::Point.new( x.round, height() - 1 - y.round ) )
+        r = TQt::Rect.new( 0, 0, 6, 6 );
+        r.moveCenter( TQt::Point.new( x.round, height() - 1 - y.round ) )
         return r
     end
 
     def targetRect()
-        r = Qt::Rect.new( 0, 0, 20, 10 )
-        r.moveCenter( Qt::Point.new(@target.x(),height() - 1 - @target.y()) );
+        r = TQt::Rect.new( 0, 0, 20, 10 )
+        r.moveCenter( TQt::Point.new(@target.x(),height() - 1 - @target.y()) );
         return r
     end
     
     def sizePolicy()
-        return Qt::SizePolicy.new( Qt::SizePolicy::Expanding, Qt::SizePolicy::Expanding )
+        return TQt::SizePolicy.new( TQt::SizePolicy::Expanding, TQt::SizePolicy::Expanding )
     end
 end
diff --git a/qtruby/rubylib/tutorial/t12/lcdrange.rb b/qtruby/rubylib/tutorial/t12/lcdrange.rb
index ef5c849d..5e1c96ca 100644
--- a/qtruby/rubylib/tutorial/t12/lcdrange.rb
+++ b/qtruby/rubylib/tutorial/t12/lcdrange.rb
@@ -1,6 +1,6 @@
-require 'Qt'
+retquire 'Qt'
 
-class LCDRange < Qt::VBox
+class LCDRange < TQt::VBox
     signals 'valueChanged(int)'
     slots 'setValue(int)', 'setRange(int, int)', 'setText(const char *)'
 
@@ -11,12 +11,12 @@ class LCDRange < Qt::VBox
     end
     
     def init()
-        lcd = Qt::LCDNumber.new(2, self, 'lcd')
-        @slider = Qt::Slider.new(Qt::VBox::Horizontal, self, 'slider')
+        lcd = TQt::LCDNumber.new(2, self, 'lcd')
+        @slider = TQt::Slider.new(TQt::VBox::Horizontal, self, 'slider')
         @slider.setRange(0, 99)
         @slider.setValue(0)
-        @label = Qt::Label.new( ' ', self, 'label'  )
-        @label.setAlignment( Qt::AlignCenter )    
+        @label = TQt::Label.new( ' ', self, 'label'  )
+        @label.setAlignment( TQt::AlignCenter )    
         connect(@slider, SIGNAL('valueChanged(int)'), lcd, SLOT('display(int)'))
         connect(@slider, SIGNAL('valueChanged(int)'), SIGNAL('valueChanged(int)'))
         setFocusProxy(@slider)
diff --git a/qtruby/rubylib/tutorial/t12/t12.rb b/qtruby/rubylib/tutorial/t12/t12.rb
index a02c3a8e..b1427cb2 100755
--- a/qtruby/rubylib/tutorial/t12/t12.rb
+++ b/qtruby/rubylib/tutorial/t12/t12.rb
@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 $VERBOSE = true; $:.unshift File.dirname($0)
 
-require 'Qt'
-require 'lcdrange.rb'
-require 'cannon.rb'
+retquire 'Qt'
+retquire 'lcdrange.rb'
+retquire 'cannon.rb'
 
-class MyWidget < Qt::Widget
+class MyWidget < TQt::Widget
 
     def initialize()
         super
-        quit = Qt::PushButton.new('&Quit', self, 'quit')
-        quit.setFont(Qt::Font.new('Times', 18, Qt::Font::Bold))
+        quit = TQt::PushButton.new('&Quit', self, 'quit')
+        quit.setFont(TQt::Font.new('Times', 18, TQt::Font::Bold))
     
         connect(quit, SIGNAL('clicked()'), $qApp, SLOT('quit()'))
     
@@ -32,22 +32,22 @@ class MyWidget < Qt::Widget
         connect( cannonField, SIGNAL('forceChanged(int)'),
                 force, SLOT('setValue(int)') )
         
-        shoot = Qt::PushButton.new( '&Shoot', self, 'shoot' )
-        shoot.setFont( Qt::Font.new( 'Times', 18, Qt::Font::Bold ) )
+        shoot = TQt::PushButton.new( '&Shoot', self, 'shoot' )
+        shoot.setFont( TQt::Font.new( 'Times', 18, TQt::Font::Bold ) )
 
         connect( shoot, SIGNAL('clicked()'), cannonField, SLOT('shoot()') )
             
-        grid = Qt::GridLayout.new( self, 2, 2, 10 )
+        grid = TQt::GridLayout.new( self, 2, 2, 10 )
         grid.addWidget( quit, 0, 0 )
         grid.addWidget( cannonField, 1, 1 )
         grid.setColStretch( 1, 10 )
 
-        leftBox = Qt::VBoxLayout.new()
+        leftBox = TQt::VBoxLayout.new()
         grid.addLayout( leftBox, 1, 0 )
         leftBox.addWidget( angle )
         leftBox.addWidget( force )
     
-        topBox = Qt::HBoxLayout.new()
+        topBox = TQt::HBoxLayout.new()
         grid.addLayout( topBox, 0, 1 )
         topBox.addWidget( shoot )
         topBox.addStretch( 1 )
@@ -58,8 +58,8 @@ class MyWidget < Qt::Widget
     end
 end    
 
-Qt::Application.setColorSpec( Qt::Application::CustomColor )
-a = Qt::Application.new(ARGV)
+TQt::Application.setColorSpec( TQt::Application::CustomColor )
+a = TQt::Application.new(ARGV)
 
 w = MyWidget.new
 w.setGeometry( 100, 100, 500, 355 )