summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-03 00:36:01 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-03 15:47:32 +0900
commit217eb15dfed1b38303754b8cab53d77d749f22b9 (patch)
tree6add2b6f3bde30b1d9a2822e4d52ae088f4ca5dd
parent0fc192d2827d9bb160fce57b7e359f116a206aa7 (diff)
downloadrosegarden-217eb15dfed1b38303754b8cab53d77d749f22b9.tar.gz
rosegarden-217eb15dfed1b38303754b8cab53d77d749f22b9.zip
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/gui/editors/notation/FontViewFrame.cpp10
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index e78e44f..febb5ce 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -73,7 +73,7 @@ FontViewFrame::loadFont()
{
#ifdef HAVE_XFT
if (m_tableFont) {
- XftFontClose(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), (XftFont *)m_tableFont);
+ XftFontClose(this->x11AppDisplay(), (XftFont *)m_tableFont);
}
m_tableFont = 0;
@@ -108,7 +108,7 @@ FontViewFrame::loadFont()
m_fontName = (const char *)matchFamily;
}
- m_tableFont = XftFontOpenPattern(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), match);
+ m_tableFont = XftFontOpenPattern(this->x11AppDisplay(), match);
if (!m_tableFont) {
KMessageBox::error(this, i18n("Error: Unable to open best-match font %1").
@@ -159,8 +159,8 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
TQColor rpositive(128, 128, 255);
Drawable drawable = (Drawable)handle();
- XftDraw *draw = XftDrawCreate(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), drawable,
- (Visual *)TQT_TQPAINTDEVICE(this)->x11Visual(), TQT_TQPAINTDEVICE(this)->x11Colormap());
+ XftDraw *draw = XftDrawCreate(this->x11AppDisplay(), drawable,
+ (Visual *)this->x11Visual(), this->x11Colormap());
TQColor pen(TQt::black);
XftColor col;
@@ -207,7 +207,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e )
XftDrawGlyphs(draw, &col, (XftFont *)m_tableFont, x, y, &ui, 1);
} else {
FcChar32 ch = m_row * 256 + (j - 1) * 16 + i - 1;
- if (XftCharExists(TQT_TQPAINTDEVICE(this)->x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
+ if (XftCharExists(this->x11AppDisplay(), (XftFont *)m_tableFont, ch)) {
XftDrawString32(draw, &col, (XftFont *)m_tableFont, x, y, &ch, 1);
}
}
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 9268121..47ded9b 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -1255,7 +1255,7 @@ NotePixmapFactory::drawFlags(int flagCount,
y,
*flagChar.getPixmap());
- m_p->begin(TQT_TQPAINTDEVICE(m_generatedPixmap), TQT_TQPAINTDEVICE(m_generatedMask));
+ m_p->begin(m_generatedPixmap, m_generatedMask);
} else {
@@ -3446,7 +3446,7 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
m_generatedMask->fill(TQt::color0);
// initiate painting
- m_p->begin(TQT_TQPAINTDEVICE(m_generatedPixmap), TQT_TQPAINTDEVICE(m_generatedMask));
+ m_p->begin(m_generatedPixmap, m_generatedMask);
m_p->painter().setPen(TQt::black);
m_p->painter().setBrush(TQt::black);