Drop TQT_TQ*_CONST defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/219/head
Michele Calgaro 9 months ago
parent c0b74ba868
commit 23278d2593
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -108,7 +108,7 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const
void ServiceBrowser::serviceResolved(bool success) void ServiceBrowser::serviceResolved(bool success)
{ {
TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())); TQObject* sender_obj = const_cast<TQObject*>(sender());
RemoteService* svr = static_cast<RemoteService*>(sender_obj); RemoteService* svr = static_cast<RemoteService*>(sender_obj);
disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool))); disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool)));
TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin(); TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin();

@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor)
void KateSuperRangeList::slotEliminated() void KateSuperRangeList::slotEliminated()
{ {
if (sender()) { if (sender()) {
KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))); KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender()));
emit rangeEliminated(range); emit rangeEliminated(range);
if (m_trackingBoundaries) { if (m_trackingBoundaries) {

@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( createAgent( version, (*addrIt).agent() ) ); card.addLine( createAgent( version, (*addrIt).agent() ) );
// BDAY // BDAY
card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) ) ); card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) );
// CATEGORIES // CATEGORIES
if ( version == VCard::v3_0 ) { if ( version == VCard::v3_0 ) {
@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) ); card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) );
// REV // REV
card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) ) ); card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) );
// ROLE // ROLE
VCardLine roleLine( "ROLE", TQString((*addrIt).role()) ); VCardLine roleLine( "ROLE", TQString((*addrIt).role()) );

@ -222,7 +222,7 @@ void KLibrary::slotObjectCreated( TQObject *obj )
void KLibrary::slotObjectDestroyed() void KLibrary::slotObjectDestroyed()
{ {
m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) ); m_objs.removeRef( sender() );
if ( m_objs.count() == 0 ) if ( m_objs.count() == 0 )
{ {

@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog()
void PermissionDialog::clicked() void PermissionDialog::clicked()
{ {
m_button = TQT_TQOBJECT_CONST(sender())->name(); m_button = sender()->name();
static_cast<const TQWidget*>(sender())->parentWidget()->close(); static_cast<const TQWidget*>(sender())->parentWidget()->close();
} }

@ -263,7 +263,7 @@ void TDEHTMLPartBrowserExtension::copy()
void TDEHTMLPartBrowserExtension::searchProvider() void TDEHTMLPartBrowserExtension::searchProvider()
{ {
// action name is of form "previewProvider[<searchproviderprefix>:]" // action name is of form "previewProvider[<searchproviderprefix>:]"
const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 ); const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 );
KURIFilterData data; KURIFilterData data;
TQStringList list; TQStringList list;

@ -5033,7 +5033,7 @@ void TDEHTMLPart::slotParentCompleted()
void TDEHTMLPart::slotChildStarted( TDEIO::Job *job ) void TDEHTMLPart::slotChildStarted( TDEIO::Job *job )
{ {
tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); tdehtml::ChildFrame *child = frame( sender() );
assert( child ); assert( child );
@ -5060,7 +5060,7 @@ void TDEHTMLPart::slotChildCompleted()
void TDEHTMLPart::slotChildCompleted( bool pendingAction ) void TDEHTMLPart::slotChildCompleted( bool pendingAction )
{ {
tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); tdehtml::ChildFrame *child = frame( sender() );
if ( child ) { if ( child ) {
kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl; kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@ -5093,7 +5093,7 @@ void TDEHTMLPart::slotChildDocCreated()
void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
{ {
tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() ); tdehtml::ChildFrame *child = frame( sender()->parent() );
TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent())); TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent()));
// TODO: handle child target correctly! currently the script are always executed fur the parent // TODO: handle child target correctly! currently the script are always executed fur the parent

@ -935,7 +935,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url )
// delayed updating of files, FAM is flooding us with events // delayed updating of files, FAM is flooding us with events
void KDirListerCache::slotFileDirtyDelayed() void KDirListerCache::slotFileDirtyDelayed()
{ {
TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() ); TQString file = TQString::fromUtf8( sender()->name() );
kdDebug(7004) << k_funcinfo << file << endl; kdDebug(7004) << k_funcinfo << file << endl;

@ -135,7 +135,7 @@ void TabWidget::childDestroyed()
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender()); const TQObject* pLostChild = sender();
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
{ {
TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget"); TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");

@ -493,7 +493,7 @@ void KMdiChildView::slot_childDestroyed()
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender()); const TQObject * pLostChild = sender();
if ( pLostChild && ( pLostChild->isWidgetType() ) ) if ( pLostChild && ( pLostChild->isWidgetType() ) )
{ {
TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );

@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
void KMMainView::slotChangePrinterState() void KMMainView::slotChangePrinterState()
{ {
TQString opname = TQT_TQOBJECT_CONST(sender())->name(); TQString opname = sender()->name();
if (m_current && opname.startsWith("printer_")) if (m_current && opname.startsWith("printer_"))
{ {
opname = opname.mid(8); opname = opname.mid(8);

@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len)
void EscpWidget::slotButtonClicked() void EscpWidget::slotButtonClicked()
{ {
TQString arg = TQT_TQOBJECT_CONST(sender())->name(); TQString arg = sender()->name();
startCommand(arg); startCommand(arg);
} }

@ -231,7 +231,7 @@ union kthemeKey{
unsigned int cacheKey; unsigned int cacheKey;
}; };
#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))) #define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))
void KThemeBase::generateBorderPix( int i ) void KThemeBase::generateBorderPix( int i )
{ {

@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton()
void KSwitchLanguageDialog::removeButtonClicked() void KSwitchLanguageDialog::removeButtonClicked()
{ {
TQObject const *signalSender = TQT_TQOBJECT_CONST(sender()); TQObject const *signalSender = sender();
if (signalSender == NULL) if (signalSender == NULL)
{ {

@ -1109,7 +1109,7 @@ void TDEAction::activate()
void TDEAction::slotActivated() void TDEAction::slotActivated()
{ {
const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); const TQObject *senderObj = sender();
if ( senderObj ) if ( senderObj )
{ {
if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) ) if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
@ -1167,7 +1167,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
void TDEAction::slotDestroyed() void TDEAction::slotDestroyed()
{ {
kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl; 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 #ifndef KDE_NO_COMPAT // KDE 4: remove
if ( o == d->m_tdeaccel ) if ( o == d->m_tdeaccel )
@ -1193,7 +1193,7 @@ void TDEAction::slotDestroyed()
int i; int i;
do do
{ {
i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) ); i = findContainer( static_cast<const TQWidget*>(o) );
if ( i != -1 ) if ( i != -1 )
removeContainer( i ); removeContainer( i );
} while ( i != -1 ); } while ( i != -1 );

@ -322,12 +322,12 @@ void TDERadioAction::slotActivated()
{ {
if ( isChecked() ) if ( isChecked() )
{ {
const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); const TQObject *senderObj = sender();
if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) ) if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
return; 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; return;
} }

@ -547,7 +547,7 @@ void TDEActionCollection::slotMenuItemHighlighted( int id )
if ( d->m_currentHighlightAction ) if ( d->m_currentHighlightAction )
emit actionHighlighted( d->m_currentHighlightAction, false ); 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 ); d->m_currentHighlightAction = findAction( container, id );
@ -581,7 +581,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
if ( !d->m_highlight ) if ( !d->m_highlight )
return; return;
TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
TDEAction *action = findAction( container, id ); TDEAction *action = findAction( container, id );
@ -606,7 +606,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
void TDEActionCollection::slotDestroyed() 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 ) TDEAction *TDEActionCollection::findAction( TQWidget *container, int id )

@ -345,7 +345,7 @@ TQRect TDECompletionBox::calculateGeometry() const
if ( d->m_parent && (combo = d->m_parent->parent() ) && if ( d->m_parent && (combo = d->m_parent->parent() ) &&
combo->inherits("TQComboBox") ) 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 //Expand to the combo width
w = TQMAX( w, cb->width() ); w = TQMAX( w, cb->width() );

Loading…
Cancel
Save