Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

7 files changed, 34 insertions, 34 deletions

diff --git a/korundum/rubylib/tutorials/p1/p1.rb b/korundum/rubylib/tutorials/p1/p1.rb
index f06c6b3e..a32edb7a 100644
--- a/korundum/rubylib/tutorials/p1/p1.rb
+++ b/korundum/rubylib/tutorials/p1/p1.rb
@@ -5,7 +5,7 @@ require 'Qt'
     hello = TQt::PushButton.new( "Hello world!", nil )

     hello.resize( 100, 30 )

  

-    TQt::Object::connect( hello, SIGNAL('clicked()'), a, SLOT('quit()') )

+    TQt::Object::connect( hello, TQ_SIGNAL('clicked()'), a, TQ_SLOT('quit()') )

  

     a.setMainWidget( hello )

     hello.show()

diff --git a/korundum/rubylib/tutorials/p3/p3.rb b/korundum/rubylib/tutorials/p3/p3.rb
index 67360399..94940d59 100644
--- a/korundum/rubylib/tutorials/p3/p3.rb
+++ b/korundum/rubylib/tutorials/p3/p3.rb
@@ -8,9 +8,9 @@ class MainWindow < KDE::MainWindow
         setCaption("KDE Tutorial - p3")

 

         filemenu = TQt::PopupMenu.new

-        filemenu.insertItem( i18n( "&Open" ), self, SLOT('fileOpen()') )

-        filemenu.insertItem( i18n( "&Save" ), self, SLOT('fileSave()') )

-        filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT('quit()') )

+        filemenu.insertItem( i18n( "&Open" ), self, TQ_SLOT('fileOpen()') )

+        filemenu.insertItem( i18n( "&Save" ), self, TQ_SLOT('fileSave()') )

+        filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT('quit()') )

 		

         about =

             i18n("p3 1.0\n\n" +

diff --git a/korundum/rubylib/tutorials/p4/p4.rb b/korundum/rubylib/tutorials/p4/p4.rb
index 93306c86..8025a585 100644
--- a/korundum/rubylib/tutorials/p4/p4.rb
+++ b/korundum/rubylib/tutorials/p4/p4.rb
@@ -9,7 +9,7 @@ class MainWindow < KDE::MainWindow
         setCaption("KDE Tutorial - p4")

 

         filemenu = TQt::PopupMenu.new

-        filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )

+        filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )

         about =

                 i18n("p4 1.0\n\n" +

                      "(C) 1999-2002 Antonio Larrosa Jimenez\n" +

@@ -34,12 +34,12 @@ class MainWindow < KDE::MainWindow
         @browser = KDE::HTMLPart.new( vbox )

         @browser.openURL( KDE::URL.new(@location.text()) )

  

-        connect( @location , SIGNAL( 'returnPressed()' ),

-                    self, SLOT( 'changeLocation()' ) )

+        connect( @location , TQ_SIGNAL( 'returnPressed()' ),

+                    self, TQ_SLOT( 'changeLocation()' ) )

  

         connect( @browser.browserExtension(),

-                    SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),

-                    self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )

+                    TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),

+                    self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )

 

         setCentralWidget(vbox)

     end                                                                               

diff --git a/korundum/rubylib/tutorials/p5/p5.rb b/korundum/rubylib/tutorials/p5/p5.rb
index 40fb91a5..0325aa37 100644
--- a/korundum/rubylib/tutorials/p5/p5.rb
+++ b/korundum/rubylib/tutorials/p5/p5.rb
@@ -10,7 +10,7 @@ class MainWindow < KDE::MainWindow
         setCaption("KDE Tutorial - p5")

 

         filemenu = TQt::PopupMenu.new

-        filemenu.insertItem( i18n( "&Quit" ), $kapp, SLOT( 'quit()' ) )

+        filemenu.insertItem( i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ) )

         about =

                 i18n("p5 1.0\n\n" +

                      "(C) 1999-2002 Antonio Larrosa Jimenez\n" +

@@ -32,22 +32,22 @@ class MainWindow < KDE::MainWindow
         @location = TQt::LineEdit.new( vbox )

         @location.setText( "http://localhost" )

  

-        connect( @location , SIGNAL( 'returnPressed()' ),

-                    self, SLOT( 'changeLocation()' ) )

+        connect( @location , TQ_SIGNAL( 'returnPressed()' ),

+                    self, TQ_SLOT( 'changeLocation()' ) )

  

         split = TQt::Splitter.new( vbox )

         split.setOpaqueResize()

  

         bookmark = TQt::PushButton.new( i18n("Add to Bookmarks"), split );

  

-        connect( bookmark, SIGNAL( 'clicked()' ), self, SLOT( 'bookLocation()' ) )

+        connect( bookmark, TQ_SIGNAL( 'clicked()' ), self, TQ_SLOT( 'bookLocation()' ) )

  

         @browser = KDE::HTMLPart.new( split )

         @browser.openURL( KDE::URL.new(@location.text()) )

  

         connect( @browser.browserExtension(),

-                    SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),

-                    self, SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )                 

+                    TQ_SIGNAL( 'openURLRequest( const KURL &, const KParts::URLArgs & )' ),

+                    self, TQ_SLOT( 'openURLRequest(const KURL &, const KParts::URLArgs & )' ) )                 

         setCentralWidget(vbox)

     end

  

diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb
index d567c22a..df657186 100644
--- a/korundum/rubylib/tutorials/p7/p7.rb
+++ b/korundum/rubylib/tutorials/p7/p7.rb
@@ -20,8 +20,8 @@ class Browser < KDE::MainWindow
 

         filemenu = TQt::PopupMenu.new

         filemenu.insertItem( i18n( "&Set default page" ), 

-				    self, SLOT( 'fileSetDefaultPage()' ) )

-        filemenu.insertItem(i18n( "&Quit" ), $kapp, SLOT( 'quit()' ))

+				    self, TQ_SLOT( 'fileSetDefaultPage()' ) )

+        filemenu.insertItem(i18n( "&Quit" ), $kapp, TQ_SLOT( 'quit()' ))

         about =

                 i18n("p7 1.0\n\n" +

                      "(C) 1999-2002 Antonio Larrosa Jimenez\n" +

@@ -42,13 +42,13 @@ class Browser < KDE::MainWindow
 

         icons = KDE::IconLoader.new()

         toolbar.insertButton(icons.loadIcon("reload", KDE::Icon::Toolbar), TOOLBAR_ID_ADDBOOKMARK,

-                              SIGNAL('clicked(int)'),self,SLOT('bookLocation()'),true,

+                              TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('bookLocation()'),true,

                               i18n("Add to Bookmarks"))

         toolbar.insertButton(icons.loadIcon("back", KDE::Icon::Toolbar), TOOLBAR_ID_BACK,

-                              SIGNAL('clicked(int)'),self,SLOT('gotoPreviousPage()'),

+                              TQ_SIGNAL('clicked(int)'),self,TQ_SLOT('gotoPreviousPage()'),

                               false, i18n("Back to previous page"))

         toolbar.insertButton(icons.loadIcon("system-log-out", KDE::Icon::Toolbar), TOOLBAR_ID_QUIT,

-                              SIGNAL('clicked(int)'),$kapp,SLOT('quit()'),true,

+                              TQ_SIGNAL('clicked(int)'),$kapp,TQ_SLOT('quit()'),true,

                               i18n("Quit the application"))

         addToolBar(toolbar)

  

@@ -60,8 +60,8 @@ class Browser < KDE::MainWindow
         config.setGroup("Settings")

         @location.text = config.readEntry( "defaultPage", "http://localhost")

  

-        connect( @location , SIGNAL( 'returnPressed()' ),

-                    self, SLOT( 'changeLocation()' ) )

+        connect( @location , TQ_SIGNAL( 'returnPressed()' ),

+                    self, TQ_SLOT( 'changeLocation()' ) )

  

         split = TQt::Splitter.new( vbox )

         split.setOpaqueResize()

@@ -70,8 +70,8 @@ class Browser < KDE::MainWindow
         @browser.openURL( KDE::URL.new(@location.text()) )

  

         connect( @browser.browserExtension(),

-	            SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),

-	            self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )           	     

+	            TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),

+	            self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )           	     

         setCentralWidget(vbox)

     end

   

diff --git a/korundum/rubylib/tutorials/p8/p8.rb b/korundum/rubylib/tutorials/p8/p8.rb
index 1839e697..1f39f0e0 100644
--- a/korundum/rubylib/tutorials/p8/p8.rb
+++ b/korundum/rubylib/tutorials/p8/p8.rb
@@ -8,8 +8,8 @@ class BookMarkList < KDE::ListView
     def initialize()

        super(nil, "Bookmarks")

        addColumn( i18n("My Bookmarks") );

-       connect( self, SIGNAL('clicked(TQListViewItem *)'), 

-		    self, SLOT('setURLInBrowser(TQListViewItem *)'))

+       connect( self, TQ_SIGNAL('clicked(TQListViewItem *)'), 

+		    self, TQ_SLOT('setURLInBrowser(TQListViewItem *)'))

     end

  

     def add( s )

diff --git a/korundum/rubylib/tutorials/p9/p9.rb b/korundum/rubylib/tutorials/p9/p9.rb
index e395e19c..0f54394c 100644
--- a/korundum/rubylib/tutorials/p9/p9.rb
+++ b/korundum/rubylib/tutorials/p9/p9.rb
@@ -13,16 +13,16 @@ class Browser < KDE::MainWindow
         super(nil, name)

         @history = []

 

-        KDE::StdAction.quit(self, SLOT('close()'), actionCollection())

+        KDE::StdAction.quit(self, TQ_SLOT('close()'), actionCollection())

 

         KDE::Action.new(i18n("&Set default page"), "gohome", KDE::Shortcut.new(0), self,

-		    SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")

+		    TQ_SLOT('fileSetDefaultPage()'), actionCollection(), "set_default_page")

 

         KDE::Action.new(i18n("Add to Bookmarks"), "reload", KDE::Shortcut.new(0), self,

-		    SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")

+		    TQ_SLOT('bookLocation()'), actionCollection(), "add_to_bookmarks")

 

         KDE::Action.new(i18n("Back to previous page"), "back", KDE::Shortcut.new(0), self,

-		    SLOT('gotoPreviousPage()'), actionCollection(), "back")

+		    TQ_SLOT('gotoPreviousPage()'), actionCollection(), "back")

 

         actionCollection().action("back").setEnabled(false)

 

@@ -36,15 +36,15 @@ class Browser < KDE::MainWindow
         config.setGroup("Settings")

         @location.text = config.readEntry( "defaultPage", "http://localhost")

 

-        connect( @location , SIGNAL( 'returnPressed()' ),

-                    self, SLOT( 'changeLocation()' ) )

+        connect( @location , TQ_SIGNAL( 'returnPressed()' ),

+                    self, TQ_SLOT( 'changeLocation()' ) )

 

 		@browser = KDE::HTMLPart.new( vbox )

         @browser.openURL( KDE::URL.new(@location.text()) )

 

         connect( @browser.browserExtension(),

-	            SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),

-	            self, SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )           	     

+	            TQ_SIGNAL( 'openURLRequest( const KURL&, const KParts::URLArgs& )' ),

+	            self, TQ_SLOT( 'openURLRequest(const KURL&, const KParts::URLArgs& )' ) )           	     

         setCentralWidget(vbox)

     end