From 82c1dbe490f7afcb5b48fdfb8748bde249bcf4f7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 Nov 2023 02:32:29 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 4 Signed-off-by: Michele Calgaro --- kate/app/katemdi.cpp | 2 +- kcontrol/displayconfig/displayconfig.cpp | 14 +++++++------- konqueror/konq_factory.cpp | 2 +- konqueror/konq_mainwindow.cpp | 8 ++++---- tdeioslave/media/medianotifier/medianotifier.cpp | 2 +- tdm/kfrontend/themer/tdmitem.cpp | 2 +- twin/lib/kcommondecoration.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 8d5532948..d3d4528b1 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -257,7 +257,7 @@ void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")) { - setFocusProxy (::tqqt_cast(TQT_TQOBJECT(ev->child()))); + setFocusProxy (::tqt_cast(TQT_TQOBJECT(ev->child()))); } TQVBox::childEvent (ev); diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index e8a7ac528..2c262fc3b 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -434,7 +434,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); if (monitor->screen_id == monitor_id) { moved_monitor = monitor; @@ -475,7 +475,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor @@ -548,7 +548,7 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); if (monitor != monitor_to_move) { other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry())); @@ -592,7 +592,7 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); if (monitor != monitor_to_move) { other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry())); @@ -641,7 +641,7 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor @@ -1329,7 +1329,7 @@ void KDisplayConfig::updateDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { TQWidget *monitor = TQT_TQWIDGET(monitors.at( i )); if ( !monitor->close(TRUE) ) { Q_ASSERT("zombie monitor will not go away!"); @@ -1381,7 +1381,7 @@ void KDisplayConfig::layoutDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqqt_cast(TQT_TQWIDGET(monitors.at( i )))) { + if (::tqt_cast(TQT_TQWIDGET(monitors.at( i )))) { DraggableMonitor *monitor = static_cast(TQT_TQWIDGET(monitors.at( i ))); screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id); moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position); diff --git a/konqueror/konq_factory.cpp b/konqueror/konq_factory.cpp index d89cbf9a6..e35f5b7c7 100644 --- a/konqueror/konq_factory.cpp +++ b/konqueror/konq_factory.cpp @@ -74,7 +74,7 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl; KParts::ReadOnlyPart* part = static_cast( obj ); - TQFrame* frame = ::tqqt_cast( part->widget() ); + TQFrame* frame = ::tqt_cast( part->widget() ); if (frame) { frame->setFrameStyle( TQFrame::NoFrame ); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 78238087f..4633f72c9 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -1189,9 +1189,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs { KParts::BrowserHostExtension *hostExtension = 0; KParts::ReadOnlyPart *ro_part = 0L; - KParts::BrowserExtension *be = ::tqqt_cast(sender()); + KParts::BrowserExtension *be = ::tqt_cast(sender()); if (be) - ro_part = ::tqqt_cast(be->parent()); + ro_part = ::tqt_cast(be->parent()); if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) ) { // Found a view. If url isn't empty, we should open it - but this never happens currently @@ -4839,7 +4839,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if ( client ) pPopupMenu->factory()->addClient( client ); - KParts::BrowserExtension *be = ::tqqt_cast(sender()); + KParts::BrowserExtension *be = ::tqt_cast(sender()); if ( be ) { @@ -4905,7 +4905,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa } // Special case: RMB + renaming in sidebar; setFocus would abort editing. TQWidget* fw = focusWidget(); - if ( !fw || !::tqqt_cast( fw ) ) + if ( !fw || !::tqt_cast( fw ) ) m_oldView->part()->widget()->setFocus(); } } diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 1c4e8a216..1e75b2501 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -425,7 +425,7 @@ void MediaNotifier::slotFreeCancel() void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res ) { - TQCheckBox *checkbox = ::tqqt_cast( m_freeDialog->child( 0, "TQCheckBox" ) ); + TQCheckBox *checkbox = ::tqt_cast( m_freeDialog->child( 0, "TQCheckBox" ) ); if ( checkbox && checkbox->isChecked() ) KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res); m_freeDialog->delayedDestruct(); diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index 361f73e06..e89890129 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -232,7 +232,7 @@ KdmItem::setWidget( TQWidget *widget ) myWidget->show(); // Remove borders so that it blends nicely with the theme background - TQFrame* frame = ::tqqt_cast( widget ); + TQFrame* frame = ::tqt_cast( widget ); if (frame) frame->setFrameStyle( TQFrame::NoFrame ); diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index e1c74d5bc..6bec9b928 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -203,7 +203,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast(*it) ); + x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast(*it) ); elementLayouted = true; } } else { @@ -226,7 +226,7 @@ void KCommonDecoration::updateLayout() const if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast(*it) );; + x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast(*it) );; elementLayouted = true; } } else {