From f614f05c1aff2549c551e33fa46f3e89c614d201 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 15 Dec 2023 12:42:29 +0900 Subject: [PATCH] Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit d27c63f0f8d1b581be5c43f5c371eb633ccfa529) --- systemsettings/mainwindow.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index 082a7be..fba400a 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -89,7 +89,7 @@ void MainWindow::buildMainWidget() modulesScroller = new KCScrollView(moduleTabs); ModulesView *modulesView = new ModulesView( menu, (*it).subMenu, modulesScroller->viewport(), "modulesView" ); modulesViewList.append(modulesView); - connect(modulesView, TQT_SIGNAL(itemSelected(TQIconViewItem* )), TQT_TQOBJECT(this), TQT_SLOT(slotItemSelected(TQIconViewItem*))); + connect(modulesView, TQT_SIGNAL(itemSelected(TQIconViewItem* )), this, TQT_SLOT(slotItemSelected(TQIconViewItem*))); modulesScroller->addChild(modulesView); moduleTabs->addTab(modulesScroller, (*it).caption); overviewPages.append(modulesScroller); @@ -103,23 +103,23 @@ void MainWindow::buildMainWidget() void MainWindow::buildActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); + KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); - resetModule = new TDEAction(i18n("Undo Changes"), 0, TQT_TQOBJECT(this), + resetModule = new TDEAction(i18n("Undo Changes"), 0, this, TQT_SLOT(showAllModules()), actionCollection(), "resetModule" ); resetModule->setEnabled(false); - defaultModule = new TDEAction(i18n("Reset to Defaults"), 0, TQT_TQOBJECT(this), + defaultModule = new TDEAction(i18n("Reset to Defaults"), 0, this, TQT_SLOT(showAllModules()), actionCollection(), "defaultModule" ); defaultModule->setEnabled(false); if( embeddedWindows ) { - showAllAction = new TDEAction(i18n("Overview"), TQApplication::reverseLayout() ? "forward" : "back", 0, TQT_TQOBJECT(this), + showAllAction = new TDEAction(i18n("Overview"), TQApplication::reverseLayout() ? "forward" : "back", 0, this, TQT_SLOT(showAllModules()), actionCollection(), "showAll" ); showAllAction->setEnabled(false); } - aboutModuleAction = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutCurrentModule()), actionCollection(), "help_about_module"); + aboutModuleAction = new TDEAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutCurrentModule()), actionCollection(), "help_about_module"); resetModuleHelp(); // Search @@ -128,7 +128,7 @@ void MainWindow::buildActions() KcmSearch* search = new KcmSearch(&modulesViewList, hbox, "search"); hbox->setStretchFactor(search,1); - connect(search, TQT_SIGNAL(searchHits(const TQString &, int *, int)), TQT_TQOBJECT(this), TQT_SLOT(slotSearchHits(const TQString &, int *, int))); + connect(search, TQT_SIGNAL(searchHits(const TQString &, int *, int)), this, TQT_SLOT(slotSearchHits(const TQString &, int *, int))); TQVBox *vbox = new TQVBox(hbox); generalHitLabel = new TQLabel(vbox); @@ -156,7 +156,7 @@ void MainWindow::buildActions() // The Clear search box button. TDEToolBarButton *clearWidget = new TDEToolBarButton(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this); - searchClear = new KWidgetAction( clearWidget, TQString(""), CTRL+Key_L, TQT_TQOBJECT(search), TQT_SLOT(clear()), + searchClear = new KWidgetAction( clearWidget, TQString(""), CTRL+Key_L, search, TQT_SLOT(clear()), actionCollection(), "searchReset"); connect(clearWidget, TQT_SIGNAL(clicked()), searchClear, TQT_SLOT(activate())); searchClear->setWhatsThis( i18n( "Reset Search\n" @@ -174,7 +174,7 @@ void MainWindow::buildActions() continue; } - TDERadioAction *newAction = new TDERadioAction( group->caption(), group->icon(), TDEShortcut(), TQT_TQOBJECT(this), + TDERadioAction *newAction = new TDERadioAction( group->caption(), group->icon(), TDEShortcut(), this, TQT_SLOT(slotTopPage()), actionCollection(), group->relPath().utf8() ); pageActions.append(newAction); kdDebug() << "relpath is :" << group->relPath() << endl; @@ -250,10 +250,10 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){ moduleItemToScrollerDict.insert(mItem,scrollView); moduleItemToWidgetDict.insert(mItem,groupWidget); - connect(groupWidget, TQT_SIGNAL(aboutToShow( TDECModuleProxy * )), TQT_TQOBJECT(this), TQT_SLOT(updateModuleHelp( TDECModuleProxy * ))); - connect(groupWidget, TQT_SIGNAL(aboutToShowPage( TQWidget* )), TQT_TQOBJECT(this), TQT_SLOT(widgetChange())); - connect(groupWidget, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(groupModulesFinished())); - connect(groupWidget, TQT_SIGNAL(close()), TQT_TQOBJECT(this), TQT_SLOT(showAllModules())); + connect(groupWidget, TQT_SIGNAL(aboutToShow( TDECModuleProxy * )), this, TQT_SLOT(updateModuleHelp( TDECModuleProxy * ))); + connect(groupWidget, TQT_SIGNAL(aboutToShowPage( TQWidget* )), this, TQT_SLOT(widgetChange())); + connect(groupWidget, TQT_SIGNAL(finished()), this, TQT_SLOT(groupModulesFinished())); + connect(groupWidget, TQT_SIGNAL(close()), this, TQT_SLOT(showAllModules())); TQValueList::iterator it; for ( it = list.begin(); it != list.end(); ++it ){