Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 32 insertions, 32 deletions

diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index aab0b9d..13a97cf 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -73,40 +73,40 @@ MultiViewCommandHistory::attachView(TDEActionCollection *collection)
     TDEToolBarPopupAction *undo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Undo)));
 
     if (undo) {
-        connect(undo, TQT_SIGNAL(activated()),
-                this, TQT_SLOT(slotUndo()));
+        connect(undo, TQ_SIGNAL(activated()),
+                this, TQ_SLOT(slotUndo()));
 
         connect
         (undo->popupMenu(),
-         TQT_SIGNAL(aboutToShow()),
+         TQ_SIGNAL(aboutToShow()),
          this,
-         TQT_SLOT(slotUndoAboutToShow()));
+         TQ_SLOT(slotUndoAboutToShow()));
 
         connect
         (undo->popupMenu(),
-         TQT_SIGNAL(activated(int)),
+         TQ_SIGNAL(activated(int)),
          this,
-         TQT_SLOT(slotUndoActivated(int)));
+         TQ_SLOT(slotUndoActivated(int)));
     }
 
     TDEToolBarPopupAction *redo = dynamic_cast<TDEToolBarPopupAction*>(collection->action(KStdAction::stdName(KStdAction::Redo)));
 
     if (redo) {
 
-        connect(redo, TQT_SIGNAL(activated()),
-                this, TQT_SLOT(slotRedo()));
+        connect(redo, TQ_SIGNAL(activated()),
+                this, TQ_SLOT(slotRedo()));
 
         connect
         (redo->popupMenu(),
-         TQT_SIGNAL(aboutToShow()),
+         TQ_SIGNAL(aboutToShow()),
          this,
-         TQT_SLOT(slotRedoAboutToShow()));
+         TQ_SLOT(slotRedoAboutToShow()));
 
         connect
         (redo->popupMenu(),
-         TQT_SIGNAL(activated(int)),
+         TQ_SIGNAL(activated(int)),
          this,
-         TQT_SLOT(slotRedoActivated(int)));
+         TQ_SLOT(slotRedoActivated(int)));
     }
 
     m_views.insert(collection);
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 18c80d0..5d11638 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -135,11 +135,11 @@ RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *parent,
     m_viewList.setAutoDelete(false);
     m_editViewList.setAutoDelete(false);
 
-    connect(m_commandHistory, TQT_SIGNAL(commandExecuted(KCommand *)),
-            this, TQT_SLOT(slotDocumentModified()));
+    connect(m_commandHistory, TQ_SIGNAL(commandExecuted(KCommand *)),
+            this, TQ_SLOT(slotDocumentModified()));
 
-    connect(m_commandHistory, TQT_SIGNAL(documentRestored()),
-            this, TQT_SLOT(slotDocumentRestored()));
+    connect(m_commandHistory, TQ_SIGNAL(documentRestored()),
+            this, TQ_SLOT(slotDocumentRestored()));
 
     // autoload a new document
     if (!skipAutoload)
@@ -584,8 +584,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
                                100,
                                (TQWidget*)parent());
 
-    connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
-            &m_audioFileManager, TQT_SLOT(slotStopPreview()));
+    connect(&progressDlg, TQ_SIGNAL(cancelClicked()),
+            &m_audioFileManager, TQ_SLOT(slotStopPreview()));
 
     progressDlg.setMinimumDuration(500);
     progressDlg.setAutoReset(true); // we're re-using it for the preview generation
@@ -686,8 +686,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
     // reuse the previous one
     progressDlg.setLabel(i18n("Generating audio previews..."));
 
-    connect(&m_audioFileManager, TQT_SIGNAL(setProgress(int)),
-            progressDlg.progressBar(), TQT_SLOT(setValue(int)));
+    connect(&m_audioFileManager, TQ_SIGNAL(setProgress(int)),
+            progressDlg.progressBar(), TQ_SLOT(setValue(int)));
     try {
         // generate any audio previews after loading the files
         m_audioFileManager.generatePreviews();
@@ -1575,14 +1575,14 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
     RoseXmlHandler handler(this, elementCount, permanent);
 
     if (progress) {
-        connect(&handler, TQT_SIGNAL(setProgress(int)),
-                progress->progressBar(), TQT_SLOT(setValue(int)));
-        connect(&handler, TQT_SIGNAL(setOperationName(TQString)),
-                progress, TQT_SLOT(slotSetOperationName(TQString)));
-        connect(&handler, TQT_SIGNAL(incrementProgress(int)),
-                progress->progressBar(), TQT_SLOT(advance(int)));
-        connect(progress, TQT_SIGNAL(cancelClicked()),
-                &handler, TQT_SLOT(slotCancel()));
+        connect(&handler, TQ_SIGNAL(setProgress(int)),
+                progress->progressBar(), TQ_SLOT(setValue(int)));
+        connect(&handler, TQ_SIGNAL(setOperationName(TQString)),
+                progress, TQ_SLOT(slotSetOperationName(TQString)));
+        connect(&handler, TQ_SIGNAL(incrementProgress(int)),
+                progress->progressBar(), TQ_SLOT(advance(int)));
+        connect(progress, TQ_SIGNAL(cancelClicked()),
+                &handler, TQ_SLOT(slotCancel()));
     }
 
     TQXmlInputSource source;
@@ -2789,11 +2789,11 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
     progressDlg->setAutoReset(false);
     progressDlg->show();
 
-    connect(progressDlg, TQT_SIGNAL(cancelClicked()),
-            &m_audioFileManager, TQT_SLOT(slotStopPreview()));
+    connect(progressDlg, TQ_SIGNAL(cancelClicked()),
+            &m_audioFileManager, TQ_SLOT(slotStopPreview()));
 
-    connect(&m_audioFileManager, TQT_SIGNAL(setProgress(int)),
-            progressDlg->progressBar(), TQT_SLOT(setValue(int)));
+    connect(&m_audioFileManager, TQ_SIGNAL(setProgress(int)),
+            progressDlg->progressBar(), TQ_SLOT(setValue(int)));
 
     try {
         m_audioFileManager.generatePreview(newAudioFile->getId());