From 2f0c2ae7b5a9144566dad971c4231709d19ece7a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 12 Sep 2023 21:15:21 +0900 Subject: Replace various tqtinterface's TQ_* defines with actual types Signed-off-by: Michele Calgaro --- kcontrol/konq/fontopts.cpp | 8 ++++---- kicker/extensions/kasbar/kasbarapp.cpp | 4 ++-- kicker/kicker/core/container_extension.cpp | 8 ++++---- kicker/libkicker/panelbutton.cpp | 2 +- kicker/libkicker/panelbutton.h | 4 ++-- twin/clients/plastik/plastik.h | 4 ++-- twin/clients/plastik/plastikclient.cpp | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index a12b02069..9dcb68e55 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -94,7 +94,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop m_pNormalText = new KColorButton( normalTextColor, this ); label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this ); lay->addWidget(label,row,0); - lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); + lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(Qt::AlignmentFlags)hAlign); wtstr = i18n("This is the color used to display text in Konqueror windows."); TQWhatsThis::add( label, wtstr ); @@ -129,7 +129,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQT_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); - lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign); + lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(Qt::AlignmentFlags)hAlign); wtstr = i18n("This is the color used behind the text for the icons on the desktop."); TQWhatsThis::add( label, wtstr ); @@ -179,7 +179,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop } cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); - lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign); + lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(Qt::AlignmentFlags)hAlign); connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" @@ -192,7 +192,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop row++; m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); - lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign ); + lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(Qt::AlignmentFlags)hAlign ); connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index ebb2422d3..51e281a4f 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -88,7 +88,7 @@ int main( int argc, char **argv ) TDEConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { - kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kasbar->setItemSize( KasBar::Large ); kasbar->append( new KasClockItem(kasbar) ); kasbar->append( new KasItem(kasbar) ); @@ -97,7 +97,7 @@ int main( int argc, char **argv ) kasbar->addTestItems(); } else { - KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); + KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 721df418e..623deb786 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_ltHB); if (kapp->reverseLayout()) { - _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_ltHB, 1, 2, (Qt::AlignmentFlags)vertAlignment); } else { - _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_ltHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment)); } } @@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons() _layout->remove(_rbHB); if (kapp->reverseLayout()) { - _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment)); + _layout->addWidget(_rbHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment)); } else { - _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment); + _layout->addWidget(_rbHB, 1, 2, (Qt::AlignmentFlags)vertAlignment); } } } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 93674f394..b7b7ba457 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d) setArrowDirection(KickerLib::directionToPopupPosition(d)); } -void PanelButton::setIconAlignment(TQ_Alignment align) +void PanelButton::setIconAlignment(Qt::AlignmentFlags align) { m_iconAlignment = align; update(); diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 7bba68dc7..5df1c62b6 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -263,7 +263,7 @@ public slots: protected: - void setIconAlignment(TQ_Alignment align); + void setIconAlignment(Qt::AlignmentFlags align); /** * Subclasses must implement this to define the name of the button which is * used to identify this button for saving and loading. It must be unique @@ -406,7 +406,7 @@ private: TQPixmap m_iconz; // mouse over KPanelExtension::Position m_arrowDirection; KPanelApplet::Direction m_popupDirection; - TQ_Alignment m_iconAlignment; + Qt::AlignmentFlags m_iconAlignment; Orientation m_orientation; int m_size; double m_fontPercent; diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h index 587d93f4e..5e8c3d35c 100644 --- a/twin/clients/plastik/plastik.h +++ b/twin/clients/plastik/plastik.h @@ -93,7 +93,7 @@ public: int borderSize() { return m_borderSize; } bool animateButtons() { return m_animateButtons; } bool menuClose() { return m_menuClose; } - TQ_Alignment titleAlign() { return m_titleAlign; } + Qt::AlignmentFlags titleAlign() { return m_titleAlign; } bool reverseLayout() { return m_reverse; } TQColor getColor(KWinPlastik::ColorType type, const bool active = true); @@ -113,7 +113,7 @@ private: int m_titleHeightTool; TQFont m_titleFont; TQFont m_titleFontTool; - TQ_Alignment m_titleAlign; + Qt::AlignmentFlags m_titleAlign; // pixmap cache TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state... diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp index 6fa993721..ad3d768c7 100644 --- a/twin/clients/plastik/plastikclient.cpp +++ b/twin/clients/plastik/plastikclient.cpp @@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; - TQ_Alignment a = Handler()->titleAlign(); + Qt::AlignmentFlags a = Handler()->titleAlign(); int tX, tW; // position/width of the title buffer if (caption.width() > titleWidth) { -- cgit v1.2.3