diff options
| author | Michele Calgaro <[email protected]> | 2023-11-24 10:47:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-11-24 22:32:24 +0900 |
| commit | f9893e5b16c7694da25e60805fe751691e127e85 (patch) | |
| tree | 2b204fdab8798eaed0346d1b24bb646c6c89085c /lib/kofficeui | |
| parent | 8263fdf7603821cad365e436ab78557f40a9e9db (diff) | |
| download | koffice-f9893e5b16c7694da25e60805fe751691e127e85.tar.gz koffice-f9893e5b16c7694da25e60805fe751691e127e85.zip | |
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit dcc4dc7a89e5f5f7fb4217815b892f4b0106d5a0)
Diffstat (limited to 'lib/kofficeui')
| -rw-r--r-- | lib/kofficeui/KoTooluButton.cpp | 6 | ||||
| -rw-r--r-- | lib/kofficeui/tkcombobox.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f2c64a32..1c5f5f1f 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e ) // The "active" element (if there is one) if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 && mapFromPosition( m_focusPosition ).intersects( e->rect() ) ) - style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); --lns; // Attention: We just avoid some lns - 1 statements @@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition ) TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition ); if ( it != m_colorMap.end() ) { // draw at the new focus position - style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), + style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ), colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled ); p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() ); } @@ -720,7 +720,7 @@ void KoToolButton::drawButton(TQPainter *_painter) _painter->setClipping( false ); // ...and the arrow indicating the popup - style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), + style().drawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ), cg, flags, opt ); if ( TDEToolBarButton::isRaised() || m_arrowPressed ) diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp index 592e3856..588ffeb5 100644 --- a/lib/kofficeui/tkcombobox.cpp +++ b/lib/kofficeui/tkcombobox.cpp @@ -91,7 +91,7 @@ void TKComboBox::paintEvent(TQPaintEvent*) style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() ); if ( hasFocus()) { - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, fr, g ); } if (!editable()) { |