diff options
| author | Michele Calgaro <[email protected]> | 2023-11-24 10:46:59 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-11-24 22:28:43 +0900 |
| commit | 832a6a8631e84380a97d6ed003b12a528c2d32e2 (patch) | |
| tree | c30d1aff06114e1c39dc0cf089c9af01f0764c6d | |
| parent | 22bcf55f954ce6f6528ba3484888d64f15d6dcb2 (diff) | |
| download | amarok-832a6a8631e84380a97d6ed003b12a528c2d32e2.tar.gz amarok-832a6a8631e84380a97d6ed003b12a528c2d32e2.zip | |
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit b841bed50c7aec5fac94009fb80baf6a9e266789)
| -rw-r--r-- | amarok/src/browserbar.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/multitabbar.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/prettypopupmenu.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/scancontroller.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/statusbar/statusBarBase.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index b5585c74..4d7cb749 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -44,7 +44,7 @@ namespace Amarok virtual void paintEvent( TQPaintEvent* ) { TQPainter p( this ); - parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal ); + parentWidget()->style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal ); } virtual void styleChange( TQStyle& ) diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index cfc28150..6e361cab 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -714,7 +714,7 @@ TQSize MultiTabBarButton::sizeHint() const // h = ( parentWidget()->width() - 3 ) / NUM_TABS; // } - return ( style().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). + return ( style().sizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). expandedTo( TQApplication::globalStrut() ) ); } diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index 17132457..163dba48 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -174,7 +174,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e ) drawContents( &p ); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index 57fd7c9a..acb6228c 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -489,7 +489,7 @@ ScanController::startElement( const TQString&, const TQString& localName, const TQValueList< TQPair<TQString, TQString> > covers; for( uint i = 0; i < list.count(); ) { - covers += tqMakePair( list[i], list[i + 1] ); + covers += qMakePair( list[i], list[i + 1] ); i += 2; } diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index 7974dfc6..aa513e3a 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -181,7 +181,7 @@ StatusBar::paintEvent( TQPaintEvent* ) if ( !w->isVisible() ) continue; - style().tqdrawPrimitive( + style().drawPrimitive( TQStyle::PE_StatusBarSection, &p, TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ), |