From b965cbac5b21345e9dfc768a7e4f660ffa4aa72f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 13 Nov 2023 21:03:36 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- kicker/extensions/kasbar/kasaboutdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasbar.cpp | 18 +++++++++--------- kicker/extensions/kasbar/kasbar.h | 14 +++++++------- kicker/extensions/kasbar/kasbarapp.cpp | 4 ++-- kicker/extensions/kasbar/kasbarextension.cpp | 8 ++++---- kicker/extensions/kasbar/kasgroupitem.cpp | 2 +- kicker/extensions/kasbar/kasitem.cpp | 10 +++++----- kicker/extensions/kasbar/kaspopup.cpp | 2 +- kicker/extensions/kasbar/kasprefsdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasresources.cpp | 8 ++++---- kicker/extensions/kasbar/kastasker.cpp | 2 +- kicker/extensions/kasbar/kastasker.h | 6 +++--- kicker/extensions/kasbar/kastaskpopup.cpp | 6 +++--- 13 files changed, 44 insertions(+), 44 deletions(-) (limited to 'kicker/extensions/kasbar') diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 1d15dc7c8..54dd1dfd6 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar() box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); - KasBar *bar = new KasBar( Qt::Horizontal, box ); + KasBar *bar = new KasBar( TQt::Horizontal, box ); bar->setItemSize( KasBar::Large ); bar->setMasked( false ); @@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar() ci->setCustomPopup( true ); connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); - KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); KasItem *i = 0; KasClockItem *clk = new KasClockItem( groupbar ); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 87fc7c629..f28d2fd1f 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -109,7 +109,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), + direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir ) return; if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; direction_ = dir; emit directionChanged(); @@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o ) if ( orient == o ) return; - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setDirection( TQBoxLayout::LeftToRight ); else setDirection( TQBoxLayout::TopToBottom ); @@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach ) TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); else setBoxesPerLine( sz.height() / itemExtent() ); @@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz ) ++r; TQSize s; - if( o == Qt::Horizontal ) { + if( o == TQt::Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); } @@ -434,7 +434,7 @@ void KasBar::updateLayout() ++r; TQSize sz; - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) sz = TQSize( c * itemExtent(), r * itemExtent() ); else sz = TQSize( r * itemExtent(), c * itemExtent() ); @@ -449,7 +449,7 @@ void KasBar::updateLayout() TQRegion mask; KasItem *i; - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 7602591e7..5aad7392a 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -84,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget friend class KasItem; public: - KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); - KasBar( Qt::Orientation o, KasBar *master, + KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( TQt::Orientation o, KasBar *master, TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); @@ -99,7 +99,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -136,8 +136,8 @@ public: int maxBoxes() const { return maxBoxes_; } uint boxesPerLine() const { return boxesPerLine_; } - void setOrientation( Qt::Orientation o ); - Qt::Orientation orientation() const { return orient; } + void setOrientation( TQt::Orientation o ); + TQt::Orientation orientation() const { return orient; } void setDirection( Direction dir ); Direction direction() const { return direction_; } @@ -147,7 +147,7 @@ public: bool isDrag() const { return inDrag; } - TQSize sizeHint( Qt::Orientation, TQSize max ); + TQSize sizeHint( TQt::Orientation, TQSize max ); // // Look and feel options @@ -282,7 +282,7 @@ private: TQPixmap offscreen; KasBar *master_; KasItemList items; - Qt::Orientation orient; + TQt::Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 51e281a4f..1dc85038c 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", (TQt::WFlags)wflags ); + kasbar = new KasBar( TQt::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", (TQt::WFlags)wflags ); + KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags ); kastasker->setConfig( &conf ); kastasker->setStandAlone( true ); kasbar = kastasker; diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 5d870dae6..1aa373d3c 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) TQSize KasBarExtension::detachedSize() { - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); @@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize() TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { - Orientation o = Qt::Horizontal; + Orientation o = TQt::Horizontal; if ( p == Left || p == Right ) - o = Qt::Vertical; + o = TQt::Vertical; if ( detached_ ) { - if ( o == Qt::Vertical ) + if ( o == TQt::Vertical ) return TQSize( kasbar->itemExtent()/2, 0 ); else return TQSize( 0, kasbar->itemExtent()/2 ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a14dff2ea..693f912c4 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -255,7 +255,7 @@ void KasGroupItem::updatePopup() KasPopup *KasGroupItem::createPopup() { KasPopup *pop = new KasPopup( this ); - bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop ); + bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 2523ef18c..1967465f4 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -179,11 +179,11 @@ void KasItem::mouseEnter() void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { - if ( ev->button() == Qt::LeftButton ) + if ( ev->button() == TQt::LeftButton ) emit leftButtonClicked( ev ); - else if ( ev->button() == Qt::RightButton ) + else if ( ev->button() == TQt::RightButton ) emit rightButtonClicked( ev ); - else if ( ev->button() == Qt::MidButton ) + else if ( ev->button() == TQt::MidButton ) emit middleButtonClicked( ev ); } @@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p ) p->drawRect( 0, 0, extent(), extent()); } else { - pen = TQPen( Qt::white ); + pen = TQPen( TQt::white ); p->setPen( pen ); p->drawRect(0, 0, extent(), extent()); } } else if ( kas->paintInactiveFrames() ) { - p->setPen( attention_ ? resources()->attentionColor() : Qt::black ); + p->setPen( attention_ ? resources()->attentionColor() : TQt::black ); p->drawRect(0, 0, extent(), extent()); } } diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 0edc0a77a..33966bdb9 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int x = pos.x(); int y = pos.y(); - if ( kasbar->orientation() == Qt::Horizontal ) { + if ( kasbar->orientation() == TQt::Horizontal ) { if ( y < ( tqApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 729fda525..6d5255082 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage() TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setTintAmount( int ) ) ); @@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage() "cause performance problems." ) ); TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox ); connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 78b25e8c0..219c324fb 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -126,10 +126,10 @@ static const char *micro_shade[]={ KasResources::KasResources( KasBar *parent, const char *name ) : TQObject( parent, name ? name : "kasbar_resources" ), kasbar( parent ), - labelPenColor_( Qt::white ), labelBgColor_( Qt::black ), - activePenColor_( Qt::black ), activeBgColor_( Qt::white ), - inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ), - progressColor_( Qt::green ), attentionColor_( Qt::red ), + labelPenColor_( TQt::white ), labelBgColor_( TQt::black ), + activePenColor_( TQt::black ), activeBgColor_( TQt::white ), + inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ), + progressColor_( TQt::green ), attentionColor_( TQt::red ), startupFrames_() { } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index d10805a78..11185c9e0 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf ) conf->setGroup("Layout"); setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); - setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) ); + setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); TQPoint pos(100, 100); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index d07c865fb..c05c13bb6 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -89,14 +89,14 @@ class KDE_EXPORT KasTasker : public KasBar public: /** Create a KasTasker widget. */ - KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The * created widget will inherit the settings of the parent, but will * not connect to the signals of the TaskManager. */ - KasTasker( Qt::Orientation o, KasTasker *master, + KasTasker( TQt::Orientation o, KasTasker *master, TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ @@ -105,7 +105,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual TDEPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 ); /** * Returns true if this is the top KasTasker. Note that it is possible for diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 7b5fe4ed5..32ef9de81 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, colorGroup().mid(), + TQt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); @@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) TQString text = item->task()->visibleIconicName(); - p.setPen( Qt::white ); + p.setPen( TQt::white ); if ( fontMetrics().width( text ) > width() - 4 ) p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter, text ); @@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * ) // // Draw border // - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawRect( 0, 0, width(), height() ); } -- cgit v1.2.1