1 files changed, 9 insertions, 9 deletions

diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index b7e04ef..b8619c9 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -81,7 +81,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &,
     if (lcName == "rosegarden-note-style") {
 
 	TQString s = attributes.value("base-style");
-	if (s) m_style->setBaseStyle(qstrtostr(s));
+	if (!s.isNull()) m_style->setBaseStyle(qstrtostr(s));
 
     } else if (lcName == "note") {
 
@@ -126,13 +126,13 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     bool haveShape = false;
 
     s = attributes.value("tqshape");
-    if (s) {
+    if (!s.isNull()) {
 	m_style->setShape(type, qstrtostr(s.lower()));
 	haveShape = true;
     }
     
     s = attributes.value("charname");
-    if (s) {
+    if (!s.isNull()) {
 	if (haveShape) {
 	    m_errorString = i18n("global and note elements may have tqshape "
 				 "or charname attribute, but not both");
@@ -143,16 +143,16 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     }
 
     s = attributes.value("filled");
-    if (s) m_style->setFilled(type, s.lower() == "true");
+    if (!s.isNull()) m_style->setFilled(type, s.lower() == "true");
     
     s = attributes.value("stem");
-    if (s) m_style->setStem(type, s.lower() == "true");
+    if (!s.isNull()) m_style->setStem(type, s.lower() == "true");
     
     s = attributes.value("flags");
-    if (s) m_style->setFlagCount(type, s.toInt());
+    if (!s.isNull()) m_style->setFlagCount(type, s.toInt());
     
     s = attributes.value("slashes");
-    if (s) m_style->setSlashCount(type, s.toInt());
+    if (!s.isNull()) m_style->setSlashCount(type, s.toInt());
 
     NoteStyle::HFixPoint hfix;
     NoteStyle::VFixPoint vfix;
@@ -161,7 +161,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     bool haveVFix = false;
 
     s = attributes.value("hfixpoint");
-    if (s) {
+    if (!s.isNull()) {
 	s = s.lower();
 	haveHFix = true;
 	if (s == "normal") hfix = NoteStyle::Normal;
@@ -171,7 +171,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     }
 
     s = attributes.value("vfixpoint");
-    if (s) {
+    if (!s.isNull()) {
 	s = s.lower();
 	haveVFix = true;
 	if (s == "near") vfix = NoteStyle::Near;