diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
| commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
| tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/gui/editors/notation/SystemFontXft.cpp | |
| parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
| download | rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip | |
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
Diffstat (limited to 'src/gui/editors/notation/SystemFontXft.cpp')
| -rw-r--r-- | src/gui/editors/notation/SystemFontXft.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/editors/notation/SystemFontXft.cpp b/src/gui/editors/notation/SystemFontXft.cpp index 6388167..75f9406 100644 --- a/src/gui/editors/notation/SystemFontXft.cpp +++ b/src/gui/editors/notation/SystemFontXft.cpp @@ -65,7 +65,7 @@ staticCubicTo(FT_Vector *control1, FT_Vector *control2, FT_Vector *to, void *) */ -QPixmap +TQPixmap SystemFontXft::renderChar(CharName charName, int glyph, int code, Strategy strategy, bool &success) { @@ -120,7 +120,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code, Drawable drawable = (Drawable)map.handle(); if (!drawable) { - std::cerr << "ERROR: SystemFontXft::renderChar: No drawable in QPixmap!" << std::endl; + std::cerr << "ERROR: SystemFontXft::renderChar: No drawable in TQPixmap!" << std::endl; return map; } @@ -129,7 +129,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code, (Visual *)map.x11Visual(), map.x11Colormap()); - TQColor pen(Qt::black); + TQColor pen(TQt::black); XftColor col; col.color.red = pen.red () | pen.red() << 8; col.color.green = pen.green () | pen.green() << 8; @@ -153,7 +153,7 @@ SystemFontXft::renderChar(CharName charName, int glyph, int code, XftDrawDestroy(draw); - map.setMask(PixmapFunctions::generateMask(map, Qt::white.rgb())); + map.setMask(PixmapFunctions::generateMask(map, TQt::white.rgb())); success = true; |