1 files changed, 24 insertions, 24 deletions

diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index 46525c4..cc919f0 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -537,8 +537,8 @@ AudioFileManager::createRecordingAudioFile()
     while (fileName == "") {
 
         fileName = TQString("rg-%1-%2.wav")
-                   .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-                   .arg(newId + 1);
+                   .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+                   .tqarg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -550,7 +550,7 @@ AudioFileManager::createRecordingAudioFile()
     WAVAudioFile *aF = 0;
 
     try {
-        aF = new WAVAudioFile(newId, fileName.data(), m_audioPath + fileName.data());
+        aF = new WAVAudioFile(newId, fileName.ascii(), (m_audioPath.c_str() + fileName).ascii());
         m_audioFiles.push_back(aF);
         m_recordedAudioFiles.insert(aF);
     } catch (SoundFile::BadSoundFileException e) {
@@ -622,10 +622,10 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
     while (fileName == "") {
 
         fileName = TQString("%1-%2-%3-%4.wav")
-	    .arg(prefix)
-	    .arg(sourceBase)
-	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .arg(newId + 1);
+	    .tqarg(prefix)
+	    .tqarg(sourceBase.c_str())
+	    .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .tqarg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + fileName).exists()) {
             fileName = "";
@@ -638,8 +638,8 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
 
     try {
         aF = new WAVAudioFile(newId,
-			      fileName.data(),
-			      m_audioPath + fileName.data());
+			      fileName.ascii(),
+			      (m_audioPath.c_str() + fileName).ascii());
         m_audioFiles.push_back(aF);
 	m_derivedAudioFiles.insert(aF);
     } catch (SoundFile::BadSoundFileException e) {
@@ -653,22 +653,22 @@ AudioFileManager::createDerivedAudioFile(AudioFileId source,
 AudioFileId
 AudioFileManager::importURL(const KURL &url, int sampleRate)
 {
-    if (url.isLocalFile()) return importFile(url.path(), sampleRate);
+    if (url.isLocalFile()) return importFile(url.path().ascii(), sampleRate);
 
     std::cerr << "AudioFileManager::importURL("<< url.prettyURL() << ", " << sampleRate << ")" << std::endl;
 
-    emit setOperationName(i18n("Downloading file %1").arg(url.prettyURL()));
+    emit setOperationName(i18n("Downloading file %1").tqarg(url.prettyURL()));
 
     TQString localPath = "";
     if (!KIO::NetAccess::download(url, localPath)) {
-	KMessageBox::error(0, i18n("Cannot download file %1").arg(url.prettyURL()));
-	throw SoundFile::BadSoundFileException(url.prettyURL());
+	KMessageBox::error(0, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+	throw SoundFile::BadSoundFileException(url.prettyURL().ascii());
     }
     
     AudioFileId id = 0;
 
     try {
-	id = importFile(localPath.data(), sampleRate);
+	id = importFile(localPath.ascii(), sampleRate);
     } catch (BadAudioPathException ape) {
 	KIO::NetAccess::removeTempFile(localPath);
 	throw ape;
@@ -688,7 +688,7 @@ AudioFileManager::fileNeedsConversion(const std::string &fileName,
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
         *proc << "-r";
-        *proc << TQString("%1").arg(sampleRate);
+        *proc << TQString("%1").tqarg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -715,7 +715,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *proc << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*proc << "-r";
-	*proc << TQString("%1").arg(sampleRate);
+	*proc << TQString("%1").tqarg(sampleRate);
     }
     *proc << "-w";
     *proc << fileName.c_str();
@@ -753,9 +753,9 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     while (targetName == "") {
 
         targetName = TQString("conv-%2-%3-%4.wav")
-	    .arg(sourceBase)
-	    .arg(TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"))
-	    .arg(newId + 1);
+	    .tqarg(sourceBase)
+	    .tqarg(TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmss"))
+	    .tqarg(newId + 1);
 
         if (TQFile(m_audioPath.c_str() + targetName).exists()) {
             targetName = "";
@@ -768,7 +768,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     *m_importProcess << "rosegarden-audiofile-importer";
     if (sampleRate > 0) {
 	*m_importProcess << "-r";
-	*m_importProcess << TQString("%1").arg(sampleRate);
+	*m_importProcess << TQString("%1").tqarg(sampleRate);
     }
     *m_importProcess << "-c";
     *m_importProcess << fileName.c_str();
@@ -777,7 +777,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     m_importProcess->start(KProcess::NotifyOnExit, KProcess::NoCommunication);
 
     while (m_importProcess->isRunning()) {
-	kapp->processEvents(100);
+	kapp->tqprocessEvents(100);
     }
 
     if (!m_importProcess->normalExit()) {
@@ -791,7 +791,7 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
 
     if (es) {
 	std::cerr << "audio file importer failed" << std::endl;
-	throw SoundFile::BadSoundFileException(fileName, i18n("Failed to convert or resample audio file on import"));
+	throw SoundFile::BadSoundFileException(fileName, i18n("Failed to convert or resample audio file on import").ascii());
     } else {
 	std::cerr << "audio file importer succeeded" << std::endl;
     }
@@ -800,8 +800,8 @@ AudioFileManager::importFile(const std::string &fileName, int sampleRate)
     WAVAudioFile *aF = 0;
 
     aF = new WAVAudioFile(newId,
-			  targetName.data(),
-			  m_audioPath + targetName.data());
+			  targetName.ascii(),
+			  (m_audioPath.c_str() + targetName).ascii());
     m_audioFiles.push_back(aF);
     m_derivedAudioFiles.insert(aF);
     // Don't catch SoundFile::BadSoundFileException