Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp
index 41da5ed..b7e04ef 100644
--- a/src/gui/editors/notation/NoteStyleFileReader.cpp
+++ b/src/gui/editors/notation/NoteStyleFileReader.cpp
@@ -48,13 +48,13 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) :
 	KGlobal::dirs()->findResource("appdata", "styles/");
 
     TQString styleFileName =
-	TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name));
+	TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name));
 
     TQFileInfo fileInfo(styleFileName);
 
     if (!fileInfo.isReadable()) {
         throw StyleFileReadFailed
-	    (qstrtostr(i18n("Can't open style file %1").arg(styleFileName)));
+	    (qstrtostr(i18n("Can't open style file %1").tqarg(styleFileName)));
     }
 
     TQFile styleFile(styleFileName);
@@ -98,7 +98,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &,
 	    if (!setFromAttributes(type, attributes)) return false;
 
 	} catch (NotationStrings::MalformedNoteName n) {
-	    m_errorString = i18n("Unrecognised note name %1").arg(s);
+	    m_errorString = i18n("Unrecognised note name %1").tqarg(s);
 	    return false;
 	}
 
@@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     TQString s;
     bool haveShape = false;
 
-    s = attributes.value("shape");
+    s = attributes.value("tqshape");
     if (s) {
 	m_style->setShape(type, qstrtostr(s.lower()));
 	haveShape = true;
@@ -134,7 +134,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type,
     s = attributes.value("charname");
     if (s) {
 	if (haveShape) {
-	    m_errorString = i18n("global and note elements may have shape "
+	    m_errorString = i18n("global and note elements may have tqshape "
 				 "or charname attribute, but not both");
 	    return false;
 	}