Fix FTBFS

1 files changed, 10 insertions, 10 deletions

diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 9f2bcd6..2e7a3ae 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -347,12 +347,12 @@ bool RosegardenGUIDoc::saveIfModified()
             completed = saveDocument(getAbsFilePath(), errMsg);
 
             if (!completed) {
-                if (errMsg) {
+                if (!errMsg.isNull()) {
                     KMessageBox::error(0, i18n(TQString("Could not save document at %1\n(%2)")
-                                               .tqarg(getAbsFilePath()).tqarg(errMsg)));
+                                               .tqarg(getAbsFilePath()).tqarg(errMsg).ascii()));
                 } else {
                     KMessageBox::error(0, i18n(TQString("Could not save document at %1")
-                                               .tqarg(getAbsFilePath())));
+                                               .tqarg(getAbsFilePath()).ascii()));
                 }
             }
         }
@@ -461,7 +461,7 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
     for (size_t i = 0; i < derivedOrphans.size(); ++i) {
         TQFile file(derivedOrphans[i]);
         if (!file.remove()) {
-            std::cerr << "WARNING: Failed to remove orphaned derived audio file \"" << derivedOrphans[i] << std::endl;
+            std::cerr << "WARNING: Failed to remove orphaned derived audio file \"" << derivedOrphans[i].ascii() << std::endl;
         }
         TQFile peakFile(TQString("%1.pk").tqarg(derivedOrphans[i]));
         peakFile.remove();
@@ -1152,7 +1152,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
 
     int status = temp.status();
     if (status != 0) {
-        errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").tqarg(filename).tqarg(strerror(status)));
+        errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").tqarg(filename).tqarg(strerror(status)).ascii());
         return false;
     }
 
@@ -1164,7 +1164,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
     if (!temp.close()) {
         status = temp.status();
         errMsg = i18n(TQString("Failure in temporary file handling for file '%1': %2")
-                      .tqarg(tempFileName).tqarg(strerror(status)));
+                      .tqarg(tempFileName).tqarg(strerror(status)).ascii());
         return false;
     }
 
@@ -1177,7 +1177,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
 
     TQDir dir(TQFileInfo(tempFileName).dir());
     if (!dir.rename(tempFileName, filename)) {
-        errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").tqarg(tempFileName).tqarg(filename));
+        errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").tqarg(tempFileName).tqarg(filename).ascii());
         return false;
     }
 
@@ -1198,7 +1198,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
 
     if (!rc) {
         // do some error report
-        errMsg = i18n(TQString("Could not open file '%1' for writing").tqarg(filename));
+        errMsg = i18n(TQString("Could not open file '%1' for writing").tqarg(filename).ascii());
         delete fileCompressedDevice;
         return false; // couldn't open file
     }
@@ -1315,7 +1315,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
     // check that all went ok
     //
     if (fileCompressedDevice->status() != IO_Ok) {
-        errMsg = i18n(TQString("Error while writing on '%1'").tqarg(filename));
+        errMsg = i18n(TQString("Error while writing on '%1'").tqarg(filename).ascii());
         delete fileCompressedDevice;
         return false;
     }
@@ -1383,7 +1383,7 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
     .tqarg(segment->getTrack())
     .tqarg(segment->getStartTime());
 
-    if (extraAttributes)
+    if (!extraAttributes.isNull())
         outStream << extraAttributes << " ";
 
     outStream << "label=\"" <<