summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kswitchlanguagedialog.cpp2
-rw-r--r--tdeui/tdeaction.cpp6
-rw-r--r--tdeui/tdeactionclasses.cpp4
-rw-r--r--tdeui/tdeactioncollection.cpp6
-rw-r--r--tdeui/tdecompletionbox.cpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index c82ffb83d..626c62c3e 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton()
void KSwitchLanguageDialog::removeButtonClicked()
{
- TQObject const *signalSender = TQT_TQOBJECT_CONST(sender());
+ TQObject const *signalSender = sender();
if (signalSender == NULL)
{
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 63f633d95..985782f33 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -1109,7 +1109,7 @@ void TDEAction::activate()
void TDEAction::slotActivated()
{
- const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+ const TQObject *senderObj = sender();
if ( senderObj )
{
if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
@@ -1167,7 +1167,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
void TDEAction::slotDestroyed()
{
kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl;
- const TQObject* const o = TQT_TQOBJECT_CONST(sender());
+ const TQObject* const o = sender();
#ifndef KDE_NO_COMPAT // KDE 4: remove
if ( o == d->m_tdeaccel )
@@ -1193,7 +1193,7 @@ void TDEAction::slotDestroyed()
int i;
do
{
- i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) );
+ i = findContainer( static_cast<const TQWidget*>(o) );
if ( i != -1 )
removeContainer( i );
} while ( i != -1 );
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index a1e9f28a3..7ef60189c 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -322,12 +322,12 @@ void TDERadioAction::slotActivated()
{
if ( isChecked() )
{
- const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+ const TQObject *senderObj = sender();
if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
return;
- const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
+ const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true );
return;
}
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 98e8264b6..fe0f123a9 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -547,7 +547,7 @@ void TDEActionCollection::slotMenuItemHighlighted( int id )
if ( d->m_currentHighlightAction )
emit actionHighlighted( d->m_currentHighlightAction, false );
- TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+ TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
d->m_currentHighlightAction = findAction( container, id );
@@ -581,7 +581,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
if ( !d->m_highlight )
return;
- TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+ TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
TDEAction *action = findAction( container, id );
@@ -606,7 +606,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
void TDEActionCollection::slotDestroyed()
{
- d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) );
+ d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(sender()) ) );
}
TDEAction *TDEActionCollection::findAction( TQWidget *container, int id )
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index f04a48e74..b0637c182 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -345,7 +345,7 @@ TQRect TDECompletionBox::calculateGeometry() const
if ( d->m_parent && (combo = d->m_parent->parent() ) &&
combo->inherits("TQComboBox") )
{
- const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
+ const TQComboBox* cb = static_cast<const TQComboBox*>(combo);
//Expand to the combo width
w = TQMAX( w, cb->width() );