diff options
Diffstat (limited to 'kicker/extensions')
-rw-r--r-- | kicker/extensions/dockbar/dockbarextension.cpp | 10 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasaboutdlg.cpp | 2 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasbar.cpp | 14 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasbarapp.cpp | 4 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasbarextension.cpp | 4 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasclockitem.cpp | 6 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasgroupitem.cpp | 14 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasitem.cpp | 12 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasloaditem.cpp | 4 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasprefsdlg.cpp | 100 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kasstartupitem.cpp | 2 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kastasker.cpp | 66 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kastaskitem.cpp | 26 | ||||
-rw-r--r-- | kicker/extensions/kasbar/kastaskpopup.cpp | 2 | ||||
-rw-r--r-- | kicker/extensions/sidebar/sidebarextension.cpp | 10 | ||||
-rw-r--r-- | kicker/extensions/taskbar/taskbarextension.cpp | 14 |
16 files changed, 145 insertions, 145 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 143812e0d..a5aeefa57 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -58,7 +58,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, { dragging_container = 0; twin_module = new KWinModule(this); - connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), - TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), - TQT_SLOT(settingsChanged(DockContainer*))); + connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQ_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), + TQ_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 54dd1dfd6..e1c9f4afc 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); + connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) ); KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); KasItem *i = 0; diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index f28d2fd1f..323a58150 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,8 +145,8 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); + connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) ); return res; } @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), - this, TQT_SLOT( setBackground(const TQPixmap &) ) ); + connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQ_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -720,7 +720,7 @@ void KasBar::addTestItems() i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 1dc85038c..a9a5fd68a 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(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -118,7 +118,7 @@ int main( int argc, char **argv ) TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 1aa373d3c..327fd564c 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); - connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); + connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) ); + connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 249e7c051..a99c5f8ba 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent ) setCustomPopup( true ); TQTimer *t = new TQTimer( this, "t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); @@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd->setAutoMask( true ); updateTime(); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 693f912c4..de59f7b88 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - 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 *) ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); + connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) ); update(); } @@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup() KasPopup *pop = new KasPopup( this ); bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); - connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); + connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) ); return pop; @@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 1967465f4..a95dac049 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); - connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); + connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) ); + connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -169,7 +169,7 @@ void KasItem::mouseEnter() if ( (!customPopup) && (popupTimer == 0) ) { popupTimer = new TQTimer( this, "popupTimer" ); - connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); + connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } } @@ -215,7 +215,7 @@ void KasItem::dragEnter() if ( dragTimer == 0 ) { dragTimer = new TQTimer( this, "dragTimer" ); - connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); + connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } void KasItem::hidePopup() diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 6169d09b1..450d80154 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { TQTimer *t = new TQTimer( this, "KasLoadItem::t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 6d5255082..cce36b250 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), - kasbar, TQT_SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), + kasbar, TQ_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) ); new TQWidget( itemSizeBox ); @@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage() customSize->setValue( kasbar->itemExtent() ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setItemExtent( int ) ) ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // @@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage() detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) ); (void) new TQWidget( lookPage, "spacer" ); (void) new TQWidget( lookPage, "spacer" ); @@ -197,31 +197,31 @@ void KasPrefsDialog::addBackgroundPage() transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); + connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) ); 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, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) ); TQHBox *tintColBox = new TQHBox( bgPage ); TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), - kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); + connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ), + kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); TQHBox *tintAmtBox = new TQHBox( bgPage ); TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); @@ -229,8 +229,8 @@ void KasPrefsDialog::addBackgroundPage() int percent = (int) (kasbar->tintAmount() * 100.0); tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); (void) new TQWidget( bgPage, "spacer" ); @@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage() "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, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) ); embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) ); TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); TQWhatsThis::add( thumbSizeBox, @@ -262,8 +262,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); + connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); @@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) ); (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); @@ -293,21 +293,21 @@ void KasPrefsDialog::addBehavePage() TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupWindows(bool) ) ); 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, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) ); 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, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) ); onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); TQWhatsThis::add( onlyShowMinimizedCheck, @@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage() "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) ); (void) new TQWidget( behavePage, "spacer" ); (void) new TQWidget( behavePage, "spacer" ); @@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); + connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); + connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors @@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); + connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); + connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors @@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage() TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); + connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); + connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); group = new TQGrid( 2, colorsPage ); TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); + connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); + connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); (void) new TQWidget( colorsPage, "spacer" ); @@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) ); // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); @@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) ); progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress indicator in the label of windows." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) ); 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, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) ); 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, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) ); (void) new TQWidget( advancedPage, "spacer" ); (void) new TQWidget( advancedPage, "spacer" ); diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 2f008d0c5..84e17dd21 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setAnimation( resources()->startupAnimation() ); aniTimer = new TQTimer( this, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 04d6a8e0f..3d28a723d 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags loadItem(0) { setAcceptDrops( true ); - 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(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) ); - connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); - connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) ); } KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) @@ -155,27 +155,27 @@ TDEPopupMenu *KasTasker::contextMenu() this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) ); + connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) ); groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) ); + connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) ); showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) ); + connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) ); showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) ); + connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) ); menu->insertSeparator(); @@ -183,31 +183,31 @@ TDEPopupMenu *KasTasker::contextMenu() toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) ); } rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), - this, TQT_SLOT( toggleOrientation() ), + this, TQ_SLOT( toggleOrientation() ), this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); - connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) ); // Help menu TDEPopupMenu *help = new TDEPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); -// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll())); +// disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index ee4a0bc7d..b7ab94de6 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - 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( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) ); + connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); attentionTimer = new TQTimer( this, "attentionTimer" ); - connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); + connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail() if ( kasbar()->thumbnailUpdateDelay() > 0 ) { thumbTimer = new TQTimer( this, "thumbTimer" ); - connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); + connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_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() ) { - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); return; } @@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail() void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 32ef9de81..8905af37a 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) TQt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); + connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index d29299939..142b42ee3 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -62,10 +62,10 @@ SidebarExtension::SidebarExtension( const TQString& configFile, KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); if (be) { - connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } @@ -74,7 +74,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile, m_resizeHandle->setFrameShadow(TQFrame::Raised); m_resizeHandle->setFixedWidth(6); m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor)); - connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool))); + connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool))); needLayoutUpdate(false); m_resizeHandle->installEventFilter(this); m_resizeHandle->setMouseTracking(true); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index dbb6c4195..56f33c66d 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, positionChange(position()); layout->addWidget(m_container); - connect(m_container, TQT_SIGNAL(containerCountChanged()), - TQT_SIGNAL(updateLayout())); + connect(m_container, TQ_SIGNAL(containerCountChanged()), + TQ_SIGNAL(updateLayout())); kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - TQT_SLOT(setBackgroundTheme())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + TQ_SLOT(setBackgroundTheme())); - TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme())); } TaskBarExtension::~TaskBarExtension() @@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme() { m_rootPixmap = new KRootPixmap(this); m_rootPixmap->setCustomPainting(true); - connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { |