diff -rupN rosegarden-10.04.old/src/base/UrlHash.cpp rosegarden-10.04/src/base/UrlHash.cpp
--- rosegarden-10.04.old/src/base/UrlHash.cpp 2010-04-22 16:43:56.000000000 -0400
+++ rosegarden-10.04/src/base/UrlHash.cpp 2010-04-22 23:02:09.000000000 -0400
@@ -16,10 +16,10 @@
#include <QUrl>
#include <QHash> // to ensure correct qHash(const QString &) is found
-
+#if QT_VERSION < 0x040700
unsigned int
qHash(const QUrl &u)
{
return qHash(u.toString());
}
-
+#endif
diff -rupN rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h
--- rosegarden-10.04.old/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 16:43:42.000000000 -0400
+++ rosegarden-10.04/src/gui/dialogs/KeySignatureDialog.h 2010-04-22 23:24:30.000000000 -0400
@@ -57,7 +57,7 @@ public:
Rosegarden::Key::DefaultKey,
bool showApplyToAll = true,
bool showConversionOptions = true,
- QString explanatoryText = 0);
+ QString explanatoryText = "");
bool isValid() const;
::Rosegarden::Key getKey() const;
diff -rupN rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h
--- rosegarden-10.04.old/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 16:43:42.000000000 -0400
+++ rosegarden-10.04/src/gui/dialogs/TimeSignatureDialog.h 2010-04-22 23:14:09.000000000 -0400
@@ -49,7 +49,7 @@ public:
TimeSignature defaultSig =
TimeSignature::DefaultTimeSignature,
bool timeEditable = false,
- QString explanatoryText = 0);
+ QString explanatoryText = "");
TimeSignature getTimeSignature() const;