summaryrefslogtreecommitdiffstats
path: root/src/widgets/qaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/qaction.cpp')
-rw-r--r--src/widgets/qaction.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 14bb5743..361ed026 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() ) {