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, 6 insertions, 6 deletions

diff --git a/src/gui/editors/notation/SystemFontQt.cpp b/src/gui/editors/notation/SystemFontQt.cpp
index ad969e8..5d90632 100644
--- a/src/gui/editors/notation/SystemFontQt.cpp
+++ b/src/gui/editors/notation/SystemFontQt.cpp
@@ -34,19 +34,19 @@
 
 namespace Rosegarden {
 
-QPixmap
+TQPixmap
 SystemFontQt::renderChar(CharName charName, int glyph, int code,
 			 Strategy strategy, bool &success)
 {
     success = false;
 
     if (strategy == OnlyGlyphs) {
-	NOTATION_DEBUG << "SystemFontQt::renderChar: OnlyGlyphs strategy not supported by Qt renderer, can't render character " << charName.getName() << " (glyph " << glyph << ")" << endl;
+	NOTATION_DEBUG << "SystemFontQt::renderChar: OnlyGlyphs strategy not supported by TQt renderer, can't render character " << charName.getName() << " (glyph " << glyph << ")" << endl;
 	return TQPixmap();
     }
 
     if (code < 0) {
-	NOTATION_DEBUG << "SystemFontQt::renderChar: Can't render using Qt with only glyph value (" << glyph << ") for character " << charName.getName() << ", need a code point" << endl;
+	NOTATION_DEBUG << "SystemFontQt::renderChar: Can't render using TQt with only glyph value (" << glyph << ") for character " << charName.getName() << ", need a code point" << endl;
 	return TQPixmap();
     }
 
@@ -60,16 +60,16 @@ SystemFontQt::renderChar(CharName charName, int glyph, int code,
     TQPainter painter;
     painter.begin(&map);
     painter.setFont(m_font);
-    painter.setPen(Qt::black);
+    painter.setPen(TQt::black);
     
     NOTATION_DEBUG << "NoteFont: Drawing character code "
 		   << code << " for " << charName.getName()
 		   << " using TQFont" << endl;
 
-    painter.drawText(0, metrics.ascent(), qc);
+    painter.drawText(0, metrics.ascent(), TQString(qc));
     
     painter.end();
-    map.setMask(PixmapFunctions::generateMask(map, Qt::white.rgb()));
+    map.setMask(PixmapFunctions::generateMask(map, TQt::white.rgb()));
 
     success = true;
     return map;