From 3b5ccc656fde07ed416181abf061b4fcd90e2830 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 14 Dec 2023 21:19:12 +0900 Subject: [PATCH] Remove various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit bdb5acdfbfe8973f2b45fe54193ad543064c1ac5) --- kpilot/conduitConfigDialog.cpp | 2 +- kpilot/kpilot.cpp | 36 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kpilot/conduitConfigDialog.cpp b/kpilot/conduitConfigDialog.cpp index 3b86019..5d07e25 100644 --- a/kpilot/conduitConfigDialog.cpp +++ b/kpilot/conduitConfigDialog.cpp @@ -596,7 +596,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec) TQStringList a; a.append(CSL1("modal")); - o = f->create(TQT_TQOBJECT(fStack), 0L, "ConduitConfigBase", a); + o = f->create(fStack, 0L, "ConduitConfigBase", a); if (!o) { diff --git a/kpilot/kpilot.cpp b/kpilot/kpilot.cpp index 72a9ddc..736fabb 100644 --- a/kpilot/kpilot.cpp +++ b/kpilot/kpilot.cpp @@ -232,7 +232,7 @@ void KPilotInstaller::setupWidget() fManagingWidget->show(); setCentralWidget(fManagingWidget); connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); + this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); initIcons(); initMenu(); @@ -519,11 +519,11 @@ void KPilotInstaller::initMenu() "This applies only to the next HotSync; to change the default, use " "the configuration dialog.")); connect(syncPopup, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested())); + this, TQT_SLOT(slotHotSyncRequested())); // File actions, keep this list synced with kpilotui.rc and pilotDaemon.cpp a = new TDEAction(i18n("&HotSync"), CSL1("hotsync"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()), + this, TQT_SLOT(slotHotSyncRequested()), actionCollection(), "file_hotsync"); a->setToolTip(i18n("Next HotSync will be normal HotSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -531,7 +531,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Full&Sync"), CSL1("fullsync"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotFullSyncRequested()), + this, TQT_SLOT(slotFullSyncRequested()), actionCollection(), "file_fullsync"); a->setToolTip(i18n("Next HotSync will be a FullSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -539,7 +539,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("&Backup"), CSL1("backup"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotBackupRequested()), + this, TQT_SLOT(slotBackupRequested()), actionCollection(), "file_backup"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -547,7 +547,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("&Restore"), CSL1("restore"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotRestoreRequested()), + this, TQT_SLOT(slotRestoreRequested()), actionCollection(), "file_restore"); a->setToolTip(i18n("Next HotSync will be restore.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -555,7 +555,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Copy Handheld to PC"), TQString(), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotHHtoPCRequested()), + this, TQT_SLOT(slotHHtoPCRequested()), actionCollection(), "file_HHtoPC"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -564,7 +564,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new TDEAction(i18n("Copy PC to Handheld"), TQString(), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotPCtoHHRequested()), + this, TQT_SLOT(slotPCtoHHRequested()), actionCollection(), "file_PCtoHH"); a->setToolTip(i18n("Next HotSync will copy PC to Handheld.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -586,14 +586,14 @@ void KPilotInstaller::initMenu() a = new TDEAction(i18n("Rese&t Link"),CSL1("reload"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotResetLink()), + this, TQT_SLOT(slotResetLink()), actionCollection(),"file_reload"); a->setToolTip(i18n("Reset the device connection.")); a->setWhatsThis(i18n("Try to reset the daemon and its connection " "to the Handheld.")); - a = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon " "if configured that way).")); @@ -603,15 +603,15 @@ void KPilotInstaller::initMenu() createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - (void) KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), + (void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), + (void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), + (void) KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection()); a = new TDEAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0, - TQT_TQOBJECT(this), TQT_SLOT(configureWizard()), + this, TQT_SLOT(configureWizard()), actionCollection(), "options_configure_wizard"); a->setWhatsThis(i18n("Configure KPilot using the configuration wizard.")); @@ -685,13 +685,13 @@ void KPilotInstaller::addComponentPage(PilotComponent * p, TDEToggleAction *pt = new TDEToggleAction(name, /* "kpilot" -- component icon, */ 0, - TQT_TQOBJECT(p), TQT_SLOT(slotShowComponent()), + p, TQT_SLOT(slotShowComponent()), actionCollection(), actionname); pt->setExclusiveGroup(CSL1("view_menu")); - connect(TQT_TQOBJECT(p), TQT_SIGNAL(showComponent(PilotComponent *)), - TQT_TQOBJECT(this), TQT_SLOT(slotSelectComponent(PilotComponent *))); + connect(p, TQT_SIGNAL(showComponent(PilotComponent *)), + this, TQT_SLOT(slotSelectComponent(PilotComponent *))); } /* slot */ void KPilotInstaller::initializeComponents() @@ -719,7 +719,7 @@ void KPilotInstaller::optionsConfigureToolbars() // This was added in KDE 3.1 saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); }