Fix FTBFS

4 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/general/ClefIndex.cpp b/src/gui/general/ClefIndex.cpp
index 376b6cb..b02f01a 100644
--- a/src/gui/general/ClefIndex.cpp
+++ b/src/gui/general/ClefIndex.cpp
@@ -55,7 +55,7 @@ const Rosegarden::Clef clefIndexToClef(int index)
 const int clefNameToClefIndex(TQString s)
 {
     int m_elClef = 0;
-	if (s) {
+	if (!s.isNull()) {
         if (s == "treble")
             m_elClef = TrebleClef;
         else if (s == "bass")
@@ -97,4 +97,4 @@ const int clefNameToClefIndex(TQString s)
     return m_elClef;
 }
 
-}
\ No newline at end of file
+}
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 2fc60b7..f1f5dbf 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -1117,7 +1117,7 @@ EditView::createInsertPitchActionMenu()
                     (flat.tqarg(notePitchNames[i]),
                      CTRL + SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix));
+                     TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }
@@ -1127,7 +1127,7 @@ EditView::createInsertPitchActionMenu()
                 (notePitchNames[i],
                  notePitchKeys[octave][i],
                  TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                 TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix));
+                 TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix).ascii());
 
             menu->insert(insertPitchAction);
 
@@ -1140,7 +1140,7 @@ EditView::createInsertPitchActionMenu()
                     (sharp.tqarg(notePitchNames[i]),
                      SHIFT + notePitchKeys[octave][i],
                      TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(),
-                     TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix));
+                     TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix).ascii());
 
                 menu->insert(insertPitchAction);
             }
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 2cb3518..dda2c76 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -704,7 +704,7 @@ MultiViewCommandHistory* EditViewBase::getCommandHistory()
 
 KToggleAction* EditViewBase::getToggleAction(const TQString& actionName)
 {
-    return dynamic_cast<KToggleAction*>(actionCollection()->action(actionName));
+    return dynamic_cast<KToggleAction*>(actionCollection()->action(actionName.ascii()));
 }
 
 }
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index 729671d..cb8efca 100644
--- a/src/gui/general/PresetGroup.cpp
+++ b/src/gui/general/PresetGroup.cpp
@@ -129,7 +129,7 @@ PresetGroup::startElement(const TQString &, const TQString &,
     if (lcName == "category") {
 
         TQString s = attributes.value("name");
-        if (s) {
+        if (!s.isNull()) {
             m_elCategoryName = s;
             // increment the current category number
             m_lastCategory = m_currentCategory;
@@ -151,7 +151,7 @@ PresetGroup::startElement(const TQString &, const TQString &,
     } else if (lcName == "instrument") {
 
         TQString s = attributes.value("name");
-        if (s) {
+        if (!s.isNull()) {
             m_elInstrumentName = s;
             m_name = true;
 
@@ -162,13 +162,13 @@ PresetGroup::startElement(const TQString &, const TQString &,
 
     } else if (lcName == "clef") {
         TQString s = attributes.value("type");
-        if (s) {
+        if (!s.isNull()) {
         	m_elClef = clefNameToClefIndex(s);
             m_clef = true;
         }
     } else if (lcName == "transpose") {
         TQString s = attributes.value("value");
-        if (s) {
+        if (!s.isNull()) {
             m_elTranspose = s.toInt();
             m_transpose = true;
         }
@@ -178,13 +178,13 @@ PresetGroup::startElement(const TQString &, const TQString &,
 
         if (s == "amateur") {
             s = attributes.value("low");
-            if (s) {
+            if (!s.isNull()) {
                 m_elLowAm = s.toInt();
                 m_amateur = true;
             }
 
             s = attributes.value("high");
-            if (s && m_amateur) {
+            if (!s.isNull() && m_amateur) {
                 m_elHighAm = s.toInt();
             } else {
                 return false;
@@ -192,13 +192,13 @@ PresetGroup::startElement(const TQString &, const TQString &,
 
         } else if (s == "professional") {
             s = attributes.value("low");
-            if (s) {
+            if (!s.isNull()) {
                 m_pro = true;
                 m_elLowPro = s.toInt();
             }
 
             s = attributes.value("high");
-            if (s && m_pro) {
+            if (!s.isNull() && m_pro) {
                 m_elHighPro = s.toInt();
             } else {
                 return false;