Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 59bd2f6..ca6bc80 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -118,12 +118,12 @@ EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
     m_doc->attachEditView(this);
 
     TQObject::connect
-    (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-     this, TQT_SLOT(update()));
+    (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+     this, TQ_SLOT(update()));
 
     TQObject::connect
-    (getCommandHistory(), TQT_SIGNAL(commandExecuted()),
-     this, TQT_SLOT(slotTestClipboard()));
+    (getCommandHistory(), TQ_SIGNAL(commandExecuted()),
+     this, TQ_SLOT(slotTestClipboard()));
 
     // create accelerators
     //
@@ -156,33 +156,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
 
     // Actions all edit views will have
 
-    KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()),
+    KStdAction::showToolbar(this, TQ_SLOT(slotToggleToolBar()),
                             actionCollection(), "options_show_toolbar");
 
-    KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()),
+    KStdAction::showStatusbar(this, TQ_SLOT(slotToggleStatusBar()),
                               actionCollection(), "options_show_statusbar");
 
     KStdAction::preferences(this,
-                            TQT_SLOT(slotConfigure()),
+                            TQ_SLOT(slotConfigure()),
                             actionCollection());
 
     KStdAction::keyBindings(this,
-                            TQT_SLOT(slotEditKeys()),
+                            TQ_SLOT(slotEditKeys()),
                             actionCollection());
 
     KStdAction::configureToolbars(this,
-                                  TQT_SLOT(slotEditToolbars()),
+                                  TQ_SLOT(slotEditToolbars()),
                                   actionCollection());
 
 
     // File menu
-    KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection());
-    KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection());
+    KStdAction::save (this, TQ_SIGNAL(saveFile()), actionCollection());
+    KStdAction::close(this, TQ_SLOT(slotCloseWindow()), actionCollection());
 
     if (haveClipboard) {
-        KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection());
-        KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection());
-        KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection());
+        KStdAction::cut (this, TQ_SLOT(slotEditCut()), actionCollection());
+        KStdAction::copy (this, TQ_SLOT(slotEditCopy()), actionCollection());
+        KStdAction::paste (this, TQ_SLOT(slotEditPaste()), actionCollection());
     }
 
     new TDEToolBarPopupAction(i18n("Und&o"),
@@ -202,33 +202,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
     TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png");
     TQIconSet icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in Matri&x Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInMatrix()), actionCollection(),
+                TQ_SLOT(slotOpenInMatrix()), actionCollection(),
                 "open_in_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
+                TQ_SLOT(slotOpenInPercussionMatrix()), actionCollection(),
                 "open_in_percussion_matrix");
 
     pixmap.load(pixmapDir + "/toolbar/notation.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Notation Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInNotation()), actionCollection(),
+                TQ_SLOT(slotOpenInNotation()), actionCollection(),
                 "open_in_notation");
 
     pixmap.load(pixmapDir + "/toolbar/eventlist.png");
     icon = TQIconSet(pixmap);
     new TDEAction(i18n("Open in &Event List Editor"), icon, 0, this,
-                TQT_SLOT(slotOpenInEventList()), actionCollection(),
+                TQ_SLOT(slotOpenInEventList()), actionCollection(),
                 "open_in_event_list");
 
     new TDEAction(i18n("Set Segment Start Time..."), 0, this,
-                TQT_SLOT(slotSetSegmentStartTime()), actionCollection(),
+                TQ_SLOT(slotSetSegmentStartTime()), actionCollection(),
                 "set_segment_start");
 
     new TDEAction(i18n("Set Segment Duration..."), 0, this,
-                TQT_SLOT(slotSetSegmentDuration()), actionCollection(),
+                TQ_SLOT(slotSetSegmentDuration()), actionCollection(),
                 "set_segment_duration");
 
     // add undo and redo to edit menu and toolbar
@@ -254,8 +254,8 @@ void EditViewBase::slotEditToolbars()
 {
     KEditToolbar dlg(actionCollection(), getRCFileName());
 
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
-            TQT_SLOT(slotUpdateToolbars()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+            TQ_SLOT(slotUpdateToolbars()));
 
     dlg.exec();
 }