From 4b3c5dd929ea78ca3b6f656a63d70b10d2f43885 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 17:42:48 -0600
Subject: Fix FTBFS

---
 src/gui/application/RosegardenGUIApp.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/gui/application/RosegardenGUIApp.cpp')

diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 7bfdfb1..268affe 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -2008,12 +2008,12 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
         TQString errMsg;
         bool res = m_doc->saveDocument(tempname, errMsg);
         if (!res) {
-            if (errMsg)
+            if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(tempname).tqarg(errMsg)));
+                                              .tqarg(tempname).tqarg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(tempname)));
+                                              .tqarg(tempname).ascii()));
         }
     }
 }
@@ -2271,12 +2271,12 @@ void RosegardenGUIApp::slotFileSave()
 
         bool res = m_doc->saveDocument(docFilePath, errMsg);
         if (!res) {
-            if (errMsg)
+            if (!errMsg.isNull())
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                              .tqarg(docFilePath).tqarg(errMsg)));
+                                              .tqarg(docFilePath).tqarg(errMsg).ascii()));
             else
                 KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                              .tqarg(docFilePath)));
+                                              .tqarg(docFilePath).ascii()));
         }
     }
 }
@@ -2294,7 +2294,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
 
     // It's too bad there isn't this functionality within
     // KFileDialog::getSaveFileName
-    KFileDialog saveFileDialog(":ROSEGARDEN", descriptiveExtension,this, label, true);
+    KFileDialog saveFileDialog(TQString(":ROSEGARDEN"), descriptiveExtension, TQT_TQWIDGET(this), label.ascii(), true);
     saveFileDialog.setOperationMode(KFileDialog::Saving);
     if (m_doc) {
         TQString saveFileName = m_doc->getAbsFilePath();
@@ -2319,7 +2319,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
     //
     if (!extension.isEmpty()) {
         static TQRegExp rgFile("\\..{1,4}$");
-        if (rgFile.match(name) == -1) {
+        if (rgFile.search(name) == -1) {
             name += extension;
         }
     }
@@ -2374,12 +2374,12 @@ bool RosegardenGUIApp::slotFileSaveAs()
     TQString errMsg;
     bool res = m_doc->saveDocument(newName, errMsg);
     if (!res) {
-        if (errMsg)
+        if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
-                                          .tqarg(newName).tqarg(errMsg)));
+                                          .tqarg(newName).tqarg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not save document at %1")
-                                          .tqarg(newName)));
+                                          .tqarg(newName).ascii()));
 
     } else {
 
@@ -7566,7 +7566,7 @@ RosegardenGUIApp::slotTutorial()
 {
     TQString exe = KStandardDirs::findExe( "x-www-browser" );
 
-    if( exe )
+    if( !exe.isNull() )
     {
         KProcess *proc = new KProcess;
         *proc << "x-www-browser";
@@ -7588,7 +7588,7 @@ RosegardenGUIApp::slotBugGuidelines()
 {
     TQString exe = KStandardDirs::findExe( "x-www-browser" );
 
-    if( exe )
+    if( !exe.isNull() )
     {
         KProcess *proc = new KProcess;
         *proc << "x-www-browser";
@@ -7751,12 +7751,12 @@ RosegardenGUIApp::slotSaveDefaultStudio()
     TQString errMsg;
     bool res = m_doc->saveDocument(autoloadFile, errMsg);
     if (!res) {
-        if (errMsg)
+        if (!errMsg.isNull())
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
-                                          .tqarg(autoloadFile).tqarg(errMsg)));
+                                          .tqarg(autoloadFile).tqarg(errMsg).ascii()));
         else
             KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
-                                          .tqarg(autoloadFile)));
+                                          .tqarg(autoloadFile).ascii()));
 
     }
 }
-- 
cgit v1.2.1