From 67f2b0da2c80c3ee335aecda5dfedf3176edd8b9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 9 Aug 2023 17:17:58 +0900 Subject: Drop TQT_TQ*_CONST defines Signed-off-by: Michele Calgaro --- konqueror/iconview/konq_iconview.cpp | 2 +- konqueror/keditbookmarks/actionsimpl.cpp | 2 +- konqueror/konq_guiclients.cpp | 2 +- konqueror/konq_mainwindow.cpp | 16 ++++++++-------- konqueror/listview/konq_infolistviewitem.cpp | 2 +- konqueror/listview/konq_listviewitems.cpp | 2 +- konqueror/listview/konq_listviewwidget.cpp | 2 +- konqueror/sidebar/sidebar_widget.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'konqueror') diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp index 5efc1e751..6a701e01f 100644 --- a/konqueror/iconview/konq_iconview.cpp +++ b/konqueror/iconview/konq_iconview.cpp @@ -436,7 +436,7 @@ const KFileItem * KonqKfmIconView::currentItem() void KonqKfmIconView::slotPreview( bool toggle ) { - TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case) + TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case) if (name == "iconview_preview_all") { m_pProps->setShowingPreview( toggle ); diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 246cbb0b8..aedf4a74d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -392,7 +392,7 @@ void ActionsImpl::slotImport() { // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == " // << sender()->name() << endl; ImportCommand* import - = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self()); + = ImportCommand::performImport(sender()->name()+6, KEBApp::self()); if (!import) return; CmdHistory::self()->addCommand(import); diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp index 31647b0c3..94f6eedc9 100644 --- a/konqueror/konq_guiclients.cpp +++ b/konqueror/konq_guiclients.cpp @@ -235,7 +235,7 @@ TQPtrList ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); + TQString serviceName = TQString::fromLatin1( sender()->name() ); bool horizontal = m_mapOrientation[ serviceName ]; diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index c8746e8da..770678c4e 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -979,7 +979,7 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs { kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - KParts::ReadOnlyPart *callingPart = static_cast( TQT_TQOBJECT_CONST(sender())->parent() ); + KParts::ReadOnlyPart *callingPart = static_cast( sender()->parent() ); TQString frameName = args.frameName; if ( !frameName.isEmpty() ) @@ -1508,7 +1508,7 @@ void KonqMainWindow::slotOpenLocation() void KonqMainWindow::slotToolFind() { - kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl; + kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl; if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") ) { @@ -1538,7 +1538,7 @@ void KonqMainWindow::slotToolFind() connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); } - else if ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below + else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { KURL url; if ( m_currentView && m_currentView->url().isLocalFile() ) @@ -1587,7 +1587,7 @@ void KonqMainWindow::slotOpenWith() KURL::List lst; lst.append( m_currentView->url() ); - TQString serviceName = TQT_TQOBJECT_CONST(sender())->name(); + TQString serviceName = sender()->name(); TDETrader::OfferList offers = m_currentView->appServiceOffers(); TDETrader::OfferList::ConstIterator it = offers.begin(); @@ -1605,7 +1605,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) if ( !toggle ) return; - TQString modeName = TQT_TQOBJECT_CONST(sender())->name(); + TQString modeName = sender()->name(); if ( m_currentView->service()->desktopEntryName() == modeName ) return; @@ -2945,7 +2945,7 @@ void KonqMainWindow::slotActivatePrevTab() void KonqMainWindow::slotActivateTab() { - m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 ); + m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 ); } void KonqMainWindow::slotDumpDebugInfo() @@ -4660,7 +4660,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa { KonqView * m_oldView = m_currentView; - KonqView * currentView = childView( static_cast( TQT_TQOBJECT_CONST(sender())->parent() ) ); + KonqView * currentView = childView( static_cast( sender()->parent() ) ); //kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl; @@ -4926,7 +4926,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) void KonqMainWindow::slotOpenEmbedded() { - TQCString name = TQT_TQOBJECT_CONST(sender())->name(); + TQCString name = sender()->name(); m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName(); diff --git a/konqueror/listview/konq_infolistviewitem.cpp b/konqueror/listview/konq_infolistviewitem.cpp index 18efb3f8f..f945333b8 100644 --- a/konqueror/listview/konq_infolistviewitem.cpp +++ b/konqueror/listview/konq_infolistviewitem.cpp @@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_listviewitems.cpp b/konqueror/listview/konq_listviewitems.cpp index 493e157b4..94c090189 100644 --- a/konqueror/listview/konq_listviewitems.cpp +++ b/konqueror/listview/konq_listviewitems.cpp @@ -322,7 +322,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); TDEListView *lv = static_cast< TDEListView* >( listView() ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap(); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { int newWidth = width( lv->fontMetrics(), lv, _column ); diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index d5fd6ac2c..2b48b6718 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -1490,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r ) { - const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap()); + const TQPixmap *pm = viewport()->paletteBackgroundPixmap(); if (!pm || pm->isNull()) p->fillRect(r, viewport()->backgroundColor()); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index a6d172e41..e3477b2f8 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -1144,7 +1144,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar void Sidebar_Widget::enableAction( const char * name, bool enabled ) { - if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")) + if (sender()->parent()->isA("ButtonInfo")) { ButtonInfo *btninfo = static_cast(sender()->parent()); if (btninfo) @@ -1169,7 +1169,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) bool Sidebar_Widget::doEnableActions() { - if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))) + if (!(sender()->parent()->isA("ButtonInfo"))) { kdDebug()<<"Couldn't set active module, aborting"<