diff options
Diffstat (limited to 'src/widgets')
34 files changed, 340 insertions, 340 deletions
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 14bb57433..361ed026e 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -782,7 +782,7 @@ void TQAction::setAccel( const TQKeySequence& key ) if ( p ) { d->accel = new TQAccel( (TQWidget*)p, this, "qt_action_accel" ); d->accelid = d->accel->insertItem( d->key ); - d->accel->connectItem( d->accelid, this, SLOT( internalActivation() ) ); + d->accel->connectItem( d->accelid, this, TQ_SLOT( internalActivation() ) ); } #if defined(QT_CHECK_STATE) else @@ -1018,12 +1018,12 @@ bool TQAction::addTo( TQWidget* w ) if ( d->iconset ) btn->setIconSet( *d->iconset ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; - connect( btn, SIGNAL( clicked() ), this, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), this, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); #ifndef TQT_NO_TOOLTIP - connect( &(d->tipGroup), SIGNAL(showTip(const TQString&)), this, SLOT(showStatusText(const TQString&)) ); - connect( &(d->tipGroup), SIGNAL(removeTip()), this, SLOT(clearStatusText()) ); + connect( &(d->tipGroup), TQ_SIGNAL(showTip(const TQString&)), this, TQ_SLOT(showStatusText(const TQString&)) ); + connect( &(d->tipGroup), TQ_SIGNAL(removeTip()), this, TQ_SLOT(clearStatusText()) ); #endif } } else @@ -1039,18 +1039,18 @@ bool TQAction::addTo( TQWidget* w ) else mi->id = mi->popup->insertItem( TQString::fromLatin1("") ); addedTo( mi->popup->indexOf( mi->id ), mi->popup ); - mi->popup->connectItem( mi->id, this, SLOT(internalActivation()) ); + mi->popup->connectItem( mi->id, this, TQ_SLOT(internalActivation()) ); d->menuitems.append( mi ); d->update( TQActionPrivate::State | TQActionPrivate::Visibility | TQActionPrivate::EverythingElse ) ; w->topLevelWidget()->className(); - connect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - connect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - connect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + connect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + connect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); // Makes only sense when called by TQActionGroup::addTo } else if ( ::tqt_cast<TQComboBox*>(w) ) { TQActionPrivate::ComboItem *ci = new TQActionPrivate::ComboItem; ci->combo = (TQComboBox*)w; - connect( ci->combo, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + connect( ci->combo, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); ci->id = ci->combo->count(); if ( qstrcmp( name(), "qt_separator_action" ) ) { if ( d->iconset ) @@ -1193,7 +1193,7 @@ bool TQAction::removeFrom( TQWidget* w ) ++it; if ( btn->parentWidget() == w ) { d->toolbuttons.removeRef( btn ); - disconnect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( btn, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); delete btn; // no need to disconnect from statusbar } @@ -1206,9 +1206,9 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( mi = it.current() ) ) { ++it; if ( mi->popup == w ) { - disconnect( mi->popup, SIGNAL(highlighted(int)), this, SLOT(menuStatusText(int)) ); - disconnect( mi->popup, SIGNAL(aboutToHide()), this, SLOT(clearStatusText()) ); - disconnect( mi->popup, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) ); + disconnect( mi->popup, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuStatusText(int)) ); + disconnect( mi->popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(clearStatusText()) ); + disconnect( mi->popup, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( objectDestroyed() ) ); mi->popup->removeItem( mi->id ); d->menuitems.removeRef( mi ); } @@ -1219,7 +1219,7 @@ bool TQAction::removeFrom( TQWidget* w ) while ( ( ci = it.current() ) ) { ++it; if ( ci->combo == w ) { - disconnect( ci->combo, SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + disconnect( ci->combo, TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); d->comboitems.removeRef( ci ); } } @@ -1445,7 +1445,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name ) d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1466,7 +1466,7 @@ TQActionGroup::TQActionGroup( TQObject* parent, const char* name, bool exclusive d->separatorAction = 0; TQAction::d->d_group = d; - connect( this, SIGNAL(selected(TQAction*)), SLOT(internalToggle(TQAction*)) ); + connect( this, TQ_SIGNAL(selected(TQAction*)), TQ_SLOT(internalToggle(TQAction*)) ); } /*! @@ -1480,26 +1480,26 @@ TQActionGroup::~TQActionGroup() TQActionGroupPrivate::MenuItem *mi = mit.current(); ++mit; if ( mi->popup ) - mi->popup->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mi->popup->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQComboBox> cbit( d->comboboxes ); while ( cbit.current() ) { TQComboBox *cb = cbit.current(); ++cbit; - cb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + cb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQToolButton> mbit( d->menubuttons ); while ( mbit.current() ) { TQToolButton *mb = mbit.current(); ++mbit; - mb->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + mb->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } TQPtrListIterator<TQPopupMenu> pmit( d->popupmenus ); while ( pmit.current() ) { TQPopupMenu *pm = pmit.current(); ++pmit; - pm->disconnect( SIGNAL(destroyed()), this, SLOT(objectDestroyed()) ); + pm->disconnect( TQ_SIGNAL(destroyed()), this, TQ_SLOT(objectDestroyed()) ); } delete d->separatorAction; @@ -1590,9 +1590,9 @@ void TQActionGroup::add( TQAction* action ) if (!action->d->forceInvisible) action->d->visible = isVisible(); - connect( action, SIGNAL( destroyed() ), this, SLOT( childDestroyed() ) ); - connect( action, SIGNAL( activated() ), this, SIGNAL( activated() ) ); - connect( action, SIGNAL( toggled(bool) ), this, SLOT( childToggled(bool) ) ); + connect( action, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( childDestroyed() ) ); + connect( action, TQ_SIGNAL( activated() ), this, TQ_SIGNAL( activated() ) ); + connect( action, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( childToggled(bool) ) ); for ( TQPtrListIterator<TQComboBox> cb( d->comboboxes ); cb.current(); ++cb ) { action->addTo( cb.current() ); @@ -1663,7 +1663,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQToolButton* btn = new TQToolButton( (TQToolBar*) w, "qt_actiongroup_btn" ); addedTo( btn, w ); - connect( btn, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( btn, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->menubuttons.append( btn ); if ( !iconSet().isNull() ) @@ -1687,9 +1687,9 @@ bool TQActionGroup::addTo( TQWidget* w ) TQWhatsThis::add( btn, defAction->whatsThis() ); #endif - connect( btn, SIGNAL( clicked() ), defAction, SIGNAL( activated() ) ); - connect( btn, SIGNAL( toggled(bool) ), defAction, SLOT( toolButtonToggled(bool) ) ); - connect( btn, SIGNAL( destroyed() ), defAction, SLOT( objectDestroyed() ) ); + connect( btn, TQ_SIGNAL( clicked() ), defAction, TQ_SIGNAL( activated() ) ); + connect( btn, TQ_SIGNAL( toggled(bool) ), defAction, TQ_SLOT( toolButtonToggled(bool) ) ); + connect( btn, TQ_SIGNAL( destroyed() ), defAction, TQ_SLOT( objectDestroyed() ) ); TQPopupMenu *menu = new TQPopupMenu( btn, "qt_actiongroup_menu" ); btn->setPopupDelay( 0 ); @@ -1704,7 +1704,7 @@ bool TQActionGroup::addTo( TQWidget* w ) } else { TQComboBox *box = new TQComboBox( FALSE, w, "qt_actiongroup_combo" ); addedTo( box, w ); - connect( box, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( box, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); d->comboboxes.append( box ); #ifndef TQT_NO_TOOLTIP if ( !!toolTip() ) @@ -1727,8 +1727,8 @@ bool TQActionGroup::addTo( TQWidget* w ) } if ( foundOn ) box->setCurrentItem( onIndex ); - connect( box, SIGNAL(activated(int)), this, SLOT( internalComboBoxActivated(int)) ); - connect( box, SIGNAL(highlighted(int)), this, SLOT( internalComboBoxHighlighted(int)) ); + connect( box, TQ_SIGNAL(activated(int)), this, TQ_SLOT( internalComboBoxActivated(int)) ); + connect( box, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( internalComboBoxHighlighted(int)) ); d->update( this ); return TRUE; } @@ -1741,7 +1741,7 @@ bool TQActionGroup::addTo( TQWidget* w ) TQPopupMenu *menu = (TQPopupMenu*)w; popup = new TQPopupMenu( w, "qt_actiongroup_menu" ); d->popupmenus.append( popup ); - connect( popup, SIGNAL(destroyed()), SLOT(objectDestroyed()) ); + connect( popup, TQ_SIGNAL(destroyed()), TQ_SLOT(objectDestroyed()) ); int id; if ( !iconSet().isNull() ) { diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index 90fe7cb0c..3b91b18fb 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -85,7 +85,7 @@ void TQButton::ensureData() if ( !d ) { d = new TQButtonData; TQ_CHECK_PTR( d ); - connect(&d->timer, SIGNAL(timeout()), this, SLOT(autoRepeatTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoRepeatTimeout())); } } @@ -538,8 +538,8 @@ void TQButton::setAccel( const TQKeySequence& key ) ensureData(); if ( !d->a ) { d->a = new TQAccel( this, "buttonAccel" ); - connect( d->a, SIGNAL( activated(int) ), this, SLOT( animateClick() ) ); - connect( d->a, SIGNAL( activatedAmbiguously(int) ), this, SLOT( setFocus() ) ); + connect( d->a, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( animateClick() ) ); + connect( d->a, TQ_SIGNAL( activatedAmbiguously(int) ), this, TQ_SLOT( setFocus() ) ); } d->a->insertItem( key, 0 ); } @@ -573,7 +573,7 @@ void TQButton::animateClick() buttonDown = TRUE; repaint( FALSE ); emit pressed(); - TQTimer::singleShot( 100, this, SLOT(animateTimeout()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(animateTimeout()) ); } void TQButton::emulateClick() diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp index ec4298675..15495edff 100644 --- a/src/widgets/qbuttongroup.cpp +++ b/src/widgets/qbuttongroup.cpp @@ -268,10 +268,10 @@ int TQButtonGroup::insert( TQButton *button, int id ) button->setGroup(this); buttons->append( bi ); - connect( button, SIGNAL(pressed()) , SLOT(buttonPressed()) ); - connect( button, SIGNAL(released()), SLOT(buttonReleased()) ); - connect( button, SIGNAL(clicked()) , SLOT(buttonClicked()) ); - connect( button, SIGNAL(toggled(bool)) , SLOT(buttonToggled(bool)) ); + connect( button, TQ_SIGNAL(pressed()) , TQ_SLOT(buttonPressed()) ); + connect( button, TQ_SIGNAL(released()), TQ_SLOT(buttonReleased()) ); + connect( button, TQ_SIGNAL(clicked()) , TQ_SLOT(buttonClicked()) ); + connect( button, TQ_SIGNAL(toggled(bool)) , TQ_SLOT(buttonToggled(bool)) ); if ( button->isToggleButton() && !button->isOn() && selected() && (selected()->focusPolicy() & TabFocus) != 0 ) diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index db1c4b491..b75d23ed8 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -521,10 +521,10 @@ TQComboBox::TQComboBox( TQWidget *parent, const char *name ) style().styleHint(TQStyle::SH_GUIStyle) == TQt::MotifStyle ) { d->setPopupMenu( new TQComboBoxPopup( this, "in-combo" ) ); d->popup()->setFont( font() ); - connect( d->popup(), SIGNAL(activated(int)), - SLOT(internalActivate(int)) ); - connect( d->popup(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int)) ); + connect( d->popup(), TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->popup(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } else { setUpListBox(); } @@ -1393,7 +1393,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) } else { popup(); } - TQTimer::singleShot( 200, this, SLOT(internalClickTimeout())); + TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); d->shortClick = TRUE; } } @@ -1562,8 +1562,8 @@ void TQComboBox::popup() TQComboBoxPopup *p = new TQComboBoxPopup( this, "in-combo" ); d->setPopupMenu( p, FALSE ); p->setFont( font() ); - connect( p, SIGNAL(activated(int)), SLOT(internalActivate(int)) ); - connect( p, SIGNAL(highlighted(int)), SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), TQ_SLOT(internalHighlight(int)) ); } d->popup()->clear(); for(unsigned int i = 0; i < d->listBox()->count(); i++) { @@ -2138,10 +2138,10 @@ void TQComboBox::setListBox( TQListBox * newListBox ) d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2268,10 +2268,10 @@ void TQComboBox::setUpListBox() d->listBox()->setLineWidth( 1 ); d->listBox()->resize( 100, 10 ); - connect( d->listBox(), SIGNAL(selected(int)), - SLOT(internalActivate(int)) ); - connect( d->listBox(), SIGNAL(highlighted(int)), - SLOT(internalHighlight(int))); + connect( d->listBox(), TQ_SIGNAL(selected(int)), + TQ_SLOT(internalActivate(int)) ); + connect( d->listBox(), TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int))); } @@ -2301,9 +2301,9 @@ void TQComboBox::setLineEdit( TQLineEdit *edit ) if ( edit->parent() != this ) edit->reparent( this, TQPoint(0,0), FALSE ); - connect (edit, SIGNAL( textChanged(const TQString&) ), - this, SIGNAL( textChanged(const TQString&) ) ); - connect( edit, SIGNAL(returnPressed()), SLOT(returnPressed()) ); + connect (edit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); edit->setFrame( FALSE ); d->updateLinedGeometry(); diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 2989678ac..6454bdf49 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -952,10 +952,10 @@ void TQDateEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "date editor" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); - connect( this, SIGNAL( valueChanged(const TQDate&) ), - SLOT( updateButtons() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); + connect( this, TQ_SIGNAL( valueChanged(const TQDate&) ), + TQ_SLOT( updateButtons() ) ); d->ed->appendSection( TQNumberSection( 0,4 ) ); d->ed->appendSection( TQNumberSection( 5,7 ) ); d->ed->appendSection( TQNumberSection( 8,10 ) ); @@ -1854,8 +1854,8 @@ void TQTimeEdit::init() d->ed = new TQDateTimeEditor( this, d->controls, "time edit base" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); @@ -2728,10 +2728,10 @@ void TQDateTimeEdit::init() de = new TQDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); d->adv = FALSE; - connect( de, SIGNAL( valueChanged(const TQDate&) ), - this, SLOT( newValue(const TQDate&) ) ); - connect( te, SIGNAL( valueChanged(const TQTime&) ), - this, SLOT( newValue(const TQTime&) ) ); + connect( de, TQ_SIGNAL( valueChanged(const TQDate&) ), + this, TQ_SLOT( newValue(const TQDate&) ) ); + connect( te, TQ_SIGNAL( valueChanged(const TQTime&) ), + this, TQ_SLOT( newValue(const TQTime&) ) ); setFocusProxy( de ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index fd3d5c4c8..8f32fd61d 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -68,8 +68,8 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 b { init(buttons, orient); if(parent && autoConnect) { - TQObject::connect(this, SIGNAL(acceptClicked()), parent, SLOT(accept())); - TQObject::connect(this, SIGNAL(rejectClicked()), parent, SLOT(reject())); + TQObject::connect(this, TQ_SIGNAL(acceptClicked()), parent, TQ_SLOT(accept())); + TQObject::connect(this, TQ_SIGNAL(rejectClicked()), parent, TQ_SLOT(reject())); } } #endif // TQT_NO_DIALOG @@ -242,7 +242,7 @@ TQWidget * TQDialogButtons::createButton(Button b) { TQPushButton *ret = new TQPushButton(this, "qdialog_button"); - TQObject::connect(ret, SIGNAL(clicked()), this, SLOT(handleClicked())); + TQObject::connect(ret, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleClicked())); if(d->text.contains(b)) { ret->setText(d->text[b]); } else { diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 769005031..93823706f 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -392,7 +392,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw ) { ctrlDown = FALSE; timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( minimize() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) ); #ifdef Q_WS_WIN setCursor( SizeAllCursor ); #endif @@ -512,8 +512,8 @@ void TQDockWindowHandle::updateGui() #endif closeButton->setPixmap( style().stylePixmap( TQStyle::SP_DockWindowCloseButton, closeButton ) ); closeButton->setFixedSize( 12, 12 ); - connect( closeButton, SIGNAL( clicked() ), - dockWindow, SLOT( hide() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), + dockWindow, TQ_SLOT( hide() ) ); } if ( dockWindow->isCloseEnabled() && dockWindow->area() ) @@ -578,7 +578,7 @@ TQDockWindowTitleBar::TQDockWindowTitleBar( TQDockWindow *dw ) ctrlDown = FALSE; setMouseTracking( TRUE ); setFixedHeight( style().pixelMetric( TQStyle::PM_TitleBarHeight, this ) ); - connect( this, SIGNAL(doClose()), dockWindow, SLOT(hide()) ); + connect( this, TQ_SIGNAL(doClose()), dockWindow, TQ_SLOT(hide()) ); } void TQDockWindowTitleBar::keyPressEvent( TQKeyEvent *e ) @@ -1062,11 +1062,11 @@ void TQDockWindow::init() stretchable[ Horizontal ] = FALSE; stretchable[ Vertical ] = FALSE; - connect( titleBar, SIGNAL( doubleClicked() ), this, SLOT( dock() ) ); - connect( verHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( horHandle, SIGNAL( doubleClicked() ), this, SLOT( undock() ) ); - connect( this, SIGNAL( orientationChanged(Orientation) ), - this, SLOT( setOrientation(Orientation) ) ); + connect( titleBar, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( dock() ) ); + connect( verHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( horHandle, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( undock() ) ); + connect( this, TQ_SIGNAL( orientationChanged(Orientation) ), + this, TQ_SLOT( setOrientation(Orientation) ) ); } /*! diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index 40170dbea..d14164831 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -166,7 +166,7 @@ void TQAlphaWidget::run( int time ) show(); setEnabled(FALSE); - connect( &anim, SIGNAL(timeout()), this, SLOT(render())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(render())); anim.start( 1 ); } else { duration = 0; @@ -509,7 +509,7 @@ void TQRollEffect::run( int time ) duration = TQMIN( TQMAX( dist/3, 50 ), 120 ); } - connect( &anim, SIGNAL(timeout()), this, SLOT(scroll())); + connect( &anim, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); widget->setWState( WState_Visible ); diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index 1a8a1d1bb..9a31d397f 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -253,7 +253,7 @@ void TQGroupBox::setTitle( const TQString &title ) if ( s ) { accel = new TQAccel( this, "automatic focus-change accelerator" ); accel->connectItem( accel->insertItem( s, 0 ), - this, SLOT(fixFocus()) ); + this, TQ_SLOT(fixFocus()) ); } #endif #ifndef TQT_NO_CHECKBOX @@ -846,10 +846,10 @@ void TQGroupBox::setCheckable( bool b ) meAsButtonGroup->remove(d->checkbox); setChecked( TRUE ); setChildrenEnabled( TRUE ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SLOT( setChildrenEnabled(bool) ) ); - connect( d->checkbox, SIGNAL( toggled(bool) ), - this, SIGNAL( toggled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setChildrenEnabled(bool) ) ); + connect( d->checkbox, TQ_SIGNAL( toggled(bool) ), + this, TQ_SIGNAL( toggled(bool) ) ); updateCheckBoxGeometry(); } d->checkbox->show(); diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 8ce8cfb9a..ce41f05bc 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -2789,14 +2789,14 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f ) d->drawDragShapes = FALSE; d->backrubber = 0; - connect( d->adjustTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); - connect( d->updateTimer, SIGNAL( timeout() ), - this, SLOT( slotUpdate() ) ); - connect( d->fullRedrawTimer, SIGNAL( timeout() ), - this, SLOT( updateContents() ) ); - connect( this, SIGNAL( contentsMoving(int,int) ), - this, SLOT( movedContents(int,int) ) ); + connect( d->adjustTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotUpdate() ) ); + connect( d->fullRedrawTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateContents() ) ); + connect( this, TQ_SIGNAL( contentsMoving(int,int) ), + this, TQ_SLOT( movedContents(int,int) ) ); setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE ); @@ -3425,13 +3425,13 @@ void TQIconView::doAutoScroll() !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + connect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->start( 100, FALSE ); } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) && d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), - this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4473,7 +4473,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) d->backrubber = 0; if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4616,7 +4616,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)) ) ) { e->ignore(); return; } @@ -4664,7 +4664,7 @@ void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) } if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) ); + disconnect( d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index ff647ab28..a9b485af8 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -294,7 +294,7 @@ void TQLabel::setText( const TQString &text ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } #endif @@ -949,7 +949,7 @@ void TQLabel::setBuddy( TQWidget *buddy ) setAlignment( alignment() & ~ShowPrefix ); if ( lbuddy ) - disconnect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + disconnect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); lbuddy = buddy; @@ -965,11 +965,11 @@ void TQLabel::setBuddy( TQWidget *buddy ) if ( !accel ) accel = new TQAccel( this, "accel label accel" ); accel->connectItem( accel->insertItem( p ), - this, SLOT(acceleratorSlot()) ); + this, TQ_SLOT(acceleratorSlot()) ); } } - connect( lbuddy, SIGNAL(destroyed()), this, SLOT(buddyDied()) ); + connect( lbuddy, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDied()) ); } @@ -1027,8 +1027,8 @@ void TQLabel::setMovie( const TQMovie& movie ) clearContents(); lmovie = new TQMovie( movie ); - lmovie->connectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->connectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->connectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->connectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); if ( !lmovie->running() ) // Assume that if the movie is running, updateLabel( osh ); // resize/update signals will come soon enough @@ -1067,8 +1067,8 @@ void TQLabel::clearContents() #endif #ifndef TQT_NO_MOVIE if ( lmovie ) { - lmovie->disconnectResize(this, SLOT(movieResized(const TQSize&))); - lmovie->disconnectUpdate(this, SLOT(movieUpdated(const TQRect&))); + lmovie->disconnectResize(this, TQ_SLOT(movieResized(const TQSize&))); + lmovie->disconnectUpdate(this, TQ_SLOT(movieUpdated(const TQRect&))); delete lmovie; lmovie = 0; } diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 27f5867c0..41ad01350 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -669,12 +669,12 @@ const TQValidator * TQLineEdit::validator() const void TQLineEdit::setValidator( const TQValidator *v ) { if ( d->validator ) - disconnect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + disconnect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); d->validator = v; if ( d->validator ) - connect( (TQObject*)d->validator, SIGNAL( destroyed() ), - this, SLOT( clearValidator() ) ); + connect( (TQObject*)d->validator, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( clearValidator() ) ); } @@ -1349,10 +1349,10 @@ void TQLineEditPrivate::copy( bool clipboard ) const { TQString t = q->selectedText(); if ( !t.isEmpty() && echoMode == TQLineEdit::Normal ) { - q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0); + q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - q, SLOT(clipboardChanged()) ); + q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + q, TQ_SLOT(clipboardChanged()) ); } } diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 5ccedf405..3669b3e25 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -1022,12 +1022,12 @@ TQListBox::TQListBox( TQWidget *parent, const char *name, WFlags f ) setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->updateTimer, SIGNAL(timeout()), - this, SLOT(refreshSlot()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(ensureCurrentVisible()) ); - connect( d->resizeTimer, SIGNAL( timeout() ), - this, SLOT( adjustItems() ) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(refreshSlot()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(ensureCurrentVisible()) ); + connect( d->resizeTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( adjustItems() ) ); viewport()->setBackgroundMode( PaletteBase ); setBackgroundMode( PaletteBackground, PaletteBase ); viewport()->setFocusProxy( this ); @@ -2312,8 +2312,8 @@ void TQListBox::mouseMoveEvent( TQMouseEvent *e ) if ( ( dx || dy ) && !d->scrollTimer && e->state() == LeftButton && e->button() != LeftButton ) { // start autoscrolling if necessary d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); doAutoScroll(); } else if ( !d->scrollTimer ) { @@ -2423,7 +2423,7 @@ void TQListBox::repaintSelection() void TQListBox::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListBoxItem*,const TQPoint&)) ) ) { e->ignore(); return; } diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 22c04e03c..599c99439 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -2694,29 +2694,29 @@ void TQListView::init() setMouseTracking( TRUE ); viewport()->setMouseTracking( TRUE ); - connect( d->timer, SIGNAL(timeout()), - this, SLOT(updateContents()) ); - connect( d->dirtyItemTimer, SIGNAL(timeout()), - this, SLOT(updateDirtyItems()) ); - connect( d->visibleTimer, SIGNAL(timeout()), - this, SLOT(makeVisible()) ); - connect( d->renameTimer, SIGNAL(timeout()), - this, SLOT(startRename()) ); - connect( d->autoopenTimer, SIGNAL(timeout()), - this, SLOT(openFocusItem()) ); - - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); - connect( d->h, SIGNAL(indexChange(int,int,int)), - this, SLOT(handleIndexChange()) ); - connect( d->h, SIGNAL(sectionClicked(int)), - this, SLOT(changeSortColumn(int)) ); - connect( d->h, SIGNAL(sectionHandleDoubleClicked(int)), - this, SLOT(adjustColumn(int)) ); - connect( horizontalScrollBar(), SIGNAL(sliderMoved(int)), - d->h, SLOT(setOffset(int)) ); - connect( horizontalScrollBar(), SIGNAL(valueChanged(int)), - d->h, SLOT(setOffset(int)) ); + connect( d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateContents()) ); + connect( d->dirtyItemTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateDirtyItems()) ); + connect( d->visibleTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(makeVisible()) ); + connect( d->renameTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(startRename()) ); + connect( d->autoopenTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(openFocusItem()) ); + + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(indexChange(int,int,int)), + this, TQ_SLOT(handleIndexChange()) ); + connect( d->h, TQ_SIGNAL(sectionClicked(int)), + this, TQ_SLOT(changeSortColumn(int)) ); + connect( d->h, TQ_SIGNAL(sectionHandleDoubleClicked(int)), + this, TQ_SLOT(adjustColumn(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)), + d->h, TQ_SLOT(setOffset(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + d->h, TQ_SLOT(setOffset(int)) ); // will access d->r TQListViewPrivate::Root * r = new TQListViewPrivate::Root( this ); @@ -3460,11 +3460,11 @@ void TQListView::setColumnWidth( int column, int w ) int oldw = d->h->sectionSize( column ); if ( column < d->h->count() && oldw != w ) { d->h->resizeSection( column, w ); - disconnect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + disconnect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); emit d->h->sizeChange( column, oldw, w); - connect( d->h, SIGNAL(sizeChange(int,int,int)), - this, SLOT(handleSizeChange(int,int,int)) ); + connect( d->h, TQ_SIGNAL(sizeChange(int,int,int)), + this, TQ_SLOT(handleSizeChange(int,int,int)) ); updateGeometries(); viewport()->update(); } @@ -4446,7 +4446,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) void TQListView::contentsContextMenuEvent( TQContextMenuEvent *e ) { - if ( !receivers( SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { + if ( !receivers( TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)) ) ) { e->ignore(); return; } @@ -4486,8 +4486,8 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) d->buttonDown = FALSE; // delete and disconnect autoscroll timer, if we have one if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; @@ -4709,8 +4709,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) // connect the timer if ( needAutoScroll && !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); - connect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + connect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->start( 100, FALSE ); // call it once manually doAutoScroll( vp ); @@ -4720,8 +4720,8 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e ) if ( !needAutoScroll ) { // if there is a autoscroll timer, delete it if ( d->scrollTimer ) { - disconnect( d->scrollTimer, SIGNAL(timeout()), - this, SLOT(doAutoScroll()) ); + disconnect( d->scrollTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoScroll()) ); d->scrollTimer->stop(); delete d->scrollTimer; d->scrollTimer = 0; diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index f196a1d36..ab9beba9e 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -995,10 +995,10 @@ void TQMainWindow::setStatusBar( TQStatusBar * newStatusBar ) d->sb = newStatusBar; #ifndef TQT_NO_TOOLTIP // ### this code can cause unnecessary creation of a tool tip group - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - d->sb, SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - d->sb, SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + d->sb, TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + d->sb, TQ_SLOT(clear()) ); #endif d->sb->installEventFilter( this ); triggerLayout(); @@ -1054,10 +1054,10 @@ void TQMainWindow::setToolTipGroup( TQToolTipGroup * newToolTipGroup ) delete d->ttg; d->ttg = newToolTipGroup; - connect( toolTipGroup(), SIGNAL(showTip(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); - connect( toolTipGroup(), SIGNAL(removeTip()), - statusBar(), SLOT(clear()) ); + connect( toolTipGroup(), TQ_SIGNAL(showTip(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); + connect( toolTipGroup(), TQ_SIGNAL(removeTip()), + statusBar(), TQ_SLOT(clear()) ); } @@ -1148,8 +1148,8 @@ void TQMainWindow::setDockEnabled( TQDockWindow *dw, Dock dock, bool enable ) { if ( d->dockWindows.find( dw ) == -1 ) { d->dockWindows.append( dw ); - connect( dw, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dw, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); } TQString s; s.sprintf( "%p_%d", (void*)dw, (int)dock ); @@ -1247,8 +1247,8 @@ void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, dockWindow->setNewLine( newLine ); if ( d->dockWindows.find( dockWindow ) == -1 ) { d->dockWindows.append( dockWindow ); - connect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + connect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->installEventFilter( this ); } dockWindow->setOpaqueMoving( d->opaque ); @@ -1414,8 +1414,8 @@ void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow ) dockWindow->hide(); d->dockWindows.removeRef( dockWindow ); - disconnect( dockWindow, SIGNAL( placeChanged(TQDockWindow::Place) ), - this, SLOT( slotPlaceChanged() ) ); + disconnect( dockWindow, TQ_SIGNAL( placeChanged(TQDockWindow::Place) ), + this, TQ_SLOT( slotPlaceChanged() ) ); dockWindow->removeEventFilter( this ); } @@ -1844,7 +1844,7 @@ void TQMainWindow::triggerLayout( bool deleteLayout ) \code TQPopupMenu * help = new TQPopupMenu( this ); - help->insertItem( "What's &This", this , SLOT(whatsThis()), SHIFT+Key_F1); + help->insertItem( "What's &This", this , TQ_SLOT(whatsThis()), SHIFT+Key_F1); \endcode \sa TQWhatsThis::enterWhatsThisMode() @@ -2164,7 +2164,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const TQPopupMenu *menu = new TQPopupMenu( (TQMainWindow*)this, "qt_customize_menu" ); menu->setCheckable( TRUE ); d->dockWindowModes.replace( menu, dockWindows ); - connect( menu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) ); + connect( menu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( menuAboutToShow() ) ); return menu; } @@ -2203,7 +2203,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = dw->caption(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, dw, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, dw, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, dw->isVisible() ); empty = FALSE; } @@ -2222,7 +2222,7 @@ void TQMainWindow::menuAboutToShow() continue; TQString label = tb->label(); if ( !label.isEmpty() ) { - int id = menu->insertItem( label, tb, SLOT( toggleVisible() ) ); + int id = menu->insertItem( label, tb, TQ_SLOT( toggleVisible() ) ); menu->setItemChecked( id, tb->isVisible() ); empty = FALSE; } @@ -2238,9 +2238,9 @@ void TQMainWindow::menuAboutToShow() menu->insertSeparator(); if ( dockWindowsMovable() ) - menu->insertItem( tr( "Line up" ), this, SLOT( doLineUp() ) ); + menu->insertItem( tr( "Line up" ), this, TQ_SLOT( doLineUp() ) ); if ( isCustomizable() ) - menu->insertItem( tr( "Customize..." ), this, SLOT( customize() ) ); + menu->insertItem( tr( "Customize..." ), this, TQ_SLOT( customize() ) ); } /*! diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp index d832bcc40..c0051ef6e 100644 --- a/src/widgets/qmenubar.cpp +++ b/src/widgets/qmenubar.cpp @@ -375,7 +375,7 @@ void TQMenuBar::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges )// if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedContentsChanged() @@ -418,7 +418,7 @@ void TQMenuBar::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQMenuBar::performDelayedStateChanged() @@ -467,20 +467,20 @@ void TQMenuBar::performDelayedChanges() void TQMenuBar::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQMenuBar::frameChanged() @@ -1547,12 +1547,12 @@ void TQMenuBar::setupAccelerators() autoaccel = new TQAccel( this ); TQ_CHECK_PTR( autoaccel ); autoaccel->setIgnoreWhatsThis( TRUE ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); } autoaccel->insertItem( i, mi->id() ); } diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp index 98bc2bf1e..720cba9e0 100644 --- a/src/widgets/qmenudata.cpp +++ b/src/widgets/qmenudata.cpp @@ -361,8 +361,8 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) \code TQMenuBar *mainMenu = new TQMenuBar; TQPopupMenu *fileMenu = new TQPopupMenu; - fileMenu->insertItem( "New", myView, SLOT(newFile()), CTRL+Key_N ); - fileMenu->insertItem( "Open", myView, SLOT(open()), CTRL+Key_O ); + fileMenu->insertItem( "New", myView, TQ_SLOT(newFile()), CTRL+Key_N ); + fileMenu->insertItem( "Open", myView, TQ_SLOT(open()), CTRL+Key_O ); mainMenu->insertItem( "File", fileMenu ); \endcode @@ -373,7 +373,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup ) accelerator. (For translations use a string \link TQKeySequence key sequence\endlink.): \code - fileMenu->insertItem( tr("Open"), myView, SLOT(open()), + fileMenu->insertItem( tr("Open"), myView, TQ_SLOT(open()), tr("Ctrl+O") ); \endcode diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 051ef6d0b..5e327d200 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -115,9 +115,9 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { tqAddPostRoutine( cleanup ); } - singleSingleShot->disconnect( SIGNAL(timeout()) ); - TQObject::connect( singleSingleShot, SIGNAL(timeout()), - receiver, SLOT(subMenuTimer()) ); + singleSingleShot->disconnect( TQ_SIGNAL(timeout()) ); + TQObject::connect( singleSingleShot, TQ_SIGNAL(timeout()), + receiver, TQ_SLOT(subMenuTimer()) ); singleSingleShot->start( msec, TRUE ); } @@ -380,7 +380,7 @@ void TQPopupMenu::menuContentsChanged() return; pendingDelayedContentsChanges = 1; if( !pendingDelayedStateChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedContentsChanged() @@ -417,7 +417,7 @@ void TQPopupMenu::menuStateChanged() return; pendingDelayedStateChanges = 1; if( !pendingDelayedContentsChanges ) // if the timer hasn't been started yet - TQTimer::singleShot( 0, this, SLOT(performDelayedChanges())); + TQTimer::singleShot( 0, this, TQ_SLOT(performDelayedChanges())); } void TQPopupMenu::performDelayedStateChanged() @@ -443,20 +443,20 @@ void TQPopupMenu::performDelayedChanges() void TQPopupMenu::menuInsPopup( TQPopupMenu *popup ) { - connect( popup, SIGNAL(activatedRedirect(int)), - SLOT(subActivated(int)) ); - connect( popup, SIGNAL(highlightedRedirect(int)), - SLOT(subHighlighted(int)) ); - connect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + connect( popup, TQ_SIGNAL(activatedRedirect(int)), + TQ_SLOT(subActivated(int)) ); + connect( popup, TQ_SIGNAL(highlightedRedirect(int)), + TQ_SLOT(subHighlighted(int)) ); + connect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } void TQPopupMenu::menuDelPopup( TQPopupMenu *popup ) { - popup->disconnect( SIGNAL(activatedRedirect(int)) ); - popup->disconnect( SIGNAL(highlightedRedirect(int)) ); - disconnect( popup, SIGNAL(destroyed(TQObject*)), - this, SLOT(popupDestroyed(TQObject*)) ); + popup->disconnect( TQ_SIGNAL(activatedRedirect(int)) ); + popup->disconnect( TQ_SIGNAL(highlightedRedirect(int)) ); + disconnect( popup, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(popupDestroyed(TQObject*)) ); } @@ -803,7 +803,7 @@ void TQPopupMenu::hideAllPopups() { TQMenuData *top = this; // find top level popup if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( !isPopup() ) @@ -831,7 +831,7 @@ void TQPopupMenu::hideAllPopups() void TQPopupMenu::hidePopups() { if ( !preventAnimation ) - TQTimer::singleShot( 10, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; TQMenuItemListIt it(*mitems); @@ -1270,12 +1270,12 @@ void TQPopupMenu::updateAccel( TQWidget *parent ) // create an autoaccel in any case, even if we might not use // it immediately. Maybe the user needs it later. autoaccel = new TQAccel( parent, this ); - connect( autoaccel, SIGNAL(activated(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(activatedAmbiguously(int)), - SLOT(accelActivated(int)) ); - connect( autoaccel, SIGNAL(destroyed()), - SLOT(accelDestroyed()) ); + connect( autoaccel, TQ_SIGNAL(activated(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(activatedAmbiguously(int)), + TQ_SLOT(accelActivated(int)) ); + connect( autoaccel, TQ_SIGNAL(destroyed()), + TQ_SLOT(accelDestroyed()) ); if ( accelDisabled ) autoaccel->setEnabled( FALSE ); } @@ -1768,8 +1768,8 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= height()-sh)) { if(!d->scroll.scrolltimer) { d->scroll.scrolltimer = new TQTimer(this, "popup scroll timer"); - TQObject::connect( d->scroll.scrolltimer, SIGNAL(timeout()), - this, SLOT(subScrollTimer()) ); + TQObject::connect( d->scroll.scrolltimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(subScrollTimer()) ); } if(!d->scroll.scrolltimer->isActive()) d->scroll.scrolltimer->start(40); @@ -2497,11 +2497,11 @@ void TQPopupMenu::connectModal( TQPopupMenu* receiver, bool doConnect ) connectModalRecursionSafety = doConnect; if ( doConnect ) - connect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + connect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); else - disconnect( this, SIGNAL(activated(int)), - receiver, SLOT(modalActivation(int)) ); + disconnect( this, TQ_SIGNAL(activated(int)), + receiver, TQ_SLOT(modalActivation(int)) ); TQMenuItemListIt it(*mitems); TQMenuItem *mi; @@ -2716,7 +2716,7 @@ public: int TQPopupMenu::insertTearOffHandle( int id, int index ) { int myid = insertItem( new TQTearOffMenuItem, id, index ); - connectItem( myid, this, SLOT( toggleTearOff() ) ); + connectItem( myid, this, TQ_SLOT( toggleTearOff() ) ); TQMenuData::d->aInt = myid; return myid; } @@ -2735,8 +2735,8 @@ void TQPopupMenu::toggleTearOff() } else { // create a tear off menu TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" ); - connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) ); - connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) ); + connect( p, TQ_SIGNAL( activated(int) ), this, TQ_SIGNAL( activated(int) ) ); + connect( p, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( highlighted(int) ) ); #ifndef TQT_NO_WIDGET_TOPEXTRA p->setCaption( caption() ); #endif diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp index 469eb802c..b9c1924ce 100644 --- a/src/widgets/qpushbutton.cpp +++ b/src/widgets/qpushbutton.cpp @@ -657,7 +657,7 @@ void TQPushButton::setPopup( TQPopupMenu* popup ) if ( !d ) d = new TQPushButtonPrivate; if ( popup && !d->popup ) - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popup = popup; setIsMenuButton( popup != 0 ); diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp index b234f1f29..f9850b2f8 100644 --- a/src/widgets/qscrollbar.cpp +++ b/src/widgets/qscrollbar.cpp @@ -481,8 +481,8 @@ void TQScrollBar::startAutoRepeat() { if ( !repeater ) { repeater = new TQTimer( this, "auto-repeat timer" ); - connect( repeater, SIGNAL(timeout()), - this, SLOT(doAutoRepeat()) ); + connect( repeater, TQ_SIGNAL(timeout()), + this, TQ_SLOT(doAutoRepeat()) ); } repeater->start( thresholdTime, FALSE ); } diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 67bf56fea..c4986c800 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -586,25 +586,25 @@ TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) : d = new TQScrollViewData( this, flags ); #ifndef TQT_NO_DRAGANDDROP - connect( &d->autoscroll_timer, SIGNAL( timeout() ), - this, SLOT( doDragAutoScroll() ) ); + connect( &d->autoscroll_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragAutoScroll() ) ); #endif - connect( d->hbar, SIGNAL( valueChanged(int) ), - this, SLOT( hslide(int) ) ); - connect( d->vbar, SIGNAL( valueChanged(int) ), - this, SLOT( vslide(int) ) ); + connect( d->hbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( hslide(int) ) ); + connect( d->vbar, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( vslide(int) ) ); - connect( d->hbar, SIGNAL(sliderPressed()), this, SLOT(hbarIsPressed()) ); - connect( d->hbar, SIGNAL(sliderReleased()), this, SLOT(hbarIsReleased()) ); - connect( d->vbar, SIGNAL(sliderPressed()), this, SLOT(vbarIsPressed()) ); - connect( d->vbar, SIGNAL(sliderReleased()), this, SLOT(vbarIsReleased()) ); + connect( d->hbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(hbarIsPressed()) ); + connect( d->hbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(hbarIsReleased()) ); + connect( d->vbar, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(vbarIsPressed()) ); + connect( d->vbar, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(vbarIsReleased()) ); d->viewport->installEventFilter( this ); - connect( &d->scrollbar_timer, SIGNAL( timeout() ), - this, SLOT( updateScrollBars() ) ); + connect( &d->scrollbar_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( updateScrollBars() ) ); setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); setLineWidth( style().pixelMetric(TQStyle::PM_DefaultFrameWidth, this) ); diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp index 883065e0c..55e1589c2 100644 --- a/src/widgets/qslider.cpp +++ b/src/widgets/qslider.cpp @@ -461,7 +461,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } else if ( ( orient == Horizontal && e->pos().x() > r.right() ) //### goodPart || ( orient == Vertical && e->pos().y() > r.bottom() ) ) { @@ -474,7 +474,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) } if ( !timer ) timer = new TQTimer( this ); - connect( timer, SIGNAL(timeout()), SLOT(repeatTimeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) ); timer->start( thresholdTime, TRUE ); } update( sliderRect() ); @@ -713,9 +713,9 @@ void TQSlider::repeatTimeout() Q_ASSERT( timer ); timer->disconnect(); if ( state == TimingDown ) - connect( timer, SIGNAL(timeout()), SLOT(subtractStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) ); else if ( state == TimingUp ) - connect( timer, SIGNAL(timeout()), SLOT(addStep()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) ); timer->start( repeatTime, FALSE ); } diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp index a79b18d7e..87e232a4b 100644 --- a/src/widgets/qspinbox.cpp +++ b/src/widgets/qspinbox.cpp @@ -267,8 +267,8 @@ void TQSpinBox::initSpinBox() d = new TQSpinBoxPrivate; d->controls = new TQSpinWidget( this, "controls" ); - connect( d->controls, SIGNAL( stepUpPressed() ), SLOT( stepUp() ) ); - connect( d->controls, SIGNAL( stepDownPressed() ), SLOT( stepDown() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); wrap = FALSE; edited = FALSE; @@ -287,7 +287,7 @@ void TQSpinBox::initSpinBox() updateDisplay(); - connect( vi, SIGNAL(textChanged(const TQString&)), SLOT(textChanged()) ); + connect( vi, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged()) ); } /*! diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp index 7ea124cc7..839bf872e 100644 --- a/src/widgets/qspinwidget.cpp +++ b/src/widgets/qspinwidget.cpp @@ -87,7 +87,7 @@ TQSpinWidget::TQSpinWidget( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { d = new TQSpinWidgetPrivate(); - connect( &d->auRepTimer, SIGNAL( timeout() ), this, SLOT( timerDone() ) ); + connect( &d->auRepTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timerDone() ) ); setFocusPolicy( StrongFocus ); arrange(); @@ -209,7 +209,7 @@ void TQSpinWidget::timerDone() { // we use a double timer to make it possible for users to do // something with 0-timer on valueChanged. - TQTimer::singleShot( 1, this, SLOT( timerDoneEx() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( timerDoneEx() ) ); } void TQSpinWidget::timerDoneEx() diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp index d3d294d2e..f5830d4b8 100644 --- a/src/widgets/qstatusbar.cpp +++ b/src/widgets/qstatusbar.cpp @@ -80,8 +80,8 @@ one that has a time limit: \code - connect( loader, SIGNAL(progressMessage(const TQString&)), - statusBar(), SLOT(message(const TQString&)) ); + connect( loader, TQ_SIGNAL(progressMessage(const TQString&)), + statusBar(), TQ_SLOT(message(const TQString&)) ); statusBar()->message("Loading..."); // Initial message loader.loadStuff(); // Emits progress messages @@ -377,7 +377,7 @@ void TQStatusBar::message( const TQString &message, int ms ) if ( !d->timer ) { d->timer = new TQTimer( this ); - connect( d->timer, SIGNAL(timeout()), this, SLOT(clear()) ); + connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clear()) ); } if ( ms > 0 ) { d->timer->start( ms ); diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp index e33f0113c..814cc5a96 100644 --- a/src/widgets/qsyntaxhighlighter.cpp +++ b/src/widgets/qsyntaxhighlighter.cpp @@ -82,7 +82,7 @@ TQSyntaxHighlighter::TQSyntaxHighlighter( TQTextEdit *textEdit ) { textEdit->document()->setPreProcessor( new TQSyntaxHighlighterInternal( this ) ); textEdit->document()->invalidate(); - TQTimer::singleShot( 0, textEdit->viewport(), SLOT( update() ) ); + TQTimer::singleShot( 0, textEdit->viewport(), TQ_SLOT( update() ) ); } /*! diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp index 08e5f24f4..33a19d825 100644 --- a/src/widgets/qtabbar.cpp +++ b/src/widgets/qtabbar.cpp @@ -344,16 +344,16 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name ) d->toolTips = 0; #ifndef TQT_NO_ACCEL d->a = new TQAccel( this, "tab accelerators" ); - connect( d->a, SIGNAL(activated(int)), this, SLOT(setCurrentTab(int)) ); - connect( d->a, SIGNAL(activatedAmbiguously(int)), this, SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setCurrentTab(int)) ); + connect( d->a, TQ_SIGNAL(activatedAmbiguously(int)), this, TQ_SLOT(setCurrentTab(int)) ); #endif d->s = RoundedAbove; d->scrolls = FALSE; d->leftB = new TQToolButton( LeftArrow, this, "qt_left_btn" ); - connect( d->leftB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->leftB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->leftB->hide(); d->rightB = new TQToolButton( RightArrow, this, "qt_right_btn" ); - connect( d->rightB, SIGNAL( clicked() ), this, SLOT( scrollTabs() ) ); + connect( d->rightB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollTabs() ) ); d->rightB->hide(); d->btnWidth = style().pixelMetric(TQStyle::PM_TabBarScrollButtonWidth, this); l = new TQPtrList<TQTab>; diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index 214368814..5f1949099 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -636,8 +636,8 @@ void TQTabWidget::setTabBar( TQTabBar* tb) delete d->tabs; d->tabs = tb; setFocusProxy( d->tabs ); - connect( d->tabs, SIGNAL(selected(int)), - this, SLOT(showTab(int)) ); + connect( d->tabs, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(showTab(int)) ); setUpLayout(); } diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index fac5ca2b9..1205f46fe 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -956,8 +956,8 @@ void TQTextEdit::init() readonly = TRUE; setReadOnly( FALSE ); setFrameStyle( LineEditPanel | Sunken ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), - this, SLOT( documentWidthChanged(int) ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), + this, TQ_SLOT( documentWidthChanged(int) ) ); mousePressed = FALSE; inDoubleClick = FALSE; @@ -989,28 +989,28 @@ void TQTextEdit::init() cursor = new TQTextCursor( doc ); formatTimer = new TQTimer( this ); - connect( formatTimer, SIGNAL( timeout() ), - this, SLOT( formatMore() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( formatMore() ) ); lastFormatted = doc->firstParagraph(); scrollTimer = new TQTimer( this ); - connect( scrollTimer, SIGNAL( timeout() ), - this, SLOT( autoScrollTimerDone() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScrollTimerDone() ) ); interval = 0; changeIntervalTimer = new TQTimer( this ); - connect( changeIntervalTimer, SIGNAL( timeout() ), - this, SLOT( doChangeInterval() ) ); + connect( changeIntervalTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doChangeInterval() ) ); cursorVisible = TRUE; blinkTimer = new TQTimer( this ); - connect( blinkTimer, SIGNAL( timeout() ), - this, SLOT( blinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( blinkCursor() ) ); #ifndef TQT_NO_DRAGANDDROP dragStartTimer = new TQTimer( this ); - connect( dragStartTimer, SIGNAL( timeout() ), - this, SLOT( startDrag() ) ); + connect( dragStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startDrag() ) ); #endif d->trippleClickTimer = new TQTimer( this ); @@ -1023,8 +1023,8 @@ void TQTextEdit::init() viewport()->setFocusPolicy( WheelFocus ); setInputMethodEnabled( TRUE ); viewport()->installEventFilter( this ); - connect( this, SIGNAL(horizontalSliderReleased()), this, SLOT(sliderReleased()) ); - connect( this, SIGNAL(verticalSliderReleased()), this, SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(horizontalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); + connect( this, TQ_SIGNAL(verticalSliderReleased()), this, TQ_SLOT(sliderReleased()) ); installEventFilter( this ); } @@ -2411,11 +2411,11 @@ void TQTextEdit::copyToClipboard() d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -2776,11 +2776,11 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) d->clipboard_mode = TQClipboard::Selection; // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); // listen to selection changes - connect( TQApplication::clipboard(), SIGNAL(selectionChanged()), - this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(clipboardChanged()) ); d->clipboard_mode = TQClipboard::Clipboard; } @@ -6135,7 +6135,7 @@ void TQTextEdit::clipboardChanged() { #ifndef TQT_NO_CLIPBOARD // don't listen to selection changes - disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); #endif selectAll(FALSE); } @@ -6186,19 +6186,19 @@ bool TQTextEdit::checkOptimMode() if ( oldMode != d->optimMode ) { if ( d->optimMode ) { d->od = new TQTextEditOptimPrivate; - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - disconnect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - disconnect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + disconnect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + disconnect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); optimSetText( doc->originalText() ); doc->clear(TRUE); delete cursor; cursor = new TQTextCursor( doc ); } else { - disconnect( scrollTimer, SIGNAL( timeout() ), this, SLOT( optimDoAutoScroll() ) ); - connect( doc, SIGNAL( minimumWidthChanged(int) ), this, SLOT( documentWidthChanged(int) ) ); - connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); - connect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); + disconnect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( optimDoAutoScroll() ) ); + connect( doc, TQ_SIGNAL( minimumWidthChanged(int) ), this, TQ_SLOT( documentWidthChanged(int) ) ); + connect( scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoScrollTimerDone() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( formatMore() ) ); setText( optimText() ); delete d->od; d->od = 0; diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index 79b13a80b..dfff7c763 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -165,8 +165,8 @@ TQToolBarSeparator::TQToolBarSeparator(Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, SIGNAL(orientationChanged(Orientation)), - this, SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -602,7 +602,7 @@ void TQToolBar::createPopup() { if (!d->extensionPopup) { d->extensionPopup = new TQPopupMenu( this, "qt_dockwidget_internal" ); - connect( d->extensionPopup, SIGNAL( aboutToShow() ), this, SLOT( createPopup() ) ); + connect( d->extensionPopup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( createPopup() ) ); } if (!d->extension) { @@ -654,7 +654,7 @@ void TQToolBar::createPopup() if ( b->popup() && b->popupDelay() <= 0 ) id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() ); else - id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ; + id = d->extensionPopup->insertItem( b->iconSet(), s, b, TQ_SLOT( emulateClick() ) ) ; if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -665,9 +665,9 @@ void TQToolBar::createPopup() if ( s.isEmpty() ) s = ""; if ( b->pixmap() ) - id = d->extensionPopup->insertItem( *b->pixmap(), s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( *b->pixmap(), s, b, TQ_SLOT( emulateClick() ) ); else - id = d->extensionPopup->insertItem( s, b, SLOT( emulateClick() ) ); + id = d->extensionPopup->insertItem( s, b, TQ_SLOT( emulateClick() ) ); if ( b->isToggleButton() ) d->extensionPopup->setItemChecked( id, b->isOn() ); if ( !b->isEnabled() ) @@ -687,7 +687,7 @@ void TQToolBar::createPopup() TQPopupMenu *cp = new TQPopupMenu(d->extensionPopup); cp->setEnabled(c->isEnabled()); d->extensionPopup->insertItem( s, cp ); - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); for ( int i = 0; i < c->count(); ++i ) { TQString tmp = c->text( i ); cp->insertItem( tmp, i ); @@ -702,7 +702,7 @@ void TQToolBar::createPopup() TQPopupMenu* sp = new TQPopupMenu(d->extensionPopup); cp->insertItem( tr( "More..." ), sp ); cp = sp; - connect( cp, SIGNAL( activated(int) ), c, SLOT( internalActivate(int) ) ); + connect( cp, TQ_SIGNAL( activated(int) ), c, TQ_SLOT( internalActivate(int) ) ); } } } diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index 40bfb6de4..d5c906477 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -349,12 +349,12 @@ int TQToolBox::insertItem( int index, TQWidget *item, const TQIconSet &iconSet, if ( !item ) return -1; - connect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + connect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); TQToolBoxPrivate::Page c; c.widget = item; c.button = new TQToolBoxButton( this, label.latin1() ); - connect( c.button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); + connect( c.button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); c.sv = new TQScrollView( this ); c.sv->hide(); @@ -487,7 +487,7 @@ int TQToolBox::removeItem( TQWidget *item ) { int index = indexOf(item); if (index >= 0) { - disconnect(item, SIGNAL(destroyed(TQObject*)), this, SLOT(itemDestroyed(TQObject*))); + disconnect(item, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(itemDestroyed(TQObject*))); item->reparent( this, TQPoint(0,0) ); // destroy internal data itemDestroyed(item); diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 1316944f0..b2a4443bf 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -147,11 +147,11 @@ TQToolButton::TQToolButton( TQWidget * parent, const char *name ) if ( tb ) { setAutoRaise( TRUE ); if ( tb->mainWindow() ) { - connect( tb->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( tb->mainWindow()->usesBigPixmaps() ); - connect( tb->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( tb->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( tb->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -237,13 +237,13 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel, setIconSet( iconSet ); setTextLabel( textLabel ); if ( receiver && slot ) - connect( this, SIGNAL(clicked()), receiver, slot ); + connect( this, TQ_SIGNAL(clicked()), receiver, slot ); if ( parent->mainWindow() ) { - connect( parent->mainWindow(), SIGNAL(pixmapSizeChanged(bool)), - this, SLOT(setUsesBigPixmap(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(pixmapSizeChanged(bool)), + this, TQ_SLOT(setUsesBigPixmap(bool)) ); setUsesBigPixmap( parent->mainWindow()->usesBigPixmaps() ); - connect( parent->mainWindow(), SIGNAL(usesTextLabelChanged(bool)), - this, SLOT(setUsesTextLabel(bool)) ); + connect( parent->mainWindow(), TQ_SIGNAL(usesTextLabelChanged(bool)), + this, TQ_SLOT(setUsesTextLabel(bool)) ); setUsesTextLabel( parent->mainWindow()->usesTextLabel() ); } else { setUsesBigPixmap( FALSE ); @@ -749,9 +749,9 @@ TQIconSet TQToolButton::iconSet() const void TQToolButton::setPopup( TQPopupMenu* popup ) { if ( popup && !d->popupTimer ) { - connect( this, SIGNAL( pressed() ), this, SLOT( popupPressed() ) ); + connect( this, TQ_SIGNAL( pressed() ), this, TQ_SLOT( popupPressed() ) ); d->popupTimer = new TQTimer( this ); - connect( d->popupTimer, SIGNAL( timeout() ), this, SLOT( popupTimerDone() ) ); + connect( d->popupTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( popupTimerDone() ) ); } d->popup = popup; diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index 5d3cae194..118c0da6e 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -165,8 +165,8 @@ TQTipManager::TQTipManager() label = 0; preventAnimation = FALSE; isApplicationFilter = FALSE; - connect( &wakeUp, SIGNAL(timeout()), SLOT(showTip()) ); - connect( &fallAsleep, SIGNAL(timeout()), SLOT(hideTip()) ); + connect( &wakeUp, TQ_SIGNAL(timeout()), TQ_SLOT(showTip()) ); + connect( &fallAsleep, TQ_SIGNAL(timeout()), TQ_SLOT(hideTip()) ); removeTimer = new TQTimer( this ); } @@ -225,7 +225,7 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, delete h; } } else - connect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + connect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); tips->insert( w, t ); @@ -241,10 +241,10 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, } if ( t->group ) { - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); - connect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); + connect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); } } @@ -288,7 +288,7 @@ void TQTipManager::remove( TQWidget *w, const TQRect & r, bool delayhide ) } if ( (*tips)[ w ] == 0 ) - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 // not needed, leads sometimes to crashes if ( tips->isEmpty() ) { // the manager will be recreated if needed @@ -337,7 +337,7 @@ void TQTipManager::remove( TQWidget *w ) t = d; } - disconnect( w, SIGNAL(destroyed()), this, SLOT(clientWidgetDestroyed()) ); + disconnect( w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(clientWidgetDestroyed()) ); #if 0 if ( tips->isEmpty() ) { delete tipManager; @@ -356,8 +356,8 @@ void TQTipManager::removeFromGroup( TQToolTipGroup *g ) while ( t ) { if ( t->group == g ) { if ( t->group ) - disconnect( removeTimer, SIGNAL( timeout() ), - t->group, SIGNAL( removeTip() ) ); + disconnect( removeTimer, TQ_SIGNAL( timeout() ), + t->group, TQ_SIGNAL( removeTip() ) ); t->group = 0; } t = t->next; @@ -525,7 +525,7 @@ void TQTipManager::showTip() if ( t->geometry != TQRect( -1, -1, -1, -1 ) ) label->resize( t->geometry.size() ); TQ_CHECK_PTR( label ); - connect( label, SIGNAL(destroyed()), SLOT(labelDestroyed()) ); + connect( label, TQ_SIGNAL(destroyed()), TQ_SLOT(labelDestroyed()) ); } // the above deletion and creation of a TQTipLabel causes events to be sent. We had reports that the widget // pointer was 0 after this. This is in principle possible if the wrong kind of events get sent through our event @@ -598,7 +598,7 @@ void TQTipManager::showTip() void TQTipManager::hideTip() { - TQTimer::singleShot( 250, this, SLOT(allowAnimation()) ); + TQTimer::singleShot( 250, this, TQ_SLOT(allowAnimation()) ); preventAnimation = TRUE; if ( label && label->isVisible() ) { @@ -1122,10 +1122,10 @@ void TQToolTip::clear() \code TQToolTipGroup * grp = new TQToolTipGroup( this, "tool tip relay" ); - connect( grp, SIGNAL(showTip(const TQString&)), - myLabel, SLOT(setText(const TQString&)) ); - connect( grp, SIGNAL(removeTip()), - myLabel, SLOT(clear()) ); + connect( grp, TQ_SIGNAL(showTip(const TQString&)), + myLabel, TQ_SLOT(setText(const TQString&)) ); + connect( grp, TQ_SIGNAL(removeTip()), + myLabel, TQ_SLOT(clear()) ); TQToolTip::add( giraffeButton, "feed giraffe", grp, "Give the giraffe a meal" ); TQToolTip::add( gorillaButton, "feed gorilla", diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index cd87acd5c..de2b19c17 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -252,7 +252,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co #endif if ( widget ) - connect( widget, SIGNAL( destroyed() ), this, SLOT( widgetDestroyed() ) ); + connect( widget, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( widgetDestroyed() ) ); TQRect r; @@ -455,8 +455,8 @@ TQWhatsThisButton::TQWhatsThisButton( TQWidget * parent, const char * name ) setFocusPolicy( NoFocus ); setTextLabel( tr( "What's this?" ) ); wt->buttons->insert( (void *)this, this ); - connect( this, SIGNAL( released() ), - this, SLOT( mouseReleased() ) ); + connect( this, TQ_SIGNAL( released() ), + this, TQ_SLOT( mouseReleased() ) ); } @@ -742,7 +742,7 @@ TQWhatsThisPrivate::WhatsThisItem* TQWhatsThisPrivate::newItem( TQWidget * widge tlw->insert( (void *)t, t ); t->installEventFilter( this ); } - connect( widget, SIGNAL(destroyed()), this, SLOT(cleanupWidget()) ); + connect( widget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(cleanupWidget()) ); return i; } |