Rename a number of old tq methods that are no longer tq specific

10 files changed, 176 insertions, 176 deletions

diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index 263397e..0168ae6 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -101,7 +101,7 @@ void RosegardenApplication::sfxLoadExited(KProcess *proc)
         config()->setGroup(configGroup);
 
         KMessageBox::error(mainWidget(),
-                           i18n("Failed to load soundfont %1").tqarg(soundFontPath));
+                           i18n("Failed to load soundfont %1").arg(soundFontPath));
     } else {
         RG_DEBUG << "RosegardenApplication::sfxLoadExited() : sfxload exited normally\n";
     }
@@ -114,7 +114,7 @@ void RosegardenApplication::slotSetStatusMessage(TQString msg)
     if (mainWindow) {
         if (msg.isEmpty())
             msg = KTmpStatusMsg::getDefaultMsg();
-        mainWindow->statusBar()->changeItem(TQString("  %1").tqarg(msg), KTmpStatusMsg::getDefaultId());
+        mainWindow->statusBar()->changeItem(TQString("  %1").arg(msg), KTmpStatusMsg::getDefaultId());
     }
 
 }
diff --git a/src/gui/application/RosegardenDCOP.h b/src/gui/application/RosegardenDCOP.h
index e82edbf..749c79b 100644
--- a/src/gui/application/RosegardenDCOP.h
+++ b/src/gui/application/RosegardenDCOP.h
@@ -44,7 +44,7 @@ typedef enum
      STARTING_TO_RECORD,
      RECORDING_ARMED,                   // gui only state
      TQUIT
-} TransporttqStatus;
+} TransportStatus;
 
 
 #endif // _ROSEGARDEN_DCOP_H_
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 268affe..c2f24e6 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -220,7 +220,7 @@
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqvaluevector.h>
 #include <tqwidget.h>
@@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
         // problems.  This warning has to happen early, in case it
         // affects the ability to load plugins etc from a file on the
         // command line.
-        m_seqManager->checkSoundDrivertqStatus(true);
+        m_seqManager->checkSoundDriverStatus(true);
     }
 
     if (m_view) {
@@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
                 m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
     }
 
-    if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) {
+    if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
         slotStateChanged("got_audio", true);
     } else {
         slotStateChanged("got_audio", false);
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
             TQT_TQOBJECT(this), TQT_SLOT(slotDocumentDevicesResyncd()));
 
     m_doc->syncDevices();
-    m_doc->clearModifiedtqStatus();
+    m_doc->clearModifiedStatus();
 
     if (newDocument->getStudio().haveMidiDevices()) {
         stateChanged("got_midi_devices");
@@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
 
     emit documentChanged(m_doc);
 
-    m_doc->clearModifiedtqStatus(); // because it's set as modified by the various
+    m_doc->clearModifiedStatus(); // because it's set as modified by the various
     // init operations
     // TODO: this sucks, have to sort it out somehow.
 
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
 
     // Stop if playing
     //
-    if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING)
         slotStop();
 
     slotEnableTransport(false);
@@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
             newDoc->setAbsFilePath(info.absFilePath());
             newDoc->setTitle(info.fileName());
         } else {
-            newDoc->clearModifiedtqStatus();
+            newDoc->clearModifiedStatus();
         }
     } else {
         delete newDoc;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg).ascii()));
+                                              .arg(tempname).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname).ascii()));
+                                              .arg(tempname).ascii()));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg).ascii()));
+                                              .arg(docFilePath).arg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath).ascii()));
+                                              .arg(docFilePath).ascii()));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg).ascii()));
+                                          .arg(newName).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName).ascii()));
+                                          .arg(newName).ascii()));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition()
 
     //    std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl;
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
 
         MappedComposition mC;
         if (mapper->getRecordedEvents(mC) > 0) {
@@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t)
     //    std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl;
 
     if (m_seqManager) {
-	    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-	            m_seqManager->getTransporttqStatus() == RECORDING ) {
+	    if ( m_seqManager->getTransportStatus() == PLAYING ||
+	            m_seqManager->getTransportStatus() == RECORDING ) {
 	        if (t > comp.getEndMarker()) {
-	            if (m_seqManager->getTransporttqStatus() == PLAYING) {
+	            if (m_seqManager->getTransportStatus() == PLAYING) {
 	
 	                slotStop();
 	                t = comp.getEndMarker();
@@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t)
 
 void RosegardenGUIApp::slotRefreshTimeDisplay()
 {
-    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-            m_seqManager->getTransporttqStatus() == RECORDING ) {
+    if ( m_seqManager->getTransportStatus() == PLAYING ||
+            m_seqManager->getTransportStatus() == RECORDING ) {
         return ; // it'll be refreshed in a moment anyway
     }
     slotSetPointerPosition(m_doc->getComposition().getPosition());
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester()
     }
 
 #ifdef HAVE_LIBJACK
-    if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) {
+    if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) {
 
         m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing);
 
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
     if (isSequencerRunning()) {
         RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n";
-        if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+        if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
         return true;
     }
 
@@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
         << "existing DCOP registered sequencer found\n";
 
         if (useExisting) {
-            if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+            if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
             m_sequencerProcess = (KProcess*)SequencerExternal;
             return true;
         }
@@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
             try {
                 //                 if (m_seqManager) {
                 //                     RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n";
-                //                     m_seqManager->checkSoundDrivertqStatus();
+                //                     m_seqManager->checkSoundDriverStatus();
                 //                 }
 
                 stateChanged("sequencer_running");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome()
 {
     Composition &comp = m_doc->getComposition();
 
-    if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD ||
-            m_seqManager->getTransporttqStatus() == RECORDING ||
-            m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD ||
+            m_seqManager->getTransportStatus() == RECORDING ||
+            m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         if (comp.useRecordMetronome())
             comp.setRecordMetronome(false);
         else
@@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->rewindToBeginning();
@@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->fastForwardToEnd();
@@ -5213,18 +5213,18 @@ void
 RosegardenGUIApp::slotSetPlayPosition(timeT time)
 {
     RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl;
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_doc->slotSetPointerPosition(time);
 
-    if (m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager->getTransportStatus() == PLAYING)
         return ;
 
     slotPlay();
 }
 
-void RosegardenGUIApp::notifySequencertqStatus(int status)
+void RosegardenGUIApp::notifySequencerStatus(int status)
 {
     stateChanged("not_playing",
                  (status == PLAYING ||
@@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status)
                  KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
 
     if (m_seqManager)
-        m_seqManager->setTransporttqStatus((TransporttqStatus) status);
+        m_seqManager->setTransportStatus((TransportStatus) status);
 }
 
 void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC)
@@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord()
             return ;
     }
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
         slotStop();
         return ;
-    } else if (m_seqManager->getTransporttqStatus() == PLAYING) {
+    } else if (m_seqManager->getTransportStatus() == PLAYING) {
         slotToggleRecord();
         return ;
     }
@@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay()
     // slotRecord ensures we don't toggle the recording state in
     // SequenceManager)
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         slotRecord();
         return ;
     }
@@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
     if (m_seqManager)
         m_seqManager->rewind();
@@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     if (m_seqManager)
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager()
     connect(TQT_TQOBJECT(this), TQT_SIGNAL(documentAboutToChange()),
             m_audioManagerDialog, TQT_SLOT(close()));
 
-    m_audioManagerDialog->setAudioSubsystemtqStatus(
-        m_seqManager->getSoundDrivertqStatus() & AUDIO_OK);
+    m_audioManagerDialog->setAudioSubsystemStatus(
+        m_seqManager->getSoundDriverStatus() & AUDIO_OK);
 
     plugAccelerators(m_audioManagerDialog,
                      m_audioManagerDialog->getAccelerators());
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7753,10 +7753,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg).ascii()));
+                                          .arg(autoloadFile).arg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile).ascii()));
+                                          .arg(autoloadFile).ascii()));
 
     }
 }
@@ -7808,7 +7808,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -7942,8 +7942,8 @@ void
 RosegardenGUIApp::slotAutoSave()
 {
     if (!m_seqManager ||
-        m_seqManager->getTransporttqStatus() == PLAYING ||
-        m_seqManager->getTransporttqStatus() == RECORDING)
+        m_seqManager->getTransportStatus() == PLAYING ||
+        m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     KConfig* config = kapp->config();
@@ -8044,7 +8044,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 0b6e768..9fea55c 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -220,7 +220,7 @@
 #include <tqslider.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqvaluevector.h>
 #include <tqwidget.h>
@@ -437,7 +437,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
         // problems.  This warning has to happen early, in case it
         // affects the ability to load plugins etc from a file on the
         // command line.
-        m_seqManager->checkSoundDrivertqStatus(true);
+        m_seqManager->checkSoundDriverStatus(true);
     }
 
     if (m_view) {
@@ -445,7 +445,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
                 m_view, TQT_SLOT(slotControllerDeviceEventReceived(MappedEvent *)));
     }
 
-    if (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK) {
+    if (m_seqManager->getSoundDriverStatus() & AUDIO_OK) {
         slotStateChanged("got_audio", true);
     } else {
         slotStateChanged("got_audio", false);
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
     }
 
     // zoom labels
-    TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
-    TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+    TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+    TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
 
     m_zoomSlider = new ZoomSlider<double>
                    (zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1631,7 +1631,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
             this, TQT_SLOT(slotDocumentDevicesResyncd()));
 
     m_doc->syncDevices();
-    m_doc->clearModifiedtqStatus();
+    m_doc->clearModifiedStatus();
 
     if (newDocument->getStudio().haveMidiDevices()) {
         stateChanged("got_midi_devices");
@@ -1658,7 +1658,7 @@ void RosegardenGUIApp::setDocument(RosegardenGUIDoc* newDocument)
 
     emit documentChanged(m_doc);
 
-    m_doc->clearModifiedtqStatus(); // because it's set as modified by the various
+    m_doc->clearModifiedStatus(); // because it's set as modified by the various
     // init operations
     // TODO: this sucks, have to sort it out somehow.
 
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!info.exists()) {
         // can happen with command-line arg, so...
         KStartupLogo::hideIfStillThere();
-        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
         return 0;
     }
 
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
     if (!file.open(IO_ReadOnly)) {
         KStartupLogo::hideIfStillThere();
         TQString errStr =
-            i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+            i18n("You do not have read permission for \"%1\"").arg(filePath);
 
         KMessageBox::sorry(this, errStr);
         return 0;
@@ -1739,7 +1739,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
 
     // Stop if playing
     //
-    if (m_seqManager && m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager && m_seqManager->getTransportStatus() == PLAYING)
         slotStop();
 
     slotEnableTransport(false);
@@ -1834,7 +1834,7 @@ RosegardenGUIApp::createDocumentFromRGFile(TQString filePath)
             newDoc->setAbsFilePath(info.absFilePath());
             newDoc->setTitle(info.fileName());
         } else {
-            newDoc->clearModifiedtqStatus();
+            newDoc->clearModifiedStatus();
         }
     } else {
         delete newDoc;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
 
         unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
 
-        config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
-        config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
-        config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
-        config->writeEntry(TQString("URL_%1").tqarg(n),
+        config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+        config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+        config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+        config->writeEntry(TQString("URL_%1").arg(n),
                            KGlobal::dirs()->findResource("appdata", "examples/"));
 
-        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+        RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
 
         config->writeEntry("Examples Set", true);
         config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
 #endif
 
     if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
 
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+    _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
 #endif
 
     m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg)));
+                                              .arg(tempname).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname)));
+                                              .arg(tempname)));
         }
     }
 }
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
     RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
 #ifdef SETTING_LOG_DEBUG
 
-    _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
-    _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+    _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+    _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
 #endif
 
     TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
 
     if (!url.isValid()) {
         TQString string;
-        string = i18n( "Malformed URL\n%1").tqarg(netFile);
+        string = i18n( "Malformed URL\n%1").arg(netFile);
 
         KMessageBox::sorry(this, string);
         return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
     TQString target, caption(url.path());
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
         kapp->config()->setGroup("Recent Dirs");
         TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
         kapp->config()->writeEntry
-        ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+        ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
     }
 
     KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
     TQString target;
 
     if (KIO::NetAccess::download(url, target, this) == false) {
-        KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+        KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
         return ;
     }
 
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
         if (!res) {
             if (errMsg)
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg)));
+                                              .arg(docFilePath).arg(errMsg)));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath)));
+                                              .arg(docFilePath)));
         }
     }
 }
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg)));
+                                          .arg(newName).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName)));
+                                          .arg(newName)));
 
     } else {
 
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
     } catch (AudioFileManager::BadAudioPathException) {
         if (KMessageBox::warningContinueCancel
             (this,
-	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+	     i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
              i18n("Warning"),
              i18n("Set audio file path")) == KMessageBox::Continue) {
             slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
 
     if (!proc->normalExit() || proc->exitStatus()) {
         CurrentProgressDialog::freeze();
-        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+        KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -4236,7 +4236,7 @@ RosegardenGUIApp::slotUpdatePlaybackPosition()
 
     //    std::cerr << "RosegardenGUIApp::slotUpdatePlaybackPosition: mapper timeT = " << elapsedTime << std::endl;
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
 
         MappedComposition mC;
         if (mapper->getRecordedEvents(mC) > 0) {
@@ -4358,10 +4358,10 @@ void RosegardenGUIApp::slotSetPointerPosition(timeT t)
     //    std::cerr << "RosegardenGUIApp::slotSetPointerPosition: t = " << t << std::endl;
 
     if (m_seqManager) {
-	    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-	            m_seqManager->getTransporttqStatus() == RECORDING ) {
+	    if ( m_seqManager->getTransportStatus() == PLAYING ||
+	            m_seqManager->getTransportStatus() == RECORDING ) {
 	        if (t > comp.getEndMarker()) {
-	            if (m_seqManager->getTransporttqStatus() == PLAYING) {
+	            if (m_seqManager->getTransportStatus() == PLAYING) {
 	
 	                slotStop();
 	                t = comp.getEndMarker();
@@ -4477,8 +4477,8 @@ void RosegardenGUIApp::slotDisplayBarTime(timeT t)
 
 void RosegardenGUIApp::slotRefreshTimeDisplay()
 {
-    if ( m_seqManager->getTransporttqStatus() == PLAYING ||
-            m_seqManager->getTransporttqStatus() == RECORDING ) {
+    if ( m_seqManager->getTransportStatus() == PLAYING ||
+            m_seqManager->getTransportStatus() == RECORDING ) {
         return ; // it'll be refreshed in a moment anyway
     }
     slotSetPointerPosition(m_doc->getComposition().getPosition());
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
 //                if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
 //                } else {
 //                    allMissing.push_back(missing[i]);
 //                }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
         } else {
             for (int i = 0; i < missing.count(); ++i) {
                 if (missingFeatures.count() > 1) {
-                    allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+                    allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
                 } else {
                     allMissing.push_back(missing[i]);
                 }
@@ -4560,7 +4560,7 @@ void RosegardenGUIApp::slotTestStartupTester()
     }
 
 #ifdef HAVE_LIBJACK
-    if (m_seqManager && (m_seqManager->getSoundDrivertqStatus() & AUDIO_OK)) {
+    if (m_seqManager && (m_seqManager->getSoundDriverStatus() & AUDIO_OK)) {
 
         m_haveAudioImporter = m_startupTester->haveAudioFileImporter(&missing);
 
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
             } else {
                 for (int i = 0; i < missing.count(); ++i) {
                     if (missingFeatures.count() > 1) {
-                        allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+                        allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
                     } else {
                         allMissing.push_back(missing[i]);
                     }
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
         TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features.  The following features will not be available:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < missingFeatures.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+            message += i18n("<li>%1</li>").arg(missingFeatures[i]);
         }
         message += i18n("</ul>");
         message += i18n("<p>To fix this, you should install the following additional programs:</p>");
         message += i18n("<ul>");
         for (int i = 0; i < allMissing.count(); ++i) {
-            message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+            message += i18n("<li>%1</li>").arg(allMissing[i]);
         }
         message += i18n("</ul>");
 
@@ -4623,7 +4623,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
 
     if (isSequencerRunning()) {
         RG_DEBUG << "RosegardenGUIApp::launchSequencer() - sequencer already running - returning\n";
-        if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+        if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
         return true;
     }
 
@@ -4639,7 +4639,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
         << "existing DCOP registered sequencer found\n";
 
         if (useExisting) {
-            if (m_seqManager) m_seqManager->checkSoundDrivertqStatus(false);
+            if (m_seqManager) m_seqManager->checkSoundDriverStatus(false);
             m_sequencerProcess = (KProcess*)SequencerExternal;
             return true;
         }
@@ -4733,7 +4733,7 @@ bool RosegardenGUIApp::launchSequencer(bool useExisting)
             try {
                 //                 if (m_seqManager) {
                 //                     RG_DEBUG << "RosegardenGUIApp::launchSequencer : checking sound driver status\n";
-                //                     m_seqManager->checkSoundDrivertqStatus();
+                //                     m_seqManager->checkSoundDriverStatus();
                 //                 }
 
                 stateChanged("sequencer_running");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
     TQString errMsg;
     if (!m_doc->saveDocument(rgFile, errMsg,
                              true)) { // pretend it's autosave
-        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+        KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
         CurrentProgressDialog::thaw();
         return ;
     }
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
     proc->start(KProcess::Block, KProcess::All);
 
     if (!proc->normalExit() || proc->exitStatus()) {
-        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+        KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
         CurrentProgressDialog::thaw();
         delete proc;
         return ;
@@ -5168,9 +5168,9 @@ RosegardenGUIApp::slotToggleMetronome()
 {
     Composition &comp = m_doc->getComposition();
 
-    if (m_seqManager->getTransporttqStatus() == STARTING_TO_RECORD ||
-            m_seqManager->getTransporttqStatus() == RECORDING ||
-            m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == STARTING_TO_RECORD ||
+            m_seqManager->getTransportStatus() == RECORDING ||
+            m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         if (comp.useRecordMetronome())
             comp.setRecordMetronome(false);
         else
@@ -5192,7 +5192,7 @@ RosegardenGUIApp::slotRewindToBeginning()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->rewindToBeginning();
@@ -5203,7 +5203,7 @@ RosegardenGUIApp::slotFastForwardToEnd()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_seqManager->fastForwardToEnd();
@@ -5213,18 +5213,18 @@ void
 RosegardenGUIApp::slotSetPlayPosition(timeT time)
 {
     RG_DEBUG << "RosegardenGUIApp::slotSetPlayPosition(" << time << ")" << endl;
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     m_doc->slotSetPointerPosition(time);
 
-    if (m_seqManager->getTransporttqStatus() == PLAYING)
+    if (m_seqManager->getTransportStatus() == PLAYING)
         return ;
 
     slotPlay();
 }
 
-void RosegardenGUIApp::notifySequencertqStatus(int status)
+void RosegardenGUIApp::notifySequencerStatus(int status)
 {
     stateChanged("not_playing",
                  (status == PLAYING ||
@@ -5232,7 +5232,7 @@ void RosegardenGUIApp::notifySequencertqStatus(int status)
                  KXMLGUIClient::StateReverse : KXMLGUIClient::StateNoReverse);
 
     if (m_seqManager)
-        m_seqManager->setTransporttqStatus((TransporttqStatus) status);
+        m_seqManager->setTransportStatus((TransportStatus) status);
 }
 
 void RosegardenGUIApp::processAsynchronousMidi(const MappedComposition &mC)
@@ -5261,10 +5261,10 @@ RosegardenGUIApp::slotRecord()
             return ;
     }
 
-    if (m_seqManager->getTransporttqStatus() == RECORDING) {
+    if (m_seqManager->getTransportStatus() == RECORDING) {
         slotStop();
         return ;
-    } else if (m_seqManager->getTransporttqStatus() == PLAYING) {
+    } else if (m_seqManager->getTransportStatus() == PLAYING) {
         slotToggleRecord();
         return ;
     }
@@ -5398,7 +5398,7 @@ void RosegardenGUIApp::slotPlay()
     // slotRecord ensures we don't toggle the recording state in
     // SequenceManager)
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING_ARMED) {
+    if (m_seqManager->getTransportStatus() == RECORDING_ARMED) {
         slotRecord();
         return ;
     }
@@ -5481,7 +5481,7 @@ void RosegardenGUIApp::slotRewind()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
     if (m_seqManager)
         m_seqManager->rewind();
@@ -5491,7 +5491,7 @@ void RosegardenGUIApp::slotFastforward()
 {
     // ignore requests if recording
     //
-    if (m_seqManager->getTransporttqStatus() == RECORDING)
+    if (m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     if (m_seqManager)
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
 {
     double duration44 = TimeSignature(4, 4).getBarDuration();
     double value = double(m_zoomSlider->getCurrentSize());
-    m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+    m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
 
     RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
     << m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
         timeT prevTime = comp.getTempoChange(index).first;
 
         KMacroCommand *macro =
-            new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+            new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
 
         macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
         macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6307,8 +6307,8 @@ RosegardenGUIApp::slotAudioManager()
     connect(this, TQT_SIGNAL(documentAboutToChange()),
             m_audioManagerDialog, TQT_SLOT(close()));
 
-    m_audioManagerDialog->setAudioSubsystemtqStatus(
-        m_seqManager->getSoundDrivertqStatus() & AUDIO_OK);
+    m_audioManagerDialog->setAudioSubsystemStatus(
+        m_seqManager->getSoundDriverStatus() & AUDIO_OK);
 
     plugAccelerators(m_audioManagerDialog,
                      m_audioManagerDialog->getAccelerators());
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+            KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
         }
     }
 }
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
         int result;
         streamIn >> result;
         if (!result) {
-            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+            KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
         }
     }
 }
@@ -7723,10 +7723,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     if (!res) {
         if (errMsg)
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg)));
+                                          .arg(autoloadFile).arg(errMsg)));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile)));
+                                          .arg(autoloadFile)));
 
     }
 }
@@ -7778,7 +7778,7 @@ RosegardenGUIApp::slotImportStudio()
     TQString target;
     if (KIO::NetAccess::download(url, target, this) == false) {
         KMessageBox::error(this, i18n("Cannot download file %1")
-                           .tqarg(url.prettyURL()));
+                           .arg(url.prettyURL()));
         return ;
     }
 
@@ -7912,8 +7912,8 @@ void
 RosegardenGUIApp::slotAutoSave()
 {
     if (!m_seqManager ||
-        m_seqManager->getTransporttqStatus() == PLAYING ||
-        m_seqManager->getTransporttqStatus() == RECORDING)
+        m_seqManager->getTransportStatus() == PLAYING ||
+        m_seqManager->getTransportStatus() == RECORDING)
         return ;
 
     KConfig* config = kapp->config();
@@ -7982,7 +7982,7 @@ RosegardenGUIApp::awaitDialogClearance()
     
     while (haveDialog) {
 
-        const TQObjectList *c = tqchildren();
+        const TQObjectList *c = children();
         if (!c) return;
 
         haveDialog = false;
@@ -8014,7 +8014,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
         (this,
          i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
          i18n("Newer version available"),
-         TQString("version-%1-available-show").tqarg(v),
+         TQString("version-%1-available-show").arg(v),
          KMessageBox::AllowLink);
     CurrentProgressDialog::thaw();
 }
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 6aeeb7a..0349f8b 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -280,7 +280,7 @@ public:
     /**
      * Set the sequencer status - pass through DCOP as an int
      */
-    virtual void notifySequencertqStatus(int status);
+    virtual void notifySequencerStatus(int status);
 
     /**
      * Handle some random incoming MIDI events.
@@ -1240,7 +1240,7 @@ public slots:
     
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */         
     void slotSaveOptions();
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 702e6db..8bda485 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size)
     m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer();
 
     if (m_trackEditor->getTempoRuler()) {
-        m_trackEditor->getTempoRuler()->tqrepaint();
+        m_trackEditor->getTempoRuler()->repaint();
     }
 
     if (m_trackEditor->getChordNameRuler()) {
-        m_trackEditor->getChordNameRuler()->tqrepaint();
+        m_trackEditor->getChordNameRuler()->repaint();
     }
 
     if (m_trackEditor->getTopStandardRuler()) {
-        m_trackEditor->getTopStandardRuler()->tqrepaint();
+        m_trackEditor->getTopStandardRuler()->repaint();
     }
 
     if (m_trackEditor->getBottomStandardRuler()) {
-        m_trackEditor->getBottomStandardRuler()->tqrepaint();
+        m_trackEditor->getBottomStandardRuler()->repaint();
     }
 }
 
@@ -1196,7 +1196,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             bool toSet = false;
 
             if (states[instrumentId] == newState &&
-                    (getDocument()->getSequenceManager()->getTransporttqStatus()
+                    (getDocument()->getSequenceManager()->getTransportStatus()
                      != STOPPED)) {
 
                 if (info.level != 0 || info.levelRight != 0) {
@@ -1212,7 +1212,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
 
             if (recStates[instrumentId] == newState &&
                     instrument->getType() == Instrument::Audio &&
-                    (getDocument()->getSequenceManager()->getTransporttqStatus()
+                    (getDocument()->getSequenceManager()->getTransportStatus()
                      != PLAYING)) {
 
                 if (recInfo.level != 0 || recInfo.levelRight != 0) {
@@ -1238,7 +1238,7 @@ RosegardenGUIView::updateMeters(SequencerMapper *mapper)
             if (info.level == 0)
                 continue;
 
-            if (getDocument()->getSequenceManager()->getTransporttqStatus()
+            if (getDocument()->getSequenceManager()->getTransportStatus()
                     != STOPPED) {
 
 				// The information in 'info' is specific for this instrument, not
diff --git a/src/gui/application/RosegardenIface.h b/src/gui/application/RosegardenIface.h
index 04ab1a2..046033c 100644
--- a/src/gui/application/RosegardenIface.h
+++ b/src/gui/application/RosegardenIface.h
@@ -86,7 +86,7 @@ k_dcop:
 
     // Sequencer updates GUI with status
     //
-    virtual void notifySequencertqStatus(int status) = 0;
+    virtual void notifySequencerStatus(int status) = 0;
 
     // Used to map unexpected (async) MIDI events to the user interface.
     // We can show these on the Transport or on a MIDI Mixer.
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index 19ef147..9d4472d 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -79,7 +79,7 @@ SetWaitCursor::~SetWaitCursor()
         m_guiApp->setCursor(m_saveCursor);
 
         if (viewport) {
-            if (currentSegmentCanvasCursor.tqshape() == KCursor::waitCursor().tqshape()) {
+            if (currentSegmentCanvasCursor.shape() == KCursor::waitCursor().shape()) {
                 viewport->setCursor(m_saveSegmentCanvasCursor);
             } else {
                 viewport->setCursor(currentSegmentCanvasCursor); // because m_guiApp->setCursor() has replaced it
diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp
index 7a7850b..74704e1 100644
--- a/src/gui/application/StartupTester.cpp
+++ b/src/gui/application/StartupTester.cpp
@@ -147,7 +147,7 @@ StartupTester::isReady()
 void
 StartupTester::stdoutReceived(KProcess *, char *buffer, int len)
 {
-    m_stdoutBuffer += TQString::tqfromLatin1(buffer, len);
+    m_stdoutBuffer += TQString::fromLatin1(buffer, len);
 }
 
 void
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index ff03584..b3147de 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -246,7 +246,7 @@ and Events (our basic music element).  To help lift the ambiguity,
     and time this corresponds to, that kind of stuff.  (In the
     Notation and Matrix views, the LinedStaff calculates mappings
     between coordinates and staff lines: the former is especially
-    complicated because of its support for page tqlayout.)\n
+    complicated because of its support for page layout.)\n
  -# The canvas view transmits this kind of info as a signal, which is
  connected to a slot in the parent EditView.
  -# The EditView delegates action to the current tool.\n
@@ -260,7 +260,7 @@ which "wraps" the complexity into simple calls and performs all the
 hidden tasks.
  
 The EditView also maintains (obviously) its visual appearance with the
-tqlayout classes, applying them when appropriate.
+layout classes, applying them when appropriate.
  
 \section sequencer Sequencer
  
@@ -379,7 +379,7 @@ void testInstalledVersion()
               " 2. The upgrade was installed in a non-standard directory,\n"
               "     and an old version was found in a standard directory.  If so,\n"
               "     you will need to add the correct directory to your TDEDIRS\n"
-              "     environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion),
+              "     environment variable before you can run it.").arg(VERSION).arg(installedVersion),
          i18n("Installation problem"));
 
     } else {
@@ -531,8 +531,8 @@ int main(int argc, char *argv[])
 	    startupSize = TQSize((desktopRect.width() * 4) / 5,
 				(desktopRect.height() * 4) / 5);
 	}
-	TQString widthKey = TQString("Width %1").tqarg(totalRect.width());
-	TQString heightKey = TQString("Height %1").tqarg(totalRect.height());
+	TQString widthKey = TQString("Width %1").arg(totalRect.width());
+	TQString heightKey = TQString("Height %1").arg(totalRect.height());
 	windowWidth = config->readUnsignedNumEntry
 	    (widthKey, startupSize.width());
 	windowHeight = config->readUnsignedNumEntry
@@ -722,7 +722,7 @@ int main(int argc, char *argv[])
 	TQVBox *mw = dialog->makeVBoxMainWidget();
 	TQHBox *hb = new TQHBox(mw);
 	TQLabel *image = new TQLabel(hb);
-	image->tqsetAlignment(TQt::AlignTop);
+	image->setAlignment(TQt::AlignTop);
 	TQString iconFile = locate("appdata", "pixmaps/misc/welcome-icon.png");
 	if (!iconFile.isNull()) {
 	    image->setPixmap(TQPixmap(iconFile));