summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-09 17:17:58 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-09 17:17:58 +0900
commit67f2b0da2c80c3ee335aecda5dfedf3176edd8b9 (patch)
tree24062384f6f95b5407af0708c477cbfa4a39198e
parent7bc43c68b3c095631628e1fb691242315687d15b (diff)
downloadtdebase-67f2b0da2c80c3ee335aecda5dfedf3176edd8b9.tar.gz
tdebase-67f2b0da2c80c3ee335aecda5dfedf3176edd8b9.zip
Drop TQT_TQ*_CONST defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kcontrol/display/display.cpp2
-rw-r--r--kcontrol/kcontrol/indexwidget.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp4
-rw-r--r--kicker/taskbar/taskcontainer.cpp4
-rw-r--r--konqueror/iconview/konq_iconview.cpp2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp2
-rw-r--r--konqueror/konq_guiclients.cpp2
-rw-r--r--konqueror/konq_mainwindow.cpp16
-rw-r--r--konqueror/listview/konq_infolistviewitem.cpp2
-rw-r--r--konqueror/listview/konq_listviewitems.cpp2
-rw-r--r--konqueror/listview/konq_listviewwidget.cpp2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp4
-rw-r--r--konsole/konsole/konsole.cpp2
-rw-r--r--konsole/konsole/konsolebookmarkmenu.cpp2
-rw-r--r--libkonq/knewmenu.cpp4
-rw-r--r--libkonq/konq_popupmenu.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp2
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
19 files changed, 30 insertions, 30 deletions
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index b3e15d021..3555d0ddc 100644
--- a/kcontrol/display/display.cpp
+++ b/kcontrol/display/display.cpp
@@ -85,7 +85,7 @@ void KCMDisplay::save()
void KCMDisplay::moduleChanged( bool isChanged )
{
- TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
+ TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(const_cast<TQObject*>(sender())));
Q_ASSERT(currentModule != m_modules.end());
if (currentModule.data() == isChanged)
return;
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index 92b9cf0a0..cf57dc0e4 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e)
void IndexWidget::moduleSelected(ConfigModule *m)
{
- const TQObject *obj = TQT_TQOBJECT_CONST(sender());
+ const TQObject *obj = sender();
if(!m) return;
emit moduleActivated(m);
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index adaef23e2..67a32a3b1 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2765,7 +2765,7 @@ void KMenu::slotStartURL(const TQString& u)
void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ )
{
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
if (!item)
return;
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 0860cc123..52588ed72 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected()
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
a = (TDEAction*)sender();
b = a->text();
- m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (TDEAction *)sender() )->text() /* Title */ );
}
@@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected()
TDEAction *a;
TQString b;
- TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
+ TQString link(sender()->name()+8);
a = (TDEAction*)sender();
b = a->text();
m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 97ba53745..9cea8a32e 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -256,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
return;
}
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -279,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
void TaskContainer::iconChanged()
{
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
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<TDEAction> 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<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() );
+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( 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<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) );
+ KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( 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<ButtonInfo*>(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"<<endl;
return false;
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 6bdb07e6d..7f27a678e 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -2591,7 +2591,7 @@ void Konsole::listSessions()
void Konsole::switchToSession()
{
- activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
+ activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 );
}
void Konsole::activateSession(int position)
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0afe6a693..77b86882b 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
void KonsoleBookmarkMenu::slotBookmarkSelected()
{
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
- m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (TDEAction *)sender() )->text() /* Title */ );
}
diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp
index 621b1f614..042bb4e92 100644
--- a/libkonq/knewmenu.cpp
+++ b/libkonq/knewmenu.cpp
@@ -368,11 +368,11 @@ void KNewMenu::slotNewDir()
void KNewMenu::slotNewFile()
{
- int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu"
+ int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
if (id == 0)
{
// run the command for the templates
- KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name()));
+ KRun::runCommand(TQString(sender()->name()));
return;
}
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index adaffe9e3..fa096a239 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -1087,7 +1087,7 @@ void KonqPopupMenu::slotPopupAddToBookmark()
void KonqPopupMenu::slotRunService()
{
- TQCString senderName = TQT_TQOBJECT_CONST(sender())->name();
+ TQCString senderName = sender()->name();
int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
// Is it a usual service (application)
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 90376ec2a..0c3febd86 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -599,7 +599,7 @@ void FaxCtrl::slotClearLog()
void FaxCtrl::slotCloseLog()
{
- const TQObject *obj = TQT_TQOBJECT_CONST(sender());
+ const TQObject *obj = sender();
if (m_logview)
{
TQTextEdit *view = m_logview;
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index c5e5e37e7..9b8a4ab3a 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -169,7 +169,7 @@ public:
// painting of list background for now.
return TDEListView::paintEmptyArea(p, rect );
- const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap());
+ const TQPixmap *pm = paletteBackgroundPixmap();
if (!pm || pm->isNull()) {
return;
}