Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 26 insertions, 26 deletions

diff --git a/korundum/rubylib/templates/basic/menuapp1.rb b/korundum/rubylib/templates/basic/menuapp1.rb
index 69902534..6037376b 100644
--- a/korundum/rubylib/templates/basic/menuapp1.rb
+++ b/korundum/rubylib/templates/basic/menuapp1.rb
@@ -71,31 +71,31 @@ class MainWin < KDE::MainWindow
         fileMenu = TQt::PopupMenu.new(self)
         
 		# "File" menu items
-        fileMenu.insertItem(i18n("New"), self, SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt()))
-        fileMenu.insertItem(i18n("Open"), self, SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt()))
+        fileMenu.insertItem(i18n("New"), self, TQ_SLOT('slotNew()'), TQt::KeySequence.new(KDE::StdAccel.openNew().keyCodeQt()))
+        fileMenu.insertItem(i18n("Open"), self, TQ_SLOT('slotOpen()'), TQt::KeySequence.new(KDE::StdAccel.open().keyCodeQt()))
         fileMenu.insertSeparator()
-        fileMenu.insertItem(i18n("Save"), self, SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt()))
-        fileMenu.insertItem(i18n("SaveAs"), self, SLOT('slotSaveAs()'))
+        fileMenu.insertItem(i18n("Save"), self, TQ_SLOT('slotSave()'), TQt::KeySequence.new(KDE::StdAccel.save().keyCodeQt()))
+        fileMenu.insertItem(i18n("SaveAs"), self, TQ_SLOT('slotSaveAs()'))
         fileMenu.insertSeparator()
-        fileMenu.insertItem(i18n("Print"), self, SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt()))
+        fileMenu.insertItem(i18n("Print"), self, TQ_SLOT('slotPrint()'), TQt::KeySequence.new(KDE::StdAccel.print().keyCodeQt()))
         fileMenu.insertSeparator()
-        fileMenu.insertItem(i18n("&Quit"), self, SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt()))
+        fileMenu.insertItem(i18n("&Quit"), self, TQ_SLOT('slotQuit()'), TQt::KeySequence.new(KDE::StdAccel.quit().keyCodeQt()))
 
         menuBar().insertItem(i18n("&File"), fileMenu)
 
         editMenu = TQt::PopupMenu.new(self)
 
         # "Edit" menu items
-        editMenu.insertItem(i18n("Undo"), self, SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt()))
-        editMenu.insertItem(i18n("Redo"), self, SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt()))
+        editMenu.insertItem(i18n("Undo"), self, TQ_SLOT('slotUndo()'), TQt::KeySequence.new(KDE::StdAccel.undo().keyCodeQt()))
+        editMenu.insertItem(i18n("Redo"), self, TQ_SLOT('slotRedo()'), TQt::KeySequence.new(KDE::StdAccel.redo().keyCodeQt()))
         editMenu.insertSeparator()
-        editMenu.insertItem(i18n("Cut"), self, SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt()))
-        editMenu.insertItem(i18n("Copy"), self, SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt()))
-        editMenu.insertItem(i18n("Paste"), self, SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt()))
+        editMenu.insertItem(i18n("Cut"), self, TQ_SLOT('slotCut()'), TQt::KeySequence.new(KDE::StdAccel.cut().keyCodeQt()))
+        editMenu.insertItem(i18n("Copy"), self, TQ_SLOT('slotCopy()'), TQt::KeySequence.new(KDE::StdAccel.copy().keyCodeQt()))
+        editMenu.insertItem(i18n("Paste"), self, TQ_SLOT('slotPaste()'), TQt::KeySequence.new(KDE::StdAccel.paste().keyCodeQt()))
         editMenu.insertSeparator()
-        editMenu.insertItem(i18n("Find"), self, SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt()))
-        editMenu.insertItem(i18n("Find Next"), self, SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt()))
-        editMenu.insertItem(i18n("Replace"), self, SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt()))
+        editMenu.insertItem(i18n("Find"), self, TQ_SLOT('slotFind()'), TQt::KeySequence.new(KDE::StdAccel.find().keyCodeQt()))
+        editMenu.insertItem(i18n("Find Next"), self, TQ_SLOT('slotFindNext()'), TQt::KeySequence.new(KDE::StdAccel.findNext().keyCodeQt()))
+        editMenu.insertItem(i18n("Replace"), self, TQ_SLOT('slotReplace()'), TQt::KeySequence.new(KDE::StdAccel.replace().keyCodeQt()))
 
         menuBar().insertItem(i18n("&Edit"), editMenu)
 
@@ -106,18 +106,18 @@ class MainWin < KDE::MainWindow
     def initToolBar()
         icons = KDE::IconLoader.new()
 
-        toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, SIGNAL("clicked(int)"), 
-                                               self, SLOT('slotNew()'), true, "New")
-        toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, SIGNAL("clicked(int)"),
-                                               self, SLOT('slotOpen()'), true, "Open")
-        toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, SIGNAL("clicked(int)"),
-                                               self, SLOT('slotSave()'), true, "Save")
-        toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, SIGNAL("clicked(int)"),
-                                               self, SLOT('slotCut()'), true, "Cut")
-        toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, SIGNAL("clicked(int)"),
-                                               self, SLOT('slotCopy()'), true, "Copy")
-        toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, SIGNAL("clicked(int)"),
-                                               self, SLOT('slotPaste()'), true, "Paste")
+        toolBar().insertButton(icons.loadIcon("filenew", KDE::Icon::Toolbar), TOOLBAR_NEW, TQ_SIGNAL("clicked(int)"), 
+                                               self, TQ_SLOT('slotNew()'), true, "New")
+        toolBar().insertButton(icons.loadIcon("fileopen", KDE::Icon::Toolbar), TOOLBAR_OPEN, TQ_SIGNAL("clicked(int)"),
+                                               self, TQ_SLOT('slotOpen()'), true, "Open")
+        toolBar().insertButton(icons.loadIcon("filesave", KDE::Icon::Toolbar), TOOLBAR_SAVE, TQ_SIGNAL("clicked(int)"),
+                                               self, TQ_SLOT('slotSave()'), true, "Save")
+        toolBar().insertButton(icons.loadIcon("editcut", KDE::Icon::Toolbar), TOOLBAR_CUT, TQ_SIGNAL("clicked(int)"),
+                                               self, TQ_SLOT('slotCut()'), true, "Cut")
+        toolBar().insertButton(icons.loadIcon("editcopy", KDE::Icon::Toolbar), TOOLBAR_COPY, TQ_SIGNAL("clicked(int)"),
+                                               self, TQ_SLOT('slotCopy()'), true, "Copy")
+        toolBar().insertButton(icons.loadIcon("editpaste", KDE::Icon::Toolbar), TOOLBAR_PASTE, TQ_SIGNAL("clicked(int)"),
+                                               self, TQ_SLOT('slotPaste()'), true, "Paste")
 	end
 
     def initStatusBar()