diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:33:34 +0000 |
| commit | c663b6440964f6ac48027143ac9e63298991f9d0 (patch) | |
| tree | 6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /kicker/extensions/kasbar | |
| parent | a061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff) | |
| download | tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/extensions/kasbar')
31 files changed, 726 insertions, 726 deletions
diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h index 6a9aa5849..105176d08 100644 --- a/kicker/extensions/kasbar/docs.h +++ b/kicker/extensions/kasbar/docs.h @@ -40,23 +40,23 @@ class QObject { }; -class QWidget : public QObject +class TQWidget : public QObject { }; -class QDialog : public QWidget +class TQDialog : public QWidget { }; -class QFrame : public QWidget +class TQFrame : public QWidget { }; -class QHBox : public QFrame +class TQHBox : public QFrame { }; -class QLCDNumber : public QFrame +class TQLCDNumber : public QFrame { }; diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 73d20d94b..d32f0a1dd 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -52,12 +52,12 @@ ** Bug reports and questions can be sent to [email protected] */ -#include <qcheckbox.h> -#include <qgrid.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqcheckbox.h> +#include <tqgrid.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdeversion.h> #include <klocale.h> @@ -83,7 +83,7 @@ #define Icon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) #define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) -KasAboutDialog::KasAboutDialog( QWidget *parent ) +KasAboutDialog::KasAboutDialog( TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"), KDialogBase::Ok, KDialogBase::Ok, @@ -110,10 +110,10 @@ KasAboutDialog::~KasAboutDialog() void KasAboutDialog::addDemoBar() { - QHBox *box = new QHBox( this ); + TQHBox *box = new TQHBox( this ); box->setLineWidth(2); - box->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + box->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); box->setSpacing( spacingHint() ); box->setMargin( marginHint() ); @@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, SIGNAL(leftButtonClicked(QMouseEvent *)), ci, SLOT(togglePopup()) ); + connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); KasItem *i = 0; @@ -150,10 +150,10 @@ void KasAboutDialog::addDemoBar() void KasAboutDialog::addInfoPage() { - QVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) ); + TQVBox *aboutPage = addVBoxPage( i18n("About"), i18n("About Kasbar"), Icon( "appearance" ) ); aboutPage->setSpacing( spacingHint() ); - new QLabel( i18n( "<qt><body>" + new TQLabel( i18n( "<qt><body>" "<h2>Kasbar Version: %1</h2>" "<b>KDE Version:</b> %2" "</body></qt>" ) @@ -176,12 +176,12 @@ void KasAboutDialog::addInfoPage() "</body></html>" ) .arg( HOMEPAGE_URL ).arg( HOMEPAGE_URL ) ); - text5->setWordWrap( QTextEdit::WidgetWidth ); + text5->setWordWrap( TQTextEdit::WidgetWidth ); } void KasAboutDialog::addAuthorsPage() { - QVBox *authorsPage = addVBoxPage( i18n("Authors"), + TQVBox *authorsPage = addVBoxPage( i18n("Authors"), i18n("Kasbar Authors"), Icon( "kuser" ) ); @@ -206,28 +206,28 @@ void KasAboutDialog::addAuthorsPage() "</html>" ) ); - text->setWordWrap( QTextEdit::WidgetWidth ); + text->setWordWrap( TQTextEdit::WidgetWidth ); } void KasAboutDialog::addBSDPage() { - QVBox *bsdLicense = addVBoxPage( i18n("BSD License"), QString::null, Icon( "filefind" ) ); + TQVBox *bsdLicense = addVBoxPage( i18n("BSD License"), TQString::null, Icon( "filefind" ) ); - new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " + new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " "or the GNU Public License." ), bsdLicense ); KTextBrowser *text2 = new KTextBrowser( bsdLicense ); text2->setText( "Some text of unsurpassed tediousness goes here." ); - text2->setWordWrap( QTextEdit::NoWrap ); + text2->setWordWrap( TQTextEdit::NoWrap ); - QString bsdFile = locate("data", "LICENSES/BSD"); + TQString bsdFile = locate("data", "LICENSES/BSD"); if ( !bsdFile.isEmpty() ) { - QString result; - QFile file( bsdFile ); + TQString result; + TQFile file( bsdFile ); if ( file.open( IO_ReadOnly ) ) { - QTextStream str(&file); + TQTextStream str(&file); result += str.read(); } @@ -237,23 +237,23 @@ void KasAboutDialog::addBSDPage() void KasAboutDialog::addGPLPage() { - QVBox *gplPage = addVBoxPage( i18n("GPL License"), QString::null, Icon( "filefind" ) ); + TQVBox *gplPage = addVBoxPage( i18n("GPL License"), TQString::null, Icon( "filefind" ) ); - new QLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " + new TQLabel( i18n( "Kasbar may be used under the terms of either the BSD license, " "or the GNU Public License." ), gplPage ); KTextBrowser *text3 = new KTextBrowser( gplPage ); text3->setText( "Some more text of unsurpassed tediousness goes here." ); - text3->setWordWrap( QTextEdit::NoWrap ); + text3->setWordWrap( TQTextEdit::NoWrap ); - QString gplFile = locate("data", "LICENSES/GPL_V2"); + TQString gplFile = locate("data", "LICENSES/GPL_V2"); if ( !gplFile.isEmpty() ) { - QString result; - QFile file( gplFile ); + TQString result; + TQFile file( gplFile ); if ( file.open( IO_ReadOnly ) ) { - QTextStream str(&file); + TQTextStream str(&file); result += str.read(); } diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h index c217ead79..0311202ba 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.h +++ b/kicker/extensions/kasbar/kasaboutdlg.h @@ -68,7 +68,7 @@ class KasAboutDialog : public KDialogBase Q_OBJECT public: - KasAboutDialog( QWidget *parent=0 ); + KasAboutDialog( TQWidget *parent=0 ); ~KasAboutDialog(); void addAuthorsPage(); diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 8210190c8..06bf3c24f 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -53,11 +53,11 @@ */ #include <math.h> -#include <qbitmap.h> -#include <qcursor.h> -#include <qpainter.h> -#include <qmemarray.h> -#include <qtimer.h> +#include <tqbitmap.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqmemarray.h> +#include <tqtimer.h> #include <kapplication.h> #include <kdebug.h> @@ -76,11 +76,11 @@ static const int LARGE_EXTENT = 68; static const int HUGE_EXTENT = 84; static const int ENORMOUS_EXTENT = 148; -KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ), +KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ), master_(0), orient( o ), - direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ), + direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -102,14 +102,14 @@ KasBar::KasBar( Orientation o, QWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, SIGNAL( configChanged() ), SLOT( repaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } -KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ), +KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ), master_(master), orient( o ), - direction_( o == Horizontal ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom ), + direction_( o == Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ), itemUnderMouse_( 0 ), boxesPerLine_(10), // Temp value inDrag( false ), @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, QWidget *parent, const char *name items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, SIGNAL( configChanged() ), SLOT( repaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,15 +145,15 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, SIGNAL( changed() ), SIGNAL( configChanged() ) ); - connect( this, SIGNAL( itemSizeChanged(int) ), res, SLOT( itemSizeChanged() ) ); + connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); + connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); return res; } return master_->resources(); } -KasBar *KasBar::createChildBar( Orientation o, QWidget *parent, const char *name ) +KasBar *KasBar::createChildBar( Orientation o, TQWidget *parent, const char *name ) { KasBar *child = new KasBar( o, this, parent, name ); child->rereadMaster(); @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, SIGNAL( backgroundUpdated(const QPixmap &) ), - this, SLOT( setBackground(const QPixmap &) ) ); + connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQT_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -259,7 +259,7 @@ void KasBar::setTint( bool enable ) } } -void KasBar::setTint( double amount, QColor color ) +void KasBar::setTint( double amount, TQColor color ) { tintAmount_ = amount; tintColour_ = color; @@ -273,7 +273,7 @@ void KasBar::setTint( double amount, QColor color ) } } -void KasBar::setTintColor( const QColor &c ) +void KasBar::setTintColor( const TQColor &c ) { setTint( tintAmount_, c ); } @@ -303,7 +303,7 @@ void KasBar::setBoxesPerLine( int count ) updateLayout(); } -void KasBar::setDetachedPosition( const QPoint &pos ) +void KasBar::setDetachedPosition( const TQPoint &pos ) { if ( detachedPos == pos ) return; @@ -317,7 +317,7 @@ void KasBar::setDirection( Direction dir ) if ( direction_ == dir ) return; - if ( ( dir == QBoxLayout::LeftToRight ) || ( dir == QBoxLayout::RightToLeft ) ) + if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) ) orient = Horizontal; else orient = Vertical; @@ -333,29 +333,29 @@ void KasBar::setOrientation( Orientation o ) return; if ( o == Horizontal ) - setDirection( QBoxLayout::LeftToRight ); + setDirection( TQBoxLayout::LeftToRight ); else - setDirection( QBoxLayout::TopToBottom ); + setDirection( TQBoxLayout::TopToBottom ); } void KasBar::toggleOrientation() { switch( direction_ ) { - case QBoxLayout::LeftToRight: - setDirection( QBoxLayout::RightToLeft ); + case TQBoxLayout::LeftToRight: + setDirection( TQBoxLayout::RightToLeft ); break; - case QBoxLayout::RightToLeft: - setDirection( QBoxLayout::TopToBottom ); + case TQBoxLayout::RightToLeft: + setDirection( TQBoxLayout::TopToBottom ); break; - case QBoxLayout::TopToBottom: - setDirection( QBoxLayout::BottomToTop ); + case TQBoxLayout::TopToBottom: + setDirection( TQBoxLayout::BottomToTop ); break; - case QBoxLayout::BottomToTop: - setDirection( QBoxLayout::LeftToRight ); + case TQBoxLayout::BottomToTop: + setDirection( TQBoxLayout::LeftToRight ); break; default: kdWarning() << "toggleOrientation got an odd direction: " << (uint) direction_ << endl; - setDirection( QBoxLayout::LeftToRight ); + setDirection( TQBoxLayout::LeftToRight ); break; } } @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -QSize KasBar::sizeHint( Orientation o, QSize sz ) +TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { if ( o == Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -395,7 +395,7 @@ QSize KasBar::sizeHint( Orientation o, QSize sz ) if( r*c < items.count() ) // remainders ++r; - QSize s; + TQSize s; if( o == Horizontal ) { s.setWidth( c*itemExtent() ); s.setHeight( r*itemExtent() ); @@ -433,11 +433,11 @@ void KasBar::updateLayout() if( r*c < items.count() ) // remainders ++r; - QSize sz; + TQSize sz; if ( orient == Horizontal ) - sz = QSize( c * itemExtent(), r * itemExtent() ); + sz = TQSize( c * itemExtent(), r * itemExtent() ); else - sz = QSize( r * itemExtent(), c * itemExtent() ); + sz = TQSize( r * itemExtent(), c * itemExtent() ); if ( sz != size() ) { resize( sz ); @@ -445,32 +445,32 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - QWidget *top = topLevelWidget(); - QRegion mask; + TQWidget *top = topLevelWidget(); + TQRegion mask; KasItem *i; if ( orient == Horizontal ) { for ( i = items.first(); i; i = items.next() ) { int x = (items.at() % c) * itemExtent(); - if ( direction_ == QBoxLayout::RightToLeft ) + if ( direction_ == TQBoxLayout::RightToLeft ) x = width() - x - itemExtent(); i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); - mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { for ( i = items.first(); i; i = items.next() ) { int y = (items.at() / r) * itemExtent(); - if ( direction_ == QBoxLayout::BottomToTop ) + if ( direction_ == TQBoxLayout::BottomToTop ) y = height() - y - itemExtent(); i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); - mask = mask.unite( QRegion( QRect( i->pos(), QSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } @@ -526,7 +526,7 @@ void KasBar::clear() updateLayout(); } -void KasBar::mousePressEvent(QMouseEvent *ev) +void KasBar::mousePressEvent(TQMouseEvent *ev) { KasItem *i = itemAt( ev->pos() ); if ( i ) @@ -535,7 +535,7 @@ void KasBar::mousePressEvent(QMouseEvent *ev) pressPos = ev->globalPos(); } -void KasBar::mouseReleaseEvent(QMouseEvent *ev) +void KasBar::mouseReleaseEvent(TQMouseEvent *ev) { if ( !inDrag ) { KasItem *i = itemAt( ev->pos() ); @@ -547,16 +547,16 @@ void KasBar::mouseReleaseEvent(QMouseEvent *ev) emit configChanged(); } - pressPos = QPoint(); + pressPos = TQPoint(); inDrag = false; } void KasBar::updateMouseOver() { - updateMouseOver( mapFromGlobal( QCursor::pos() ) ); + updateMouseOver( mapFromGlobal( TQCursor::pos() ) ); } -void KasBar::updateMouseOver( QPoint pos ) +void KasBar::updateMouseOver( TQPoint pos ) { KasItem *i = itemAt(pos); @@ -573,10 +573,10 @@ void KasBar::updateMouseOver( QPoint pos ) itemUnderMouse_ = i; } -void KasBar::mouseMoveEvent(QMouseEvent *ev) +void KasBar::mouseMoveEvent(TQMouseEvent *ev) { if ( detached && (!pressPos.isNull()) ) { - QPoint moved = ev->globalPos() - pressPos; + TQPoint moved = ev->globalPos() - pressPos; if ( !inDrag ) { if ( moved.manhattanLength() > 6 ) { @@ -598,7 +598,7 @@ void KasBar::mouseMoveEvent(QMouseEvent *ev) } } -void KasBar::dragMoveEvent ( QDragMoveEvent *ev ) +void KasBar::dragMoveEvent ( TQDragMoveEvent *ev ) { KasItem *i = itemAt( ev->pos() ); if ( itemUnderMouse_ != i ) { @@ -610,23 +610,23 @@ void KasBar::dragMoveEvent ( QDragMoveEvent *ev ) } } -void KasBar::paintEvent(QPaintEvent *ev) +void KasBar::paintEvent(TQPaintEvent *ev) { - QPainter q( this ); + TQPainter q( this ); q.drawPixmap( ev->rect().topLeft(), offscreen, ev->rect() ); } -void KasBar::resizeEvent(QResizeEvent *ev) +void KasBar::resizeEvent(TQResizeEvent *ev) { offscreen.resize( ev->size() ); - QPainter p( &offscreen ); - paintBackground( &p, QRect(QPoint(0,0),size()) ); - QWidget::resizeEvent(ev); + TQPainter p( &offscreen ); + paintBackground( &p, TQRect(TQPoint(0,0),size()) ); + TQWidget::resizeEvent(ev); emit layoutChanged(); } -QPoint KasBar::itemPos( KasItem *i ) +TQPoint KasBar::itemPos( KasItem *i ) { return i->pos(); } @@ -638,12 +638,12 @@ void KasBar::updateItem( KasItem *i ) if ( !isShown() ) return; - QPainter p( &offscreen ); - QPoint pos = i->pos(); + TQPainter p( &offscreen ); + TQPoint pos = i->pos(); - paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - update( QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } void KasBar::repaintItem(KasItem *i, bool erase ) @@ -653,22 +653,22 @@ void KasBar::repaintItem(KasItem *i, bool erase ) if ( !isShown() ) return; - QPainter p( &offscreen ); - QPoint pos = i->pos(); + TQPainter p( &offscreen ); + TQPoint pos = i->pos(); - paintBackground( &p, QRect( pos, QSize( itemExtent(), itemExtent() ) ) ); + paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - repaint( QRect( pos, QSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } -KasItem* KasBar::itemAt(const QPoint &p) +KasItem* KasBar::itemAt(const TQPoint &p) { KasItem *i; - QRect cr; + TQRect cr; for (i = items.first(); i; i = items.next()) { cr.setTopLeft( i->pos() ); - cr.setSize( QSize( itemExtent(), itemExtent() ) ); + cr.setSize( TQSize( itemExtent(), itemExtent() ) ); if(cr.contains(p)) return i; @@ -677,12 +677,12 @@ KasItem* KasBar::itemAt(const QPoint &p) return 0; } -void KasBar::setBackground( const QPixmap &newBg ) +void KasBar::setBackground( const TQPixmap &newBg ) { bg = newBg; - QPainter p( &offscreen ); - paintBackground( &p, QRect(QPoint(0,0),size()) ); + TQPainter p( &offscreen ); + paintBackground( &p, TQRect(TQPoint(0,0),size()) ); updateLayout(); } @@ -701,7 +701,7 @@ void KasBar::setPaintInactiveFrames( bool enable ) update(); } -void KasBar::paintBackground( QPainter *p, const QRect &r ) +void KasBar::paintBackground( TQPainter *p, const TQRect &r ) { // If we're transparent if ( transparent_ ) { @@ -719,8 +719,8 @@ void KasBar::addTestItems() i->setText( "Animated" ); i->setIcon( KGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); - QTimer *aniTimer = new QTimer( i ); - connect( aniTimer, SIGNAL( timeout() ), i, SLOT( advanceAnimation() ) ); + TQTimer *aniTimer = new TQTimer( i ); + connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 297291d4f..8ff745475 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -59,10 +59,10 @@ #ifndef __KASBAR_H #define __KASBAR_H -#include <qwidget.h> -#include <qpoint.h> -#include <qptrlist.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqptrlist.h> +#include <tqlayout.h> #include "kasresources.h" @@ -71,7 +71,7 @@ class KRootPixmap; class KasItem; class KasResources; -typedef QPtrList<KasItem> KasItemList; +typedef TQPtrList<KasItem> KasItemList; /** @@ -89,13 +89,13 @@ class KDE_EXPORT KasBar : public QWidget friend class KasItem; public: - KasBar( Orientation o, QWidget *parent=0, const char *name=0, WFlags f=0 ); + KasBar( Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 ); KasBar( Orientation o, KasBar *master, - QWidget* parent=0, const char* name=0, WFlags f=0 ); + TQWidget* parent=0, const char* name=0, WFlags f=0 ); virtual ~KasBar(); - typedef QBoxLayout::Direction Direction; + typedef TQBoxLayout::Direction Direction; /** Returns true iff this is a top-level bar. This is unrelated to it being a top-level widget. */ bool isTopLevel() const { return !master_; } @@ -104,7 +104,7 @@ public: KasBar *master() const { return master_; } /** Creates a child bar of the kasbar. The child will inherit the appearance options. */ - virtual KasBar *createChildBar( Orientation o, QWidget *parent, const char *name=0 ); + virtual KasBar *createChildBar( Orientation o, TQWidget *parent, const char *name=0 ); /** Factory method that returns the singleton resources object. */ virtual KasResources *resources(); @@ -148,11 +148,11 @@ public: Direction direction() const { return direction_; } bool isDetached() const { return detached; } - QPoint detachedPosition() const { return detachedPos; } + TQPoint detachedPosition() const { return detachedPos; } bool isDrag() const { return inDrag; } - QSize sizeHint( Orientation, QSize max ); + TQSize sizeHint( Orientation, TQSize max ); // // Look and feel options @@ -167,7 +167,7 @@ public: bool hasTint() const { return enableTint_; } /** Sets the amount and color of the tint. */ - void setTint( double amount, QColor color ); + void setTint( double amount, TQColor color ); /** Sets the amount of tinting. */ void setTintAmount( double amount ) { setTint( amount, tintColour_ ); } @@ -176,7 +176,7 @@ public: double tintAmount() const { return tintAmount_; } /** Get the color of the tint. */ - QColor tintColor() const { return tintColour_; } + TQColor tintColor() const { return tintColour_; } /** Returns true iff we will paint frames around inactive items. */ bool paintInactiveFrames() const { return paintInactiveFrame_; } @@ -191,10 +191,10 @@ public: void repaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ - KasItem* itemAt(const QPoint &p); + KasItem* itemAt(const TQPoint &p); /** Get the position of the specified item. */ - QPoint itemPos( KasItem *i ); + TQPoint itemPos( KasItem *i ); /** The item under the mouse pointer (or 0). */ KasItem *itemUnderMouse() const { return itemUnderMouse_; } @@ -208,12 +208,12 @@ public slots: void setItemSize( int size ); void setItemExtent( int size ); - void setDetachedPosition( const QPoint &pos ); + void setDetachedPosition( const TQPoint &pos ); virtual void updateLayout(); void updateMouseOver(); - void updateMouseOver( QPoint pos ); + void updateMouseOver( TQPoint pos ); /** Enable or disable tinting. */ void setTint( bool enable ); @@ -222,12 +222,12 @@ public slots: void setTransparent( bool enable ); /** Set the color of the tint. */ - void setTintColor( const QColor &c ); + void setTintColor( const TQColor &c ); /** Set the strength of the tint (as a percentage). */ void setTintAmount( int percent ); - void setBackground( const QPixmap &pix ); + void setBackground( const TQPixmap &pix ); void setMasked( bool mask ); @@ -245,7 +245,7 @@ public slots: signals: void detachedChanged( bool ); - void detachedPositionChanged( const QPoint & ); + void detachedPositionChanged( const TQPoint & ); void dragStarted(); void directionChanged(); @@ -262,42 +262,42 @@ protected: KRootPixmap *rootPixmap() const { return rootPix; } /** Displays the popup menus, hides/shows windows. */ - void mousePressEvent(QMouseEvent *ev); + void mousePressEvent(TQMouseEvent *ev); /** Displays the popup menus, hides/shows windows. */ - void mouseReleaseEvent(QMouseEvent *ev); + void mouseReleaseEvent(TQMouseEvent *ev); /** Overridden to implement the mouse-over highlight effect. */ - void mouseMoveEvent(QMouseEvent *ev); + void mouseMoveEvent(TQMouseEvent *ev); /** Overridden to implement the drag-over task switching. */ - void dragMoveEvent(QDragMoveEvent *ev); + void dragMoveEvent(TQDragMoveEvent *ev); /** Paints the background of the item to the painter. */ - void paintBackground( QPainter *p, const QRect &r ); + void paintBackground( TQPainter *p, const TQRect &r ); /** Calls the paint methods for the items in the rectangle specified by the event. */ - void paintEvent(QPaintEvent *ev); + void paintEvent(TQPaintEvent *ev); /** Forces the widget to re-layout it's contents. */ - void resizeEvent(QResizeEvent *ev); + void resizeEvent(TQResizeEvent *ev); private: // Core data - QPixmap offscreen; + TQPixmap offscreen; KasBar *master_; KasItemList items; Orientation orient; Direction direction_; KasItem *itemUnderMouse_; uint boxesPerLine_; - QPoint pressPos; + TQPoint pressPos; bool inDrag; bool detached; int maxBoxes_; int itemSize_; int itemExtent_; - QPoint detachedPos; + TQPoint detachedPos; bool paintInactiveFrame_; // Implements pseudo-transparency @@ -306,7 +306,7 @@ private: KRootPixmap *rootPix; bool enableTint_; double tintAmount_; - QColor tintColour_; + TQColor tintColour_; bool useMask_; // Look and feel resources diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 6c006af16..ffd1b766e 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -104,7 +104,7 @@ int main( int argc, char **argv ) kastasker->readConfig(); kastasker->move( kastasker->detachedPosition() ); - kastasker->connect( kastasker->resources(), SIGNAL(changed()), SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -118,7 +118,7 @@ int main( int argc, char **argv ) KApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 9b1e2435e..3bc3dcd1b 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -51,7 +51,7 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qlayout.h> +#include <tqlayout.h> #include <dcopclient.h> #include <kapplication.h> @@ -74,7 +74,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( QWidget *parent, const QString& configFile ) + KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, @@ -84,10 +84,10 @@ extern "C" } } -KasBarExtension::KasBarExtension( const QString& configFile, +KasBarExtension::KasBarExtension( const TQString& configFile, Type type, int actions, - QWidget *parent, const char *name ) + TQWidget *parent, const char *name ) : KPanelExtension( configFile, type, actions, parent, name ), detached_( false ) { @@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const QString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, SIGNAL( layoutChanged() ), this, SIGNAL( updateLayout() ) ); - connect( kasbar, SIGNAL( detachedChanged(bool) ), this, SLOT( setDetached(bool) ) ); + connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); @@ -127,7 +127,7 @@ void KasBarExtension::setDetached( bool detach ) resize( detachedSize() ); } else { - kasbar->reparent( this, QPoint(0,0), true ); + kasbar->reparent( this, TQPoint(0,0), true ); kasbar->setOrientation( orientation() ); updateGeometry(); @@ -137,23 +137,23 @@ void KasBarExtension::setDetached( bool detach ) emit updateLayout(); } -void KasBarExtension::showEvent( QShowEvent */*se*/ ) +void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); repaint( true ); } -QSize KasBarExtension::detachedSize() +TQSize KasBarExtension::detachedSize() { if ( orientation() == Vertical ) - return QSize( kasbar->itemExtent()/2, 0 ); + return TQSize( kasbar->itemExtent()/2, 0 ); else - return QSize( 0, kasbar->itemExtent()/2 ); + return TQSize( 0, kasbar->itemExtent()/2 ); } -QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const +TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { Orientation o = Horizontal; @@ -162,9 +162,9 @@ QSize KasBarExtension::sizeHint(Position p, QSize maxSize ) const if ( detached_ ) { if ( o == Vertical ) - return QSize( kasbar->itemExtent()/2, 0 ); + return TQSize( kasbar->itemExtent()/2, 0 ); else - return QSize( 0, kasbar->itemExtent()/2 ); + return TQSize( 0, kasbar->itemExtent()/2 ); } return kasbar->sizeHint( o, maxSize ); diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index e85750d40..7fbb4fbc6 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -56,7 +56,7 @@ #ifndef KASBAREXTENSION_H #define KASBAREXTENSION_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kpanelextension.h> class KasTasker; @@ -69,31 +69,31 @@ class KasBarExtension : public KPanelExtension Q_OBJECT public: - KasBarExtension( const QString& configFile, + KasBarExtension( const TQString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); virtual ~KasBarExtension(); - QSize sizeHint( Position, QSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); bool isDetached() const { return detached_; } - QSize detachedSize(); + TQSize detachedSize(); public slots: void setDetached( bool detach ); protected: - void showEvent( QShowEvent *se ); + void showEvent( TQShowEvent *se ); virtual void about(); virtual void preferences(); private: - QGuardedPtr<KasTasker> kasbar; + TQGuardedPtr<KasTasker> kasbar; bool detached_; }; diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 0292a93cb..386a7922d 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -1,9 +1,9 @@ -#include <qpainter.h> -#include <qbitmap.h> -#include <qdatetime.h> -#include <qdrawutil.h> -#include <qlcdnumber.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdatetime.h> +#include <tqdrawutil.h> +#include <tqlcdnumber.h> +#include <tqtimer.h> #include <kdatepicker.h> #include <kglobal.h> @@ -26,11 +26,11 @@ class LCD : public QLCDNumber { public: - LCD( QWidget *parent, const char *name=0 ) - : QLCDNumber(parent,name) {} + LCD( TQWidget *parent, const char *name=0 ) + : TQLCDNumber(parent,name) {} ~LCD() {} - void draw( QPainter *p ) { drawContents(p); } + void draw( TQPainter *p ) { drawContents(p); } }; KasClockItem::KasClockItem( KasBar *parent ) @@ -38,23 +38,23 @@ KasClockItem::KasClockItem( KasBar *parent ) { setCustomPopup( true ); - QTimer *t = new QTimer( this ); - connect( t, SIGNAL( timeout() ), SLOT( updateTime() ) ); + TQTimer *t = new TQTimer( this ); + connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); lcd->hide(); - lcd->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); + lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); - lcd->setFrameStyle( QFrame::NoFrame ); - lcd->setSegmentStyle( QLCDNumber::Flat ); + lcd->setFrameStyle( TQFrame::NoFrame ); + lcd->setSegmentStyle( TQLCDNumber::Flat ); lcd->setNumDigits( 5 ); lcd->setAutoMask( true ); updateTime(); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() @@ -75,17 +75,17 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( QDate::currentDate(), true /* shortFormat */ ) ); - lcd->display( KGlobal::locale()->formatTime( QTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); + setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); + lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); } -void KasClockItem::paint( QPainter *p ) +void KasClockItem::paint( TQPainter *p ) { KasItem::paint( p ); - lcd->setGeometry( QRect( 0, 0, extent(), extent()-15 ) ); + lcd->setGeometry( TQRect( 0, 0, extent(), extent()-15 ) ); p->save(); p->translate( 3, 15 ); @@ -100,13 +100,13 @@ void KasClockItem::paint( QPainter *p ) p->restore(); } -void KasClockItem::showMenuAt( QMouseEvent *ev ) +void KasClockItem::showMenuAt( TQMouseEvent *ev ) { hidePopup(); showMenuAt( ev->globalPos() ); } -void KasClockItem::showMenuAt( QPoint p ) +void KasClockItem::showMenuAt( TQPoint p ) { mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h index 380901765..a95ebac7b 100644 --- a/kicker/extensions/kasbar/kasclockitem.h +++ b/kicker/extensions/kasbar/kasclockitem.h @@ -17,13 +17,13 @@ public: KasClockItem( KasBar *parent ); virtual ~KasClockItem(); - void paint( QPainter *p ); + void paint( TQPainter *p ); public slots: void updateTime(); - void showMenuAt( QMouseEvent *ev ); - void showMenuAt( QPoint p ); + void showMenuAt( TQMouseEvent *ev ); + void showMenuAt( TQPoint p ); protected: /** Reimplemented from KasItem to create a date picker. */ diff --git a/kicker/extensions/kasbar/kasgrouper.cpp b/kicker/extensions/kasbar/kasgrouper.cpp index 44dcc57b5..c1f000947 100644 --- a/kicker/extensions/kasbar/kasgrouper.cpp +++ b/kicker/extensions/kasbar/kasgrouper.cpp @@ -116,7 +116,7 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) { KasItem *item = 0; - QString taskClass = t->className().lower(); + TQString taskClass = t->className().lower(); for ( uint i = 0; (!item) && (i < kasbar->itemCount()); i++ ) { KasItem *ei = kasbar->itemAt( i ); @@ -125,8 +125,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) KasTaskItem *eti = static_cast<KasTaskItem *> (ei); - // NB This calls Task::className() not QObject::className() - QString currClass = eti->task()->className().lower(); + // NB This calls Task::className() not TQObject::className() + TQString currClass = eti->task()->className().lower(); if ( Task::idMatch( currClass, taskClass ) ) { KasGroupItem *egi = kasbar->convertToGroup( eti->task() ); @@ -140,8 +140,8 @@ KasItem *KasGrouper::maybeAddToGroup( Task::Ptr t ) for ( int i = 0; i < egi->taskCount(); i++ ) { - // NB This calls Task::className() not QObject::className() - QString currClass = egi->task( i )->className().lower(); + // NB This calls Task::className() not TQObject::className() + TQString currClass = egi->task( i )->className().lower(); if ( Task::idMatch( currClass, taskClass ) ) { egi->addTask( t ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a4435f7c2..6e03e8e3c 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -51,10 +51,10 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qpainter.h> -#include <qbitmap.h> -#include <qtimer.h> -#include <qwmatrix.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqtimer.h> +#include <tqwmatrix.h> #include <kdebug.h> #include <kglobal.h> @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, SIGNAL( layoutChanged() ), this, SLOT( hidePopup() ) ); - connect( parent, SIGNAL( layoutChanged() ), this, SLOT( update() ) ); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(togglePopup()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showGroupMenuAt(QMouseEvent *) ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, SIGNAL( changed(bool) ), this, SLOT( update() ) ); + connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); update(); } @@ -140,7 +140,7 @@ void KasGroupItem::removeTask( Task::Ptr t ) void KasGroupItem::updateIcon() { - QPixmap p; + TQPixmap p; bool usedIconLoader = false; Task::Ptr t = items.first(); if (!t) @@ -162,7 +162,7 @@ void KasGroupItem::updateIcon() setIcon( p ); } -void KasGroupItem::paint( QPainter *p ) +void KasGroupItem::paint( TQPainter *p ) { KasItem::paint( p ); @@ -180,7 +180,7 @@ void KasGroupItem::paint( QPainter *p ) p->setPen( isShowingPopup() ? res->activePenColor() : res->inactivePenColor() ); if ( modCount ) { - QString modCountStr; + TQString modCountStr; modCountStr.setNum( modCount ); p->drawText( extent()-fontMetrics().width( modCountStr )-3, 15+fontMetrics().ascent(), @@ -226,7 +226,7 @@ void KasGroupItem::paint( QPainter *p ) } if ( ((int) items.count() > microsPerCol) && ( kasbar()->itemSize() != KasBar::Small ) ) { - QString countStr; + TQString countStr; countStr.setNum( items.count() ); p->drawText( extent()-fontMetrics().width( countStr )-3, extent()+fontMetrics().ascent()-16, @@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup() KasPopup *pop = new KasPopup( this ); bar = kasbar()->createChildBar( ( kasbar()->orientation() == Horizontal ) ? Vertical : Horizontal, pop ); - connect( pop, SIGNAL(shown()), SLOT(updatePopup()) ); + connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); return pop; @@ -283,15 +283,15 @@ void KasGroupItem::ungroup() kasbar()->moveToMain( this ); } -void KasGroupItem::showGroupMenuAt( QMouseEvent *ev ) +void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) { showGroupMenuAt( ev->globalPos() ); } -void KasGroupItem::showGroupMenuAt( const QPoint &p ) +void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h index 348fb2839..e30260f57 100644 --- a/kicker/extensions/kasbar/kasgroupitem.h +++ b/kicker/extensions/kasbar/kasgroupitem.h @@ -59,7 +59,7 @@ #ifndef KASGROUPITEM_H #define KASGROUPITEM_H -#include <qpixmap.h> +#include <tqpixmap.h> #include <taskmanager.h> #include "kasitem.h" @@ -87,14 +87,14 @@ public: void setGroupType( uint type ) { groupType_ = type; } /** Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); KasTasker *kasbar() const; Task::Ptr task( uint i ) { return items.at( i ); } int taskCount() const { return items.count(); } - QPixmap icon(); + TQPixmap icon(); public slots: void addTask( Task::Ptr t ); @@ -102,8 +102,8 @@ public slots: void ungroup(); - void showGroupMenuAt( QMouseEvent *ev ); - void showGroupMenuAt( const QPoint &p ); + void showGroupMenuAt( TQMouseEvent *ev ); + void showGroupMenuAt( const TQPoint &p ); void updateIcon(); @@ -114,7 +114,7 @@ protected: virtual KasPopup *createPopup(); private: - QString title_; + TQString title_; Task::List items; uint groupType_; KasTasker *bar; diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 5cd8ef7f0..8fd795363 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -51,11 +51,11 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qcursor.h> -#include <qpainter.h> -#include <qdrawutil.h> -#include <qregexp.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqpainter.h> +#include <tqdrawutil.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -86,7 +86,7 @@ static const char *tiny_arrow[]={ static const int KASITEM_CHECK_POPUP_DELAY = 500; KasItem::KasItem( KasBar *parent ) - : QObject( parent ), + : TQObject( parent ), kas( parent ), popupTimer( 0 ), dragTimer( 0 ), title( i18n( "Kasbar" ) ), mouseOver( false ), activated( false ), @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, SIGNAL( dragStarted() ), SLOT( hidePopup() ) ); - connect( this, SIGNAL( middleButtonClicked(QMouseEvent *) ), parent, SLOT( toggleOrientation() ) ); + connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); + connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -112,7 +112,7 @@ void KasItem::setActive( bool yesno ) update(); } -void KasItem::setText( const QString &text ) +void KasItem::setText( const TQString &text ) { if ( title == text ) return; @@ -121,7 +121,7 @@ void KasItem::setText( const QString &text ) update(); } -void KasItem::setIcon( const QPixmap &p ) +void KasItem::setIcon( const TQPixmap &p ) { pix = p; update(); @@ -168,8 +168,8 @@ void KasItem::mouseEnter() static const int POPUP_DELAY = 300; if ( (!customPopup) && (popupTimer == 0) ) { - popupTimer = new QTimer( this, "popupTimer" ); - connect( popupTimer, SIGNAL( timeout() ), SLOT( showPopup() ) ); + popupTimer = new TQTimer( this, "popupTimer" ); + connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -177,7 +177,7 @@ void KasItem::mouseEnter() update(); } -void KasItem::mouseReleaseEvent( QMouseEvent *ev ) +void KasItem::mouseReleaseEvent( TQMouseEvent *ev ) { if ( ev->button() == LeftButton ) emit leftButtonClicked( ev ); @@ -195,7 +195,7 @@ void KasItem::checkPopup() if ( !pop->isVisible() ) return; - QWidget *w = QApplication::widgetAt( QCursor::pos() ); + TQWidget *w = TQApplication::widgetAt( TQCursor::pos() ); if ( !w ) { if ( popupTimer ) { delete popupTimer; @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); } } @@ -214,8 +214,8 @@ void KasItem::dragEnter() static const int DRAG_SWITCH_DELAY = 1000; if ( dragTimer == 0 ) { - dragTimer = new QTimer( this, "dragTimer" ); - connect( dragTimer, SIGNAL( timeout() ), SLOT( dragOverAction() ) ); + dragTimer = new TQTimer( this, "dragTimer" ); + connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - QTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); } void KasItem::hidePopup() @@ -296,23 +296,23 @@ void KasItem::setPopup( KasPopup *popup ) pop = popup; } -void KasItem::paintFrame( QPainter *p ) +void KasItem::paintFrame( TQPainter *p ) { if ( !frame ) return; qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); - QPen pen; + TQPen pen; if ( mouseOver ) { if ( attention_ ) { - pen = QPen( resources()->attentionColor(), 2 ); + pen = TQPen( resources()->attentionColor(), 2 ); p->setPen( pen ); p->drawRect( 0, 0, extent(), extent()); } else { - pen = QPen( Qt::white ); + pen = TQPen( Qt::white ); p->setPen( pen ); p->drawRect(0, 0, extent(), extent()); } @@ -323,15 +323,15 @@ void KasItem::paintFrame( QPainter *p ) } } -void KasItem::paintLabel( QPainter *p ) +void KasItem::paintLabel( TQPainter *p ) { - QString text = title; + TQString text = title; if ( !groupItem ) { - p->fillRect( 2, 2, extent()-4, 13, QBrush( resources()->labelBgColor() ) ); + p->fillRect( 2, 2, extent()-4, 13, TQBrush( resources()->labelBgColor() ) ); if ( isProgressItem() ) { - QRegExp reg( "(1?[0-9]?[0-9])%" ); + TQRegExp reg( "(1?[0-9]?[0-9])%" ); if ( -1 != reg.search( text ) ) { prog = reg.cap(1).toInt(); paintProgress( p, prog ); @@ -352,11 +352,11 @@ void KasItem::paintLabel( QPainter *p ) return; } else { - QPixmap arrow( tiny_arrow ); + TQPixmap arrow( tiny_arrow ); - QPoint popupPos = KasPopup::calcPosition( this, 10, 10 ); - QPoint iPos = kas->mapToGlobal( kas->itemPos( this ) ); - QWMatrix turn; + TQPoint popupPos = KasPopup::calcPosition( this, 10, 10 ); + TQPoint iPos = kas->mapToGlobal( kas->itemPos( this ) ); + TQWMatrix turn; if ( popupPos.x() < iPos.x() ) { paintArrowLabel( p, arrow.width(), true ); @@ -385,16 +385,16 @@ void KasItem::paintLabel( QPainter *p ) } } -void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ) +void KasItem::paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ) { - QString text = title; + TQString text = title; int lx = 2; int ly = 2; int w = extent()-4; int h = 13; arrowSize+=2; // Add a space - p->fillRect( lx, ly, w, h, QBrush( resources()->labelBgColor() ) ); + p->fillRect( lx, ly, w, h, TQBrush( resources()->labelBgColor() ) ); // Adjust for arrow if ( arrowOnLeft ) { @@ -413,13 +413,13 @@ void KasItem::paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ) p->drawText( lx, ly, w, h-1, AlignCenter, text ); } -void KasItem::paintModified( QPainter *p ) +void KasItem::paintModified( TQPainter *p ) { if ( modified ) p->drawPixmap(extent()-12, extent()-22, resources()->modifiedIcon() ); } -void KasItem::paintBackground( QPainter *p ) +void KasItem::paintBackground( TQPainter *p ) { if ( activated ) p->drawPixmap( 0, 0, resources()->activeBg() ); @@ -429,13 +429,13 @@ void KasItem::paintBackground( QPainter *p ) p->drawPixmap( 0, 0, resources()->inactiveBg() ); } -void KasItem::paintProgress( QPainter *p, int percent ) +void KasItem::paintProgress( TQPainter *p, int percent ) { double amt = (extent()-4) * (percent / 100.0L); - p->fillRect( 2, 13, (int) amt, 2, QBrush( resources()->progressColor() ) ); + p->fillRect( 2, 13, (int) amt, 2, TQBrush( resources()->progressColor() ) ); } -void KasItem::paintStateIcon( QPainter *p, uint state ) +void KasItem::paintStateIcon( TQPainter *p, uint state ) { if ( kas->itemSize() != KasBar::Small ) { switch(state) { @@ -469,7 +469,7 @@ void KasItem::paintStateIcon( QPainter *p, uint state ) } } -void KasItem::paintAttention( QPainter *p ) +void KasItem::paintAttention( TQPainter *p ) { p->setPen( resources()->attentionColor() ); p->drawPixmap( 3, extent()-11, resources()->attentionIcon() ); @@ -500,12 +500,12 @@ void KasItem::setShowAnimation( bool yes ) update(); } -void KasItem::paintAnimation( QPainter *p ) +void KasItem::paintAnimation( TQPainter *p ) { if ( (aniFrame+1) > anim.count() ) return; - QPixmap pix = anim[ aniFrame ]; + TQPixmap pix = anim[ aniFrame ]; if ( pix.isNull() ) return; @@ -515,7 +515,7 @@ void KasItem::paintAnimation( QPainter *p ) p->drawPixmap( extent()-18, 16, pix ); } -void KasItem::paintIcon( QPainter *p ) +void KasItem::paintIcon( TQPainter *p ) { if ( pix.isNull() ) return; @@ -525,7 +525,7 @@ void KasItem::paintIcon( QPainter *p ) p->drawPixmap( x-4, y+15, pix ); } -void KasItem::paint( QPainter *p ) +void KasItem::paint( TQPainter *p ) { paintBackground( p ); paintFrame( p ); @@ -539,7 +539,7 @@ void KasItem::paint( QPainter *p ) paintAttention( p ); } -void KasItem::paint( QPainter *p, int x, int y ) +void KasItem::paint( TQPainter *p, int x, int y ) { p->save(); p->translate( x, y ); diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 3555d576f..268754f75 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -60,10 +60,10 @@ class QPainter; class QMouseEvent; class KasPopup; -#include <qobject.h> -#include <qguardedptr.h> -#include <qpoint.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqguardedptr.h> +#include <tqpoint.h> +#include <tqvaluevector.h> #include <kdemacros.h> @@ -81,7 +81,7 @@ class KDE_EXPORT KasItem : public QObject public: friend class KasBar; - typedef QValueVector<QPixmap> PixmapList; + typedef TQValueVector<TQPixmap> PixmapList; /** The states that a window can be in. */ enum WindowState { @@ -98,12 +98,12 @@ public: int extent() const { return kas->itemExtent(); } /** Returns the text that will be displayed in the title. */ - QString text() const { return title; } + TQString text() const { return title; } /** Returns the position of this item. */ - QPoint pos() const { return pos_; } - void setPos( const QPoint &p ) { pos_ = p; } - void setPos( int x, int y ) { pos_ = QPoint( x, y ); } + TQPoint pos() const { return pos_; } + void setPos( const TQPoint &p ) { pos_ = p; } + void setPos( int x, int y ) { pos_ = TQPoint( x, y ); } /** Returns the progress so far. This will -1 if the item is not displaying progress info. */ int progress() const { return prog; } @@ -147,27 +147,27 @@ public: // Drawing Methods // - /** Translates the QPainter then calls paintItem(). */ - void paint( QPainter *p, int x, int y ); + /** Translates the TQPainter then calls paintItem(). */ + void paint( TQPainter *p, int x, int y ); /** * Subclasses should reimplement this method to paint themselves. The painter is setup so * that the item is always at 0, 0. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); /** Draw a standard frame for the item. */ - void paintFrame( QPainter *p ); + void paintFrame( TQPainter *p ); /** Paint the background. */ - void paintBackground( QPainter *p ); + void paintBackground( TQPainter *p ); /** Draw the label for the item. */ - void paintLabel( QPainter *p ); + void paintLabel( TQPainter *p ); - void paintIcon( QPainter *p ); + void paintIcon( TQPainter *p ); - void paintModified( QPainter *p ); + void paintModified( TQPainter *p ); public slots: void repaint(); @@ -175,8 +175,8 @@ public slots: void update(); void setActive( bool yes ); - void setText( const QString &title ); - void setIcon( const QPixmap &icon ); + void setText( const TQString &title ); + void setIcon( const TQPixmap &icon ); void setProgress( int percent ); void setShowFrame( bool yes ); void setModified( bool yes ); @@ -206,43 +206,43 @@ public slots: virtual void dragOverAction() {} signals: - void leftButtonClicked( QMouseEvent *ev ); - void middleButtonClicked( QMouseEvent *ev ); - void rightButtonClicked( QMouseEvent *ev ); + void leftButtonClicked( TQMouseEvent *ev ); + void middleButtonClicked( TQMouseEvent *ev ); + void rightButtonClicked( TQMouseEvent *ev ); protected: KasResources *resources() { return kas->resources(); } /** Gets the font metrics from the parent. */ - QFontMetrics fontMetrics() const { return kas->fontMetrics(); } + TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const QColorGroup &colorGroup() const { return kas->colorGroup(); } + const TQColorGroup &colorGroup() const { return kas->colorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); /** Draw a label with an arrow, the parameters specify the position and size of the arrow. */ - void paintArrowLabel( QPainter *p, int arrowSize, bool arrowOnLeft ); + void paintArrowLabel( TQPainter *p, int arrowSize, bool arrowOnLeft ); /** Paints a progress graph. */ - void paintProgress( QPainter *p, int percent ); + void paintProgress( TQPainter *p, int percent ); - void paintStateIcon( QPainter *p, uint state ); + void paintStateIcon( TQPainter *p, uint state ); - void paintAttention( QPainter *p ); + void paintAttention( TQPainter *p ); - void paintAnimation( QPainter *p ); + void paintAnimation( TQPainter *p ); // // Event Handlers // /** Called when the item receives a mouse event. */ - virtual void mousePressEvent( QMouseEvent * ) {} + virtual void mousePressEvent( TQMouseEvent * ) {} /** Called when the item receives a mouse event. */ - virtual void mouseReleaseEvent( QMouseEvent * ); + virtual void mouseReleaseEvent( TQMouseEvent * ); /** Called when the mouse enters the item. */ virtual void mouseEnter(); @@ -258,13 +258,13 @@ protected: private: KasBar *kas; - QGuardedPtr<KasPopup> pop; - QTimer *popupTimer; - QTimer *dragTimer; + TQGuardedPtr<KasPopup> pop; + TQTimer *popupTimer; + TQTimer *dragTimer; - QPoint pos_; - QString title; - QPixmap pix; + TQPoint pos_; + TQString title; + TQPixmap pix; bool mouseOver; bool activated; bool customPopup; diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index b0f9c23e3..2d33a068d 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -6,11 +6,11 @@ #include <sys/loadavg.h> // e.g. Solaris #endif -#include <qpainter.h> -#include <qbitmap.h> -#include <qdatetime.h> -#include <qdrawutil.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdatetime.h> +#include <tqdrawutil.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -33,12 +33,12 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { - QTimer *t = new QTimer( this ); - connect( t, SIGNAL( timeout() ), SLOT( updateDisplay() ) ); + TQTimer *t = new TQTimer( this ); + connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() @@ -63,10 +63,10 @@ void KasLoadItem::updateDisplay() valuesFifteen.pop_front(); } - setText( QString("%1").arg( valuesOne.last(), 3, 'f', 2 ) ); + setText( TQString("%1").arg( valuesOne.last(), 3, 'f', 2 ) ); } -void KasLoadItem::paint( QPainter *p ) +void KasLoadItem::paint( TQPainter *p ) { double val = valuesOne.last(); double maxValue = 1.0; @@ -95,8 +95,8 @@ void KasLoadItem::paint( QPainter *p ) KasItem::paint( p ); - QColor light = kasbar()->colorGroup().highlight(); - QColor dark = light.dark(); + TQColor light = kasbar()->colorGroup().highlight(); + TQColor dark = light.dark(); KPixmap pix; pix.resize( w, h ); @@ -110,13 +110,13 @@ void KasLoadItem::paint( QPainter *p ) } } -void KasLoadItem::showMenuAt( QMouseEvent *ev ) +void KasLoadItem::showMenuAt( TQMouseEvent *ev ) { hidePopup(); showMenuAt( ev->globalPos() ); } -void KasLoadItem::showMenuAt( QPoint p ) +void KasLoadItem::showMenuAt( TQPoint p ) { mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index 527a85abc..ba2fd5ff4 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -19,17 +19,17 @@ public: KasLoadItem( KasBar *parent ); virtual ~KasLoadItem(); - void paint( QPainter *p ); + void paint( TQPainter *p ); public slots: void updateDisplay(); - void showMenuAt( QMouseEvent *ev ); - void showMenuAt( QPoint p ); + void showMenuAt( TQMouseEvent *ev ); + void showMenuAt( TQPoint p ); private: - QValueList<double> valuesOne; - QValueList<double> valuesFive; - QValueList<double> valuesFifteen; + TQValueList<double> valuesOne; + TQValueList<double> valuesFive; + TQValueList<double> valuesFifteen; }; #endif // KASLOADITEM_H diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 4407f2f48..7538dfbb2 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -51,7 +51,7 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qapplication.h> +#include <tqapplication.h> #include "kasitem.h" #include "kasbar.h" @@ -60,7 +60,7 @@ #include "kaspopup.moc" KasPopup::KasPopup( KasItem *item, const char *name ) - : QHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), + : TQHBox( 0, name, WStyle_Customize | WStyle_StaysOnTop | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), item_( item ), kasbar_( item->kasbar() ) { @@ -79,17 +79,17 @@ void KasPopup::show() { emit aboutToShow(); positionSelf(); - QWidget::show(); + TQWidget::show(); emit shown(); } -QPoint KasPopup::calcPosition( KasItem *item, int w, int h ) +TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) { KasBar *kasbar = item->kasbar(); - QPoint pos = kasbar->itemPos( item ); + TQPoint pos = kasbar->itemPos( item ); if ( ( pos.x() < 0 ) && ( pos.y() < 0 ) ) - return QPoint(); + return TQPoint(); pos = kasbar->mapToGlobal( pos ); int x = pos.x(); @@ -114,7 +114,7 @@ QPoint KasPopup::calcPosition( KasItem *item, int w, int h ) y = y - h + kasbar->itemExtent(); } - return QPoint( x, y ); + return TQPoint( x, y ); } diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h index 11c024782..811202b62 100644 --- a/kicker/extensions/kasbar/kaspopup.h +++ b/kicker/extensions/kasbar/kaspopup.h @@ -56,8 +56,8 @@ #ifndef KASPOPUP_H #define KASPOPUP_H -#include <qguardedptr.h> -#include <qhbox.h> +#include <tqguardedptr.h> +#include <tqhbox.h> #include <kpixmap.h> #include "kasitem.h" @@ -81,7 +81,7 @@ public: KasItem *item() const { return item_; } KasBar *kasbar() const { return kasbar_; } - static QPoint calcPosition( KasItem *item, int w, int h ); + static TQPoint calcPosition( KasItem *item, int w, int h ); public slots: /** @@ -98,7 +98,7 @@ signals: void shown(); private: - QGuardedPtr<KasItem> item_; + TQGuardedPtr<KasItem> item_; KasBar *kasbar_; }; diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index d6f0cf39f..e81b0aacb 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -52,15 +52,15 @@ ** Bug reports and questions can be sent to [email protected] */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qgrid.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qslider.h> -#include <qspinbox.h> -#include <qvbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqgrid.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqspinbox.h> +#include <tqvbox.h> +#include <tqwhatsthis.h> #include <kcolorbutton.h> #include <kconfig.h> @@ -79,7 +79,7 @@ #define LargeIcon(x) KGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) -KasPrefsDialog::KasPrefsDialog( KasTasker *kas, QWidget *parent ) +KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("Kasbar Preferences"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, @@ -110,21 +110,21 @@ void KasPrefsDialog::itemSizeChanged( int sz ) void KasPrefsDialog::addLookPage() { - QVBox *lookPage = addVBoxPage( i18n("Appearance"), QString::null, Icon( "appearance" ) ); + TQVBox *lookPage = addVBoxPage( i18n("Appearance"), TQString::null, Icon( "appearance" ) ); // // Item size // - QGrid *itemSizeBox = new QGrid( 2, lookPage ); + TQGrid *itemSizeBox = new TQGrid( 2, lookPage ); itemSizeBox->setSpacing( spacingHint() ); - QWhatsThis::add( itemSizeBox, + TQWhatsThis::add( itemSizeBox, i18n( "Specifies the size of the task items." ) ); - QLabel *itemSizeLabel = new QLabel( i18n("Si&ze:"), itemSizeBox ); + TQLabel *itemSizeLabel = new TQLabel( i18n("Si&ze:"), itemSizeBox ); - itemSizeCombo = new QComboBox( itemSizeBox ); + itemSizeCombo = new TQComboBox( itemSizeBox ); itemSizeCombo->insertItem( i18n( "Enormous" ) ); itemSizeCombo->insertItem( i18n( "Huge" ) ); itemSizeCombo->insertItem( i18n( "Large" ) ); @@ -134,20 +134,20 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, SIGNAL( activated( int ) ), - kasbar, SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, SIGNAL( activated( int ) ), SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), + kasbar, TQT_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); - new QWidget( itemSizeBox ); + new TQWidget( itemSizeBox ); - customSize = new QSpinBox( 5, 1000, 1, itemSizeBox ); + customSize = new TQSpinBox( 5, 1000, 1, itemSizeBox ); customSize->setValue( kasbar->itemExtent() ); - connect( customSize, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setItemExtent( int ) ) ); - connect( customSize, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -157,12 +157,12 @@ void KasPrefsDialog::addLookPage() // Boxes per line // - QHBox *maxBoxesBox = new QHBox( lookPage ); - QWhatsThis::add( maxBoxesBox, + TQHBox *maxBoxesBox = new TQHBox( lookPage ); + TQWhatsThis::add( maxBoxesBox, i18n( "Specifies the maximum number of items that should be placed in a line " "before starting a new row or column. If the value is 0 then all the " "available space will be used." ) ); - QLabel *maxBoxesLabel = new QLabel( i18n("Bo&xes per line: "), maxBoxesBox ); + TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox ); KConfig *conf = kasbar->config(); if ( conf ) @@ -171,273 +171,273 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, SIGNAL( valueChanged( int ) ), kasbar, SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // // Mode // - detachedCheck = new QCheckBox( i18n("&Detach from screen edge"), lookPage ); - QWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) ); + detachedCheck = new TQCheckBox( i18n("&Detach from screen edge"), lookPage ); + TQWhatsThis::add( detachedCheck, i18n( "Detaches the bar from the screen edge and makes it draggable." ) ); detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); - (void) new QWidget( lookPage, "spacer" ); - (void) new QWidget( lookPage, "spacer" ); - (void) new QWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); + (void) new TQWidget( lookPage, "spacer" ); } void KasPrefsDialog::addBackgroundPage() { - QVBox *bgPage = addVBoxPage( i18n("Background"), QString::null, Icon( "background" ) ); + TQVBox *bgPage = addVBoxPage( i18n("Background"), TQString::null, Icon( "background" ) ); - transCheck = new QCheckBox( i18n("Trans&parent"), bgPage ); - QWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); + transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); + TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTransparent(bool) ) ); + connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); - tintCheck = new QCheckBox( i18n("Enable t&int"), bgPage ); - QWhatsThis::add( tintCheck, + tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage ); + TQWhatsThis::add( tintCheck, i18n( "Enables tinting the background that shows through in transparent mode." ) ); tintCheck->setChecked( kasbar->hasTint() ); - connect( tintCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setTint(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); - QHBox *tintColBox = new QHBox( bgPage ); - QWhatsThis::add( tintColBox, + TQHBox *tintColBox = new TQHBox( bgPage ); + TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, SIGNAL( toggled(bool) ), tintColBox, SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); - QLabel *tintLabel = new QLabel( i18n("Tint &color:"), tintColBox ); + TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, SIGNAL( changed( const QColor & ) ), - kasbar, SLOT( setTintColor( const QColor & ) ) ); + connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), + kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); - QHBox *tintAmtBox = new QHBox( bgPage ); - QWhatsThis::add( tintAmtBox, + TQHBox *tintAmtBox = new TQHBox( bgPage ); + TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, SIGNAL( toggled(bool) ), tintAmtBox, SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); - QLabel *tintStrengthLabel = new QLabel( i18n("Tint &strength: "), tintAmtBox ); + TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); int percent = (int) (kasbar->tintAmount() * 100.0); - tintAmount = new QSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); + tintAmount = new TQSlider( 0, 100, 1, percent, Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); - (void) new QWidget( bgPage, "spacer" ); - (void) new QWidget( bgPage, "spacer" ); - (void) new QWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); + (void) new TQWidget( bgPage, "spacer" ); } void KasPrefsDialog::addThumbsPage() { - QVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), QString::null, Icon( "icons" ) ); + TQVBox *thumbsPage = addVBoxPage( i18n("Thumbnails"), TQString::null, Icon( "icons" ) ); - thumbsCheck = new QCheckBox( i18n("Enable thu&mbnails"), thumbsPage ); - QWhatsThis::add( thumbsCheck, + thumbsCheck = new TQCheckBox( i18n("Enable thu&mbnails"), thumbsPage ); + TQWhatsThis::add( thumbsCheck, i18n( "Enables the display of a thumbnailed image of the window when " "you move your mouse pointer over an item. The thumbnails are " "approximate, and may not reflect the current window contents.\n\n" "Using this option on a slow machine may cause performance problems." ) ); thumbsCheck->setChecked( kasbar->thumbnailsEnabled() ); - connect( thumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); - embedThumbsCheck = new QCheckBox( i18n("&Embed thumbnails"), thumbsPage ); + embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); - QHBox *thumbSizeBox = new QHBox( thumbsPage ); - QWhatsThis::add( thumbSizeBox, + TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); + TQWhatsThis::add( thumbSizeBox, i18n( "Controls the size of the window thumbnails. Using large sizes may " "cause performance problems." ) ); - QLabel *thumbSizeLabel = new QLabel( i18n("Thumbnail &size: "), thumbSizeBox ); + TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); - thumbSizeSlider = new QSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setThumbnailSize( int ) ) ); + thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Horizontal, thumbSizeBox ); + connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); - QHBox *thumbUpdateBox = new QHBox( thumbsPage ); + TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); thumbUpdateBox->setSpacing( spacingHint() ); - QWhatsThis::add( thumbUpdateBox, + TQWhatsThis::add( thumbUpdateBox, i18n( "Controls the frequency with which the thumbnail of the active window " "is updated. If the value is 0 then no updates will be performed.\n\n" "Using small values may cause performance problems on slow machines." ) ); - QLabel *thumbUpdateLabel = new QLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); - thumbUpdateSpin = new QSpinBox( 0, 1000, 1, thumbUpdateBox ); + TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); + thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, SIGNAL( valueChanged( int ) ), - kasbar, SLOT( setThumbnailUpdateDelay( int ) ) ); - (void) new QLabel( i18n("seconds"), thumbUpdateBox ); + connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), + kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); - (void) new QWidget( thumbsPage, "spacer" ); - (void) new QWidget( thumbsPage, "spacer" ); - (void) new QWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); + (void) new TQWidget( thumbsPage, "spacer" ); } void KasPrefsDialog::addBehavePage() { - QVBox *behavePage = addVBoxPage( i18n("Behavior"), QString::null, Icon( "window_list" ) ); + TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) ); - groupWindowsCheck = new QCheckBox( i18n("&Group windows"), behavePage ); - QWhatsThis::add( groupWindowsCheck, + groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage ); + TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, SIGNAL( toggled(bool) ), - kasbar, SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), + kasbar, TQT_SLOT( setGroupWindows(bool) ) ); - showAllWindowsCheck = new QCheckBox( i18n("Show all &windows"), behavePage ); - QWhatsThis::add( showAllWindowsCheck, + showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage ); + TQWhatsThis::add( showAllWindowsCheck, i18n( "Enables the display of all windows, not just those on the current desktop." ) ); showAllWindowsCheck->setChecked( kasbar->showAllWindows() ); - connect( showAllWindowsCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); - groupInactiveCheck = new QCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); - QWhatsThis::add( groupInactiveCheck, + groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); + TQWhatsThis::add( groupInactiveCheck, i18n( "Enables the grouping together of windows that are not on the current desktop." ) ); groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() ); - connect( groupInactiveCheck, SIGNAL( toggled(bool) ), - kasbar, SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ), + kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); - onlyShowMinimizedCheck = new QCheckBox( i18n("Only show &minimized windows"), behavePage ); - QWhatsThis::add( onlyShowMinimizedCheck, + onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); + TQWhatsThis::add( onlyShowMinimizedCheck, i18n( "When this option is checked only minimized windows are shown in the bar. " \ "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); - (void) new QWidget( behavePage, "spacer" ); - (void) new QWidget( behavePage, "spacer" ); + (void) new TQWidget( behavePage, "spacer" ); + (void) new TQWidget( behavePage, "spacer" ); } void KasPrefsDialog::addColorsPage() { - QVBox *colorsPage = addVBoxPage( i18n("Colors"), QString::null, Icon( "colors" ) ); + TQVBox *colorsPage = addVBoxPage( i18n("Colors"), TQString::null, Icon( "colors" ) ); // Item label colors - QGrid *group = new QGrid( 2, colorsPage ); + TQGrid *group = new TQGrid( 2, colorsPage ); - QLabel *labelPenLabel = new QLabel( i18n("Label foreground:"), group ); + TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setLabelPenColor( const QColor & ) ) ); + connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); - QLabel *labelBackgroundLabel = new QLabel( i18n("Label background:"), group ); + TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setLabelBgColor( const QColor & ) ) ); + connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *inactivePenLabel = new QLabel( i18n("Inactive foreground:"), group ); + TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setInactivePenColor( const QColor & ) ) ); + connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); - QLabel *inactiveBgLabel = new QLabel( i18n("Inactive background:"), group ); + TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setInactiveBgColor( const QColor & ) ) ); + connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *activePenLabel = new QLabel( i18n("Active foreground:"), group ); + TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setActivePenColor( const QColor & ) ) ); + connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); - QLabel *activeBgLabel = new QLabel( i18n("Active background:"), group ); + TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setActiveBgColor( const QColor & ) ) ); + connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); - group = new QGrid( 2, colorsPage ); + group = new TQGrid( 2, colorsPage ); - QLabel *progressLabel = new QLabel( i18n("&Progress color:"), group ); + TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setProgressColor( const QColor & ) ) ); + connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); - QLabel *attentionLabel = new QLabel( i18n("&Attention color:"), group ); + TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, SIGNAL( changed( const QColor & ) ), - res, SLOT( setAttentionColor( const QColor & ) ) ); + connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), + res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); - (void) new QWidget( colorsPage, "spacer" ); + (void) new TQWidget( colorsPage, "spacer" ); } void KasPrefsDialog::addIndicatorsPage() { - QVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), QString::null, Icon( "bell" ) ); + TQVBox *indicatorsPage = addVBoxPage( i18n("Indicators"), TQString::null, Icon( "bell" ) ); - (void) new QWidget( indicatorsPage, "spacer" ); - (void) new QWidget( indicatorsPage, "spacer" ); + (void) new TQWidget( indicatorsPage, "spacer" ); + (void) new TQWidget( indicatorsPage, "spacer" ); } void KasPrefsDialog::addAdvancedPage() { - QVBox *advancedPage = addVBoxPage( i18n("Advanced"), QString::null, Icon( "misc" ) ); + TQVBox *advancedPage = addVBoxPage( i18n("Advanced"), TQString::null, Icon( "misc" ) ); // Startup notifier - notifierCheck = new QCheckBox( i18n("Enable &startup notifier"), advancedPage ); - QWhatsThis::add( notifierCheck, + notifierCheck = new TQCheckBox( i18n("Enable &startup notifier"), advancedPage ); + TQWhatsThis::add( notifierCheck, i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); // Status advanced - modifiedCheck = new QCheckBox( i18n("Enable &modified indicator"), advancedPage ); - QWhatsThis::add( modifiedCheck, + modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); + TQWhatsThis::add( modifiedCheck, i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); - progressCheck = new QCheckBox( i18n("Enable &progress indicator"), advancedPage ); - QWhatsThis::add( progressCheck, + progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); + TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress bar in the label of windows show " "are progress indicators." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); - attentionCheck = new QCheckBox( i18n("Enable &attention indicator"), advancedPage ); - QWhatsThis::add( attentionCheck, + attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage ); + TQWhatsThis::add( attentionCheck, i18n( "Enables the display of an icon that indicates a window that needs attention." ) ); attentionCheck->setChecked( kasbar->showAttention() ); - connect( attentionCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); - inactiveFramesCheck = new QCheckBox( i18n("Enable frames for inactive items"), advancedPage ); - QWhatsThis::add( inactiveFramesCheck, + inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage ); + TQWhatsThis::add( inactiveFramesCheck, i18n( "Enables frames around inactive items, if you want the bar to disappear into " \ "the background you should probably uncheck this option." ) ); inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() ); - connect( inactiveFramesCheck, SIGNAL( toggled(bool) ), kasbar, SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); - (void) new QWidget( advancedPage, "spacer" ); - (void) new QWidget( advancedPage, "spacer" ); + (void) new TQWidget( advancedPage, "spacer" ); + (void) new TQWidget( advancedPage, "spacer" ); } void KasPrefsDialog::customSizeChanged ( int value ) @@ -458,11 +458,11 @@ void KasPrefsDialog::accept() conf->sync(); } - QDialog::accept(); + TQDialog::accept(); } void KasPrefsDialog::reject() { kasbar->readConfig(); - QDialog::reject(); + TQDialog::reject(); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h index 8c6bb3200..c8faeb317 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.h +++ b/kicker/extensions/kasbar/kasprefsdlg.h @@ -79,7 +79,7 @@ class KasPrefsDialog : public KDialogBase Q_OBJECT public: - KasPrefsDialog( KasTasker *kas, QWidget *parent=0 ); + KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 ); ~KasPrefsDialog(); void addLookPage(); @@ -102,27 +102,27 @@ private slots: private: - QComboBox *itemSizeCombo; - QSpinBox *customSize; - QCheckBox *transCheck; - QCheckBox *tintCheck; + TQComboBox *itemSizeCombo; + TQSpinBox *customSize; + TQCheckBox *transCheck; + TQCheckBox *tintCheck; KColorButton *tintButton; - QSlider *tintAmount; - QCheckBox *thumbsCheck; - QCheckBox *embedThumbsCheck; - QSlider *thumbSizeSlider; - QSpinBox *thumbUpdateSpin; - QCheckBox *notifierCheck; - QCheckBox *modifiedCheck; - QCheckBox *progressCheck; - QCheckBox *showAllWindowsCheck; - QCheckBox *onlyShowMinimizedCheck; + TQSlider *tintAmount; + TQCheckBox *thumbsCheck; + TQCheckBox *embedThumbsCheck; + TQSlider *thumbSizeSlider; + TQSpinBox *thumbUpdateSpin; + TQCheckBox *notifierCheck; + TQCheckBox *modifiedCheck; + TQCheckBox *progressCheck; + TQCheckBox *showAllWindowsCheck; + TQCheckBox *onlyShowMinimizedCheck; KIntSpinBox *maxBoxesSpin; - QCheckBox *detachedCheck; - QCheckBox *groupWindowsCheck; - QCheckBox *groupInactiveCheck; - QCheckBox *attentionCheck; - QCheckBox *inactiveFramesCheck; + TQCheckBox *detachedCheck; + TQCheckBox *groupWindowsCheck; + TQCheckBox *groupInactiveCheck; + TQCheckBox *attentionCheck; + TQCheckBox *inactiveFramesCheck; KColorButton *labelPenButton; KColorButton *labelBackgroundButton; diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 0248642f4..78b25e8c0 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -124,7 +124,7 @@ static const char *micro_shade[]={ }; KasResources::KasResources( KasBar *parent, const char *name ) - : QObject( parent, name ? name : "kasbar_resources" ), + : TQObject( parent, name ? name : "kasbar_resources" ), kasbar( parent ), labelPenColor_( Qt::white ), labelBgColor_( Qt::black ), activePenColor_( Qt::black ), activeBgColor_( Qt::white ), @@ -138,85 +138,85 @@ KasResources::~KasResources() { } -QBitmap KasResources::minIcon() +TQBitmap KasResources::minIcon() { if ( minPix.isNull() ) { - minPix = QBitmap(8, 8, min_bits, true); + minPix = TQBitmap(8, 8, min_bits, true); minPix.setMask(minPix); } return minPix; } -QBitmap KasResources::maxIcon() +TQBitmap KasResources::maxIcon() { if ( maxPix.isNull() ) { - maxPix = QBitmap(8, 8, max_bits, true); + maxPix = TQBitmap(8, 8, max_bits, true); maxPix.setMask(maxPix); } return maxPix; } -QBitmap KasResources::shadeIcon() +TQBitmap KasResources::shadeIcon() { if ( shadePix.isNull() ) { - shadePix = QBitmap(8, 8, shade_bits, true); + shadePix = TQBitmap(8, 8, shade_bits, true); shadePix.setMask(shadePix); } return shadePix; } -QBitmap KasResources::attentionIcon() +TQBitmap KasResources::attentionIcon() { if ( attentionPix.isNull() ) { - attentionPix = QBitmap( 8, 8, attention_bits, true ); + attentionPix = TQBitmap( 8, 8, attention_bits, true ); attentionPix.setMask( attentionPix ); } return attentionPix; } -QPixmap KasResources::modifiedIcon() +TQPixmap KasResources::modifiedIcon() { if ( modifiedPix.isNull() ) - modifiedPix = QPixmap( tiny_floppy ); + modifiedPix = TQPixmap( tiny_floppy ); return modifiedPix; } -QPixmap KasResources::microShadeIcon() +TQPixmap KasResources::microShadeIcon() { if ( microShadePix.isNull() ) - microShadePix = QPixmap( micro_shade ); + microShadePix = TQPixmap( micro_shade ); return microShadePix; } -QPixmap KasResources::microMaxIcon() +TQPixmap KasResources::microMaxIcon() { if ( microMaxPix.isNull() ) - microMaxPix = QPixmap( micro_max ); + microMaxPix = TQPixmap( micro_max ); return microMaxPix; } -QPixmap KasResources::microMinIcon() +TQPixmap KasResources::microMinIcon() { if ( microMinPix.isNull() ) - microMinPix = QPixmap( micro_min ); + microMinPix = TQPixmap( micro_min ); return microMinPix; } static const int MAX_ANIMATION_FRAME=10; -QValueVector<QPixmap> KasResources::startupAnimation() +TQValueVector<TQPixmap> KasResources::startupAnimation() { if ( startupFrames_.isEmpty() ) { for ( int i = 1; i <= MAX_ANIMATION_FRAME; i++ ) { - QPixmap p( locate("data", "kicker/pics/disk" + QString::number(i) + ".png") ); + TQPixmap p( locate("data", "kicker/pics/disk" + TQString::number(i) + ".png") ); if ( !p.isNull() ) startupFrames_.append( p ); } @@ -225,7 +225,7 @@ QValueVector<QPixmap> KasResources::startupAnimation() return startupFrames_; } -void KasResources::setLabelPenColor( const QColor &color ) +void KasResources::setLabelPenColor( const TQColor &color ) { if ( labelPenColor_ == color ) return; @@ -234,7 +234,7 @@ void KasResources::setLabelPenColor( const QColor &color ) emit changed(); } -void KasResources::setLabelBgColor( const QColor &color ) +void KasResources::setLabelBgColor( const TQColor &color ) { if ( labelBgColor_ == color ) return; @@ -243,7 +243,7 @@ void KasResources::setLabelBgColor( const QColor &color ) emit changed(); } -void KasResources::setInactivePenColor( const QColor &color ) +void KasResources::setInactivePenColor( const TQColor &color ) { if ( inactivePenColor_ == color ) return; @@ -252,7 +252,7 @@ void KasResources::setInactivePenColor( const QColor &color ) emit changed(); } -void KasResources::setInactiveBgColor( const QColor &color ) +void KasResources::setInactiveBgColor( const TQColor &color ) { if ( inactiveBgColor_ == color ) return; @@ -261,7 +261,7 @@ void KasResources::setInactiveBgColor( const QColor &color ) emit changed(); } -void KasResources::setActivePenColor( const QColor &color ) +void KasResources::setActivePenColor( const TQColor &color ) { if ( activePenColor_ == color ) return; @@ -270,7 +270,7 @@ void KasResources::setActivePenColor( const QColor &color ) emit changed(); } -void KasResources::setActiveBgColor( const QColor &color ) +void KasResources::setActiveBgColor( const TQColor &color ) { if ( activeBgColor_ == color ) return; @@ -279,7 +279,7 @@ void KasResources::setActiveBgColor( const QColor &color ) emit changed(); } -void KasResources::setProgressColor( const QColor &color ) +void KasResources::setProgressColor( const TQColor &color ) { if ( progressColor_ == color ) return; @@ -288,7 +288,7 @@ void KasResources::setProgressColor( const QColor &color ) emit changed(); } -void KasResources::setAttentionColor( const QColor &color ) +void KasResources::setAttentionColor( const TQColor &color ) { if ( attentionColor_ == color ) return; diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h index 44048bcc3..cda153c30 100644 --- a/kicker/extensions/kasbar/kasresources.h +++ b/kicker/extensions/kasbar/kasresources.h @@ -57,14 +57,14 @@ #ifndef KASRESOURCES_H #define KASRESOURCES_H -#include <qbitmap.h> -#include <qcolor.h> -#include <qbrush.h> -#include <qpen.h> +#include <tqbitmap.h> +#include <tqcolor.h> +#include <tqbrush.h> +#include <tqpen.h> #include <kpixmap.h> -#include <qobject.h> -#include <qvaluevector.h> +#include <tqobject.h> +#include <tqvaluevector.h> class KasBar; @@ -81,39 +81,39 @@ public: KasResources( KasBar *parent, const char *name=0 ); virtual ~KasResources(); - QColor labelPenColor() const { return labelPenColor_; } - QColor labelBgColor() const { return labelBgColor_; } - QColor inactivePenColor() const { return inactivePenColor_; } - QColor inactiveBgColor() const { return inactiveBgColor_; } - QColor activePenColor() const { return activePenColor_; } - QColor activeBgColor() const { return activeBgColor_; } + TQColor labelPenColor() const { return labelPenColor_; } + TQColor labelBgColor() const { return labelBgColor_; } + TQColor inactivePenColor() const { return inactivePenColor_; } + TQColor inactiveBgColor() const { return inactiveBgColor_; } + TQColor activePenColor() const { return activePenColor_; } + TQColor activeBgColor() const { return activeBgColor_; } - QColor progressColor() const { return progressColor_; } - QColor attentionColor() const { return attentionColor_; } + TQColor progressColor() const { return progressColor_; } + TQColor attentionColor() const { return attentionColor_; } /** Accessor for the min icon (singleton). */ - QBitmap minIcon(); + TQBitmap minIcon(); /** Accessor for the max icon (singleton). */ - QBitmap maxIcon(); + TQBitmap maxIcon(); /** Accessor for the shade icon (singleton). */ - QBitmap shadeIcon(); + TQBitmap shadeIcon(); /** Accessor for the attention icon (singleton). */ - QBitmap attentionIcon(); + TQBitmap attentionIcon(); /** Accessor for the modified icon (singleton). */ - QPixmap modifiedIcon(); + TQPixmap modifiedIcon(); /** Accessor for the micro min icon (singleton). */ - QPixmap microMinIcon(); + TQPixmap microMinIcon(); /** Accessor for the micro max icon (singleton). */ - QPixmap microMaxIcon(); + TQPixmap microMaxIcon(); /** Accessor for the micro shade icon (singleton). */ - QPixmap microShadeIcon(); + TQPixmap microShadeIcon(); /** Accessor used by items to get the active bg fill. */ KPixmap activeBg(); @@ -121,18 +121,18 @@ public: /** Accessor used by items to get the inactive bg fill. */ KPixmap inactiveBg(); - QValueVector<QPixmap> startupAnimation(); + TQValueVector<TQPixmap> startupAnimation(); public slots: - void setLabelPenColor( const QColor &color ); - void setLabelBgColor( const QColor &color ); - void setInactivePenColor( const QColor &color ); - void setInactiveBgColor( const QColor &color ); - void setActivePenColor( const QColor &color ); - void setActiveBgColor( const QColor &color ); + void setLabelPenColor( const TQColor &color ); + void setLabelBgColor( const TQColor &color ); + void setInactivePenColor( const TQColor &color ); + void setInactiveBgColor( const TQColor &color ); + void setActivePenColor( const TQColor &color ); + void setActiveBgColor( const TQColor &color ); - void setProgressColor( const QColor &color ); - void setAttentionColor( const QColor &color ); + void setProgressColor( const TQColor &color ); + void setAttentionColor( const TQColor &color ); void itemSizeChanged(); @@ -142,29 +142,29 @@ signals: private: KasBar *kasbar; - QBitmap minPix; - QBitmap maxPix; - QBitmap shadePix; - QBitmap attentionPix; - QPixmap modifiedPix; - QPixmap microShadePix; - QPixmap microMaxPix; - QPixmap microMinPix; - - QColor labelPenColor_; - QColor labelBgColor_; - QColor activePenColor_; - QColor activeBgColor_; - QColor inactivePenColor_; - QColor inactiveBgColor_; - - QColor progressColor_; - QColor attentionColor_; + TQBitmap minPix; + TQBitmap maxPix; + TQBitmap shadePix; + TQBitmap attentionPix; + TQPixmap modifiedPix; + TQPixmap microShadePix; + TQPixmap microMaxPix; + TQPixmap microMinPix; + + TQColor labelPenColor_; + TQColor labelBgColor_; + TQColor activePenColor_; + TQColor activeBgColor_; + TQColor inactivePenColor_; + TQColor inactiveBgColor_; + + TQColor progressColor_; + TQColor attentionColor_; KPixmap actBg; KPixmap inactBg; - QValueVector<QPixmap> startupFrames_; + TQValueVector<TQPixmap> startupFrames_; }; #endif // KASRESOURCES_H diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 334edc836..53d823430 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -51,10 +51,10 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qpainter.h> -#include <qbitmap.h> -#include <qdrawutil.h> -#include <qtimer.h> +#include <tqpainter.h> +#include <tqbitmap.h> +#include <tqdrawutil.h> +#include <tqtimer.h> #include <kdebug.h> #include <kglobal.h> @@ -79,8 +79,8 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setShowFrame( false ); setAnimation( resources()->startupAnimation() ); - aniTimer = new QTimer( this ); - connect( aniTimer, SIGNAL( timeout() ), SLOT( aniTimerFired() ) ); + aniTimer = new TQTimer( this ); + connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } @@ -88,12 +88,12 @@ KasStartupItem::~KasStartupItem() { } -QPixmap KasStartupItem::icon() const +TQPixmap KasStartupItem::icon() const { /** * This icon stuff should all be handled by the task manager api, but isn't yet. */ - QPixmap pixmap; + TQPixmap pixmap; switch( kasbar()->itemSize() ) { case KasBar::Small: @@ -143,11 +143,11 @@ void KasStartupItem::aniTimerFired() advanceAnimation(); } -void KasStartupItem::paint( QPainter *p ) +void KasStartupItem::paint( TQPainter *p ) { p->save(); - p->setClipRect( 0, 0, extent(), extent(), QPainter::CoordPainter ); + p->setClipRect( 0, 0, extent(), extent(), TQPainter::CoordPainter ); p->translate( extent()/2, extent()/2 ); p->rotate( 9.0L * frame ); p->scale( 0.7L, 0.7L ); diff --git a/kicker/extensions/kasbar/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h index b8019f337..b3de4765e 100644 --- a/kicker/extensions/kasbar/kasstartupitem.h +++ b/kicker/extensions/kasbar/kasstartupitem.h @@ -57,8 +57,8 @@ #ifndef KASSTARTUPITEM_H #define KASSTARTUPITEM_H -#include <qpixmap.h> -#include <qstring.h> +#include <tqpixmap.h> +#include <tqstring.h> #include "kasitem.h" class Startup; @@ -76,20 +76,20 @@ public: KasStartupItem( KasBar *parent, Startup::Ptr startup ); virtual ~KasStartupItem(); - QPixmap icon() const; + TQPixmap icon() const; Startup::Ptr startup() const { return startup_; } /** * Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); protected slots: void aniTimerFired(); private: Startup::Ptr startup_; - QTimer *aniTimer; + TQTimer *aniTimer; int frame; }; diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 9c93db56c..a087f40ff 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -51,8 +51,8 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qapplication.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqtimer.h> #include <kactionclasses.h> #include <kconfig.h> @@ -79,7 +79,7 @@ static const int SWITCH_DESKTOPS_REGROUP_DELAY = 50; -KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f ) +KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags f ) : KasBar( o, parent, name, f ), menu( 0 ), conf( 0 ), @@ -102,20 +102,20 @@ KasTasker::KasTasker( Orientation o, QWidget* parent, const char* name, WFlags f loadItem(0) { setAcceptDrops( true ); - connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)), SLOT(addTask(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), SLOT(removeTask(Task::Ptr))); - connect(TaskManager::the(), SIGNAL(startupAdded(Startup::Ptr)), SLOT(addStartup(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(startupRemoved(Startup::Ptr)), SLOT(removeStartup(Startup::Ptr))); - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAllLater())); -// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAllLater() ) ); + connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater())); +// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) ); - connect( this, SIGNAL( itemSizeChanged( int ) ), SLOT( refreshAll() ) ); + connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); - connect( this, SIGNAL( detachedPositionChanged(const QPoint &) ), SLOT( writeLayout() ) ); - connect( this, SIGNAL( directionChanged() ), SLOT( writeLayout() ) ); + connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); + connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); } -KasTasker::KasTasker( Orientation o, KasTasker *master, QWidget* parent, const char* name, WFlags f ) +KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) : KasBar( o, master, parent, name, f ), menu( 0 ), conf( 0 ), @@ -155,27 +155,27 @@ KPopupMenu *KasTasker::contextMenu() this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, SIGNAL(toggled(bool)), SLOT(setShowAllWindows(bool)) ); - connect( this, SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); + connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); groupWindowsAction = new KToggleAction( i18n("&Group Windows"), KShortcut(), this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, SIGNAL(toggled(bool)), SLOT(setGroupWindows(bool)) ); - connect( this, SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); + connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); showClockAction = new KToggleAction( i18n("Show &Clock"), KShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, SIGNAL(toggled(bool)), SLOT(setShowClock(bool)) ); - connect( this, SIGNAL(showClockChanged(bool)), showClockAction, SLOT(setChecked(bool)) ); + connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); + connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); showLoadAction = new KToggleAction( i18n("Show &Load Meter"), KShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, SIGNAL(toggled(bool)), SLOT(setShowLoad(bool)) ); - connect( this, SIGNAL(showLoadChanged(bool)), showLoadAction, SLOT(setChecked(bool)) ); + connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); + connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); menu->insertSeparator(); @@ -183,38 +183,38 @@ KPopupMenu *KasTasker::contextMenu() toggleDetachedAction = new KToggleAction( i18n("&Floating"), KShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, SIGNAL(toggled(bool)), SLOT(setDetached(bool)) ); - connect( this, SIGNAL(detachedChanged(bool)), toggleDetachedAction, SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } - rotateBarAction = new KAction( i18n("R&otate Bar"), QString("rotate"), KShortcut(), - this, SLOT( toggleOrientation() ), + rotateBarAction = new KAction( i18n("R&otate Bar"), TQString("rotate"), KShortcut(), + this, TQT_SLOT( toggleOrientation() ), this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, SIGNAL(detachedChanged(bool)), rotateBarAction, SLOT(setEnabled(bool)) ); - connect( rotateBarAction, SIGNAL(activated()), SLOT(writeConfigLater()) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); // Help menu KPopupMenu *help = new KPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); } } return menu; } -KasTasker *KasTasker::createChildBar( Orientation o, QWidget *parent, const char *name ) +KasTasker *KasTasker::createChildBar( Orientation o, TQWidget *parent, const char *name ) { KasTasker *child = new KasTasker( o, this, parent, name ); child->conf = this->conf; @@ -269,9 +269,9 @@ void KasTasker::addTask( Task::Ptr t ) // // Ensure the window manager knows where we put the icon. // - QPoint p = mapToGlobal( itemPos( item ) ); - QSize s( itemExtent(), itemExtent() ); - t->publishIconGeometry( QRect( p, s ) ); + TQPoint p = mapToGlobal( itemPos( item ) ); + TQSize s( itemExtent(), itemExtent() ); + t->publishIconGeometry( TQRect( p, s ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), SIGNAL(taskRemoved(Task::Ptr)), gi, SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - QTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -380,9 +380,9 @@ void KasTasker::refreshIconGeometry() if ( itemAt(i)->inherits( "KasTaskItem" ) ) { KasTaskItem *curr = static_cast<KasTaskItem *> (itemAt( i )); - QPoint p = mapToGlobal( itemPos( curr ) ); - QSize s( itemExtent(), itemExtent() ); - curr->task()->publishIconGeometry( QRect( p, s ) ); + TQPoint p = mapToGlobal( itemPos( curr ) ); + TQSize s( itemExtent(), itemExtent() ); + curr->task()->publishIconGeometry( TQRect( p, s ) ); } } } @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), SIGNAL(desktopChanged(int)), SLOT(refreshAll())); -// connect( manager, SIGNAL( windowChanged( Task::Ptr ) ), SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); +// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), SIGNAL(desktopChanged(int)), this, SLOT(refreshAll())); -// disconnect( manager, SIGNAL( windowChanged( Task::Ptr ) ), this, SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); +// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - QTimer::singleShot( 10, this, SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() @@ -634,11 +634,11 @@ void KasTasker::readConfig( KConfig *conf ) // conf->setGroup("Layout"); - setDirection( (Direction) conf->readNumEntry( "Direction", QBoxLayout::LeftToRight ) ); + setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) ); setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Horizontal ) ); setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) ); - QPoint pos(100, 100); + TQPoint pos(100, 100); setDetachedPosition( conf->readPointEntry( "DetachedPosition", &pos ) ); setDetached( conf->readBoolEntry( "Detached", false ) ); diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index 1379c8d8c..b90e4ddeb 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -91,7 +91,7 @@ class KDE_EXPORT KasTasker : public KasBar public: /** Create a KasTasker widget. */ - KasTasker( Orientation o, QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); + KasTasker( Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Create a KasTasker widget that is slaved to another KasTasker. The @@ -99,7 +99,7 @@ public: * not connect to the signals of the TaskManager. */ KasTasker( Orientation o, KasTasker *master, - QWidget *parent=0, const char *name=0, WFlags f=0 ); + TQWidget *parent=0, const char *name=0, WFlags f=0 ); /** Cleans up. */ virtual ~KasTasker(); @@ -107,7 +107,7 @@ public: /** Factory method that returns the default menu for items in the bar. */ virtual KPopupMenu *contextMenu(); - virtual KasTasker *createChildBar( Orientation o, QWidget *parent, const char *name=0 ); + virtual KasTasker *createChildBar( 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/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index d21d5ccc6..c9ec7bdd0 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -53,17 +53,17 @@ */ #include <errno.h> -#include <qbitmap.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmetaobject.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qtabwidget.h> -#include <qtextview.h> -#include <qtimer.h> -#include <qvbox.h> +#include <tqbitmap.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqmetaobject.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqtabwidget.h> +#include <tqtextview.h> +#include <tqtimer.h> +#include <tqvbox.h> #include <kdebug.h> #include <kdialog.h> @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - connect( task, SIGNAL( changed(bool) ), this, SLOT( updateTask(bool) ) ); - connect( task, SIGNAL( activated() ), this, SLOT( startAutoThumbnail() ) ); - connect( task, SIGNAL( deactivated() ), this, SLOT( stopAutoThumbnail() ) ); - connect( task, SIGNAL( iconChanged() ), this, SLOT( iconChanged() ) ); - connect( task, SIGNAL( thumbnailChanged() ), this, SLOT( iconChanged() ) ); + connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) ); + connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) ); + connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) ); + connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) ); + connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) ); - connect( this, SIGNAL(leftButtonClicked(QMouseEvent *)), SLOT(toggleActivateAction()) ); - connect( this, SIGNAL(rightButtonClicked(QMouseEvent *)), SLOT(showWindowMenuAt(QMouseEvent *) ) ); + connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); + connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); - attentionTimer = new QTimer( this, "attentionTimer" ); - connect( attentionTimer, SIGNAL( timeout() ), SLOT( checkAttention() ) ); + attentionTimer = new TQTimer( this, "attentionTimer" ); + connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -122,7 +122,7 @@ KasTasker *KasTaskItem::kasbar() const return static_cast<KasTasker *> (KasItem::kasbar()); } -QPixmap KasTaskItem::icon() +TQPixmap KasTaskItem::icon() { int sizes[] = { KIcon::SizeEnormous, KIcon::SizeHuge, @@ -133,11 +133,11 @@ QPixmap KasTaskItem::icon() if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) { usedIconLoader = true; - QPixmap thumb = task_->thumbnail(); - QSize sz = thumb.size(); - sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], QSize::ScaleMin ); + TQPixmap thumb = task_->thumbnail(); + TQSize sz = thumb.size(); + sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin ); - QImage img = thumb.convertToImage(); + TQImage img = thumb.convertToImage(); img = img.smoothScale( sz ); bool ok = thumb.convertFromImage( img ); @@ -146,7 +146,7 @@ QPixmap KasTaskItem::icon() } usedIconLoader = false; - QPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); + TQPixmap p = task_->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); if ( !p.isNull() ) return p; @@ -184,12 +184,12 @@ void KasTaskItem::updateTask(bool geometryChangeOnly) update(); } -void KasTaskItem::paint( QPainter *p ) +void KasTaskItem::paint( TQPainter *p ) { KasItem::paint( p ); KasResources *res = resources(); - QColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor(); + TQColor c = task_->isActive() ? res->activePenColor() : res->inactivePenColor(); p->setPen( c ); // @@ -203,9 +203,9 @@ void KasTaskItem::paint( QPainter *p ) && ( kas->itemSize() != KasBar::Medium ); if ( usedIconLoader && iconHasChanged && haveSpace ) { - QPixmap pix = icon(); + TQPixmap pix = icon(); int x = (extent() - 4 - pix.width()) / 2; - QPixmap overlay = task_->pixmap(); + TQPixmap overlay = task_->pixmap(); p->drawPixmap( x-4+pix.width()-overlay.width(), 18, overlay ); } @@ -226,7 +226,7 @@ void KasTaskItem::paint( QPainter *p ) // Check if we only have one desktop bool oneDesktop = (TaskManager::the()->numberOfDesktops() == 1) ? true : false; - QString deskStr; + TQString deskStr; if ( task_->isOnAllDesktops() ) deskStr = i18n( "All" ); else @@ -261,7 +261,7 @@ void KasTaskItem::toggleActivateAction() } } -void KasTaskItem::showWindowMenuAt( QMouseEvent *ev ) +void KasTaskItem::showWindowMenuAt( TQMouseEvent *ev ) { hidePopup(); showWindowMenuAt( ev->globalPos() ); @@ -294,13 +294,13 @@ void KasTaskItem::startAutoThumbnail() return; if ( kasbar()->thumbnailUpdateDelay() > 0 ) { - thumbTimer = new QTimer( this, "thumbTimer" ); - connect( thumbTimer, SIGNAL( timeout() ), SLOT( refreshThumbnail() ) ); + thumbTimer = new TQTimer( this, "thumbTimer" ); + connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); } void KasTaskItem::stopAutoThumbnail() @@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail() // TODO: Check if the popup obscures the window KasItem *i = kasbar()->itemUnderMouse(); if ( i && i->isShowingPopup() ) { - QTimer::singleShot( 200, this, SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); return; } @@ -330,14 +330,14 @@ void KasTaskItem::refreshThumbnail() task_->updateThumbnail(); } -void KasTaskItem::showWindowMenuAt( QPoint p ) +void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); @@ -347,7 +347,7 @@ void KasTaskItem::showWindowMenuAt( QPoint p ) void KasTaskItem::sendToTray() { - QString s; + TQString s; s.setNum( task_->window() ); KProcess proc; @@ -372,7 +372,7 @@ void KasTaskItem::showPropertiesDialog() // // Create Dialog // - QDialog *dlg = new QDialog( /*kasbar()*/0L, "task_props", false ); + TQDialog *dlg = new TQDialog( /*kasbar()*/0L, "task_props", false ); // // Title @@ -385,7 +385,7 @@ void KasTaskItem::showPropertiesDialog() // // Tabbed View // - QTabWidget *tabs = new QTabWidget( dlg ); + TQTabWidget *tabs = new TQTabWidget( dlg ); tabs->addTab( createX11Props( tabs ), i18n("General") ); tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); @@ -399,7 +399,7 @@ void KasTaskItem::showPropertiesDialog() // // Layout Dialog // - QVBoxLayout *vbl = new QVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() ); + TQVBoxLayout *vbl = new TQVBoxLayout( dlg, KDialog::marginHint(), KDialog::spacingHint() ); vbl->addWidget( title ); vbl->addWidget( tabs ); @@ -408,23 +408,23 @@ void KasTaskItem::showPropertiesDialog() } -QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool recursive ) +TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool recursive ) { - QVBox *vb = new QVBox( parent ); + TQVBox *vb = new TQVBox( parent ); vb->setSpacing( KDialog::spacingHint() ); vb->setMargin( KDialog::marginHint() ); // Create List View KListView *taskprops = new KListView( vb, "props_view" ); - taskprops->setResizeMode( QListView::LastColumn ); + taskprops->setResizeMode( TQListView::LastColumn ); taskprops->addColumn( i18n("Property"), 0 ); taskprops->addColumn( i18n("Type"), 0 ); taskprops->addColumn( i18n("Value") ); // Create List Items - QMetaObject *mo = target->metaObject(); + TQMetaObject *mo = target->metaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { - const QMetaProperty *p = mo->property(i, recursive); + const TQMetaProperty *p = mo->property(i, recursive); (void) new KListViewItem( taskprops, p->name(), p->type(), @@ -434,17 +434,17 @@ QWidget *KasTaskItem::createTaskProps( QObject *target, QWidget *parent, bool re return vb; } -QString KasTaskItem::expandMacros( const QString &format, QObject *data ) +TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) { - QString s = format; - QRegExp re("\\$(\\w+)"); + TQString s = format; + TQRegExp re("\\$(\\w+)"); int pos = 0; while ( pos >= 0 ) { pos = re.search( s, pos ); if ( pos >= 0 ) { - QVariant val = data->property( re.cap(1).latin1() ); - QString v = val.asString(); + TQVariant val = data->property( re.cap(1).latin1() ); + TQString v = val.asString(); s.replace( pos, re.matchedLength(), v ); pos = pos + v.length(); } @@ -453,18 +453,18 @@ QString KasTaskItem::expandMacros( const QString &format, QObject *data ) return s; } -QWidget *KasTaskItem::createX11Props( QWidget *parent ) +TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { - QVBox *vb2 = new QVBox( parent ); - vb2->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Preferred ); + TQVBox *vb2 = new TQVBox( parent ); + vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); // Create View - new QLabel( i18n("General"), vb2, "view" ); - QTextView *tv = new QTextView( vb2 ); + new TQLabel( i18n("General"), vb2, "view" ); + TQTextView *tv = new TQTextView( vb2 ); - QString fmt = i18n( + TQString fmt = i18n( "<html>" "<body>" "<b>Name</b>: $name<br>" @@ -489,20 +489,20 @@ QWidget *KasTaskItem::createX11Props( QWidget *parent ) ); tv->setText( expandMacros( fmt, task_ ) ); - tv->setWordWrap( QTextEdit::WidgetWidth ); + tv->setWordWrap( TQTextEdit::WidgetWidth ); return vb2; } -QWidget *KasTaskItem::createNETProps( QWidget *parent ) +TQWidget *KasTaskItem::createNETProps( TQWidget *parent ) { - QVBox *vb3 = new QVBox( parent ); + TQVBox *vb3 = new TQVBox( parent ); vb3->setSpacing( KDialog::spacingHint() ); vb3->setMargin( KDialog::marginHint() ); // Create View - new QLabel( i18n("NET WM Specification Info"), vb3, "view" ); - new QTextView( vb3 ); + new TQLabel( i18n("NET WM Specification Info"), vb3, "view" ); + new TQTextView( vb3 ); return vb3; } diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index cc7d0d188..b2b166ef5 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -57,7 +57,7 @@ #ifndef KASTASKITEM_H #define KASTASKITEM_H -#include <qpixmap.h> +#include <tqpixmap.h> #include "kasitem.h" class Task; @@ -76,10 +76,10 @@ class KasTaskItem : public KasItem KasTaskItem( KasTasker *parent, Task::Ptr task ); virtual ~KasTaskItem(); - QPixmap icon(); + TQPixmap icon(); /** Reimplemented to paint the item. */ - virtual void paint( QPainter *p ); + virtual void paint( TQPainter *p ); /** Returns the task the item is displaying. */ Task::Ptr task() const { return task_; } @@ -87,7 +87,7 @@ class KasTaskItem : public KasItem /** Returns the parent KasTasker object. */ KasTasker *kasbar() const; - QString expandMacros( const QString &format, QObject *data ); + TQString expandMacros( const TQString &format, TQObject *data ); public slots: void updateTask(bool geometryChangeOnly); @@ -101,12 +101,12 @@ public slots: void iconChanged(); void checkAttention(); - void showWindowMenuAt( QPoint pos ); + void showWindowMenuAt( TQPoint pos ); void sendToTray(); void showPropertiesDialog(); void toggleActivateAction(); - void showWindowMenuAt( QMouseEvent *ev ); + void showWindowMenuAt( TQMouseEvent *ev ); protected: /** @@ -114,9 +114,9 @@ protected: */ virtual KasPopup *createPopup(); - QWidget *createTaskProps( QObject *target, QWidget *parent=0, bool recursive=true ); - QWidget *createX11Props( QWidget *tabbed ); - QWidget *createNETProps( QWidget *tabbed ); + TQWidget *createTaskProps( TQObject *target, TQWidget *parent=0, bool recursive=true ); + TQWidget *createX11Props( TQWidget *tabbed ); + TQWidget *createNETProps( TQWidget *tabbed ); /** * Reimplemented to activate the task. @@ -125,10 +125,10 @@ protected: private: Task::Ptr task_; - QTimer *thumbTimer; + TQTimer *thumbTimer; bool usedIconLoader; bool iconHasChanged; - QTimer *attentionTimer; + TQTimer *attentionTimer; }; #endif // KASTASKITEM_H diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 91f3ecbc9..25c096a65 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -51,8 +51,8 @@ /* ** Bug reports and questions can be sent to [email protected] */ -#include <qpainter.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqapplication.h> #include <kdebug.h> #include <kglobalsettings.h> @@ -76,7 +76,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) setFont(KGlobalSettings::generalFont()); setMouseTracking( true ); - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { titleBg.resize( width(), TITLE_HEIGHT ); @@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) Qt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), SIGNAL( thumbnailChanged() ), SLOT( refresh() ) ); + connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() @@ -103,7 +103,7 @@ KasTaskPopup::~KasTaskPopup() void KasTaskPopup::refresh() { - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); if ( item->kasbar()->thumbnailsEnabled() && item->task()->hasThumbnail() ) { resize( item->task()->thumbnail().width() + 2, TITLE_HEIGHT + item->task()->thumbnail().height() + 2 ); @@ -112,12 +112,12 @@ void KasTaskPopup::refresh() update(); } -void KasTaskPopup::paintEvent( QPaintEvent * ) +void KasTaskPopup::paintEvent( TQPaintEvent * ) { - QPainter p( this ); + TQPainter p( this ); p.drawPixmap( 0, 0, titleBg ); - QString text = item->task()->visibleIconicName(); + TQString text = item->task()->visibleIconicName(); p.setPen( Qt::white ); if ( fontMetrics().width( text ) > width() - 4 ) @@ -126,7 +126,7 @@ void KasTaskPopup::paintEvent( QPaintEvent * ) else p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignCenter, text ); - QPixmap thumb = item->task()->thumbnail(); + TQPixmap thumb = item->task()->thumbnail(); if ( !thumb.isNull() ) p.drawPixmap( 1, TITLE_HEIGHT, thumb ); diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h index 8118fff6c..dcdc33107 100644 --- a/kicker/extensions/kasbar/kastaskpopup.h +++ b/kicker/extensions/kasbar/kastaskpopup.h @@ -78,7 +78,7 @@ public slots: void refresh(); protected: - virtual void paintEvent( QPaintEvent * ); + virtual void paintEvent( TQPaintEvent * ); private: KasTaskItem *item; |