From 5e17591a668ba0345cddd44df3fa6572eb25ddf1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:20:24 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/cpufreqd/cpufreqd.cpp | 8 ++++---- src/kima.cpp | 20 ++++++++++---------- src/sourcelistitem.cpp | 2 +- src/sources/labelsource.cpp | 14 +++++++------- src/sources/nvidiathermalsrc.cpp | 6 +++--- src/sources/source.cpp | 2 +- src/sources/threadedtrigger.cpp | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/cpufreqd/cpufreqd.cpp b/src/cpufreqd/cpufreqd.cpp index 374a7cb..a759350 100644 --- a/src/cpufreqd/cpufreqd.cpp +++ b/src/cpufreqd/cpufreqd.cpp @@ -36,10 +36,10 @@ CPUFreqd::CPUFreqd() { m_menu = new TQPopupMenu(); - TQObject::connect(m_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updateMenu())); + TQObject::connect(m_menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updateMenu())); m_dynamic = new TQAction(i18n("Select dynamically"), TQKeySequence(), this); - TQObject::connect(m_dynamic, TQT_SIGNAL(activated()), this, TQT_SLOT(setDynamic())); + TQObject::connect(m_dynamic, TQ_SIGNAL(activated()), this, TQ_SLOT(setDynamic())); m_dynamic->setToggleAction(true); m_dynamic->setOn(true); @@ -50,7 +50,7 @@ CPUFreqd::CPUFreqd() { m_actions->setAutoDelete(true); m_mapper = new TQSignalMapper(this); - TQObject::connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(setProfile(int))); + TQObject::connect(m_mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(setProfile(int))); } CPUFreqd::~CPUFreqd() { @@ -111,7 +111,7 @@ void CPUFreqd::updateMenu() { for (unsigned int i = 0; i < m_profiles.count(); i++) if (m_profiles[i].isValid()) { cur = new TQAction(m_profiles[i].name(), TQKeySequence(), m_items); - TQObject::connect(cur, TQT_SIGNAL(activated()), m_mapper, TQT_SLOT(map())); + TQObject::connect(cur, TQ_SIGNAL(activated()), m_mapper, TQ_SLOT(map())); cur->setToggleAction(true); cur->setOn(m_profiles[i].active()); diff --git a/src/kima.cpp b/src/kima.cpp index 754527c..413c045 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -140,16 +140,16 @@ Kima::Kima(const TQString& inConfigFile, Type inType, int inActions, TQWidget* i TDEActionCollection* actionCollection = new TDEActionCollection(this, "actionCollection", kapp); - TDEAction* action = KStdAction::preferences(this, TQT_SLOT(preferences()), actionCollection); + TDEAction* action = KStdAction::preferences(this, TQ_SLOT(preferences()), actionCollection); action->setText(i18n("&Preferences")); action->plug(mMenu); - action = KStdAction::aboutApp(this, TQT_SLOT(about()), actionCollection); + action = KStdAction::aboutApp(this, TQ_SLOT(about()), actionCollection); action->setText(i18n("&About Kima")); action->plug(mMenu); //menu->insertSeparator(); - //KStdAction::quit( kapp, TQT_SLOT( quit() ), actionCollection )->plug( menu ); + //KStdAction::quit( kapp, TQ_SLOT( quit() ), actionCollection )->plug( menu ); } Kima::~Kima() { @@ -222,9 +222,9 @@ void Kima::preferences() { //setup the dialog //mPrefsDlg->setFixedSize(mPrefs->size()); mPrefsDlg->setMainWidget(mPrefs); //embed the uic generated class into the kde dialog - connect(mPrefsDlg, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(savePreferences())); - connect(mPrefsDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(savePreferences())); - connect(mPrefsDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelPreferences())); + connect(mPrefsDlg, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(savePreferences())); + connect(mPrefsDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(savePreferences())); + connect(mPrefsDlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelPreferences())); // create new list items and the widgetStack widgets TQPtrListIterator it(mSources); @@ -238,8 +238,8 @@ void Kima::preferences() { // and connect the apply/ok signals to the item, so it can change it's text to a potentially // new source name. SourceListItem * item = new SourceListItem(source, mPrefs->sourceListView, TQCheckListItem::CheckBox); - connect(mPrefsDlg, TQT_SIGNAL(applyClicked()), item, TQT_SLOT(updateText())); - connect(mPrefsDlg, TQT_SIGNAL(okClicked()), item, TQT_SLOT(updateText())); + connect(mPrefsDlg, TQ_SIGNAL(applyClicked()), item, TQ_SLOT(updateText())); + connect(mPrefsDlg, TQ_SIGNAL(okClicked()), item, TQ_SLOT(updateText())); } if(mPrefs->sourceListView->firstChild()){ @@ -247,7 +247,7 @@ void Kima::preferences() { raiseSourcePrefsWidget(mPrefs->sourceListView->firstChild()); // raise that item } - connect(mPrefs->sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(raiseSourcePrefsWidget(TQListViewItem*))); + connect(mPrefs->sourceListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(raiseSourcePrefsWidget(TQListViewItem*))); } // update prefs gui @@ -410,7 +410,7 @@ void Kima::registerSource(Source* source) { displaySource(source->isEnabled() && source->showOnApplet(), source); // connection to add and remove sources from mLayout - connect(source, TQT_SIGNAL(displaySource(bool, Source*)), this, TQT_SLOT(displaySource(bool, Source*))); + connect(source, TQ_SIGNAL(displaySource(bool, Source*)), this, TQ_SLOT(displaySource(bool, Source*))); } void Kima::maybeTip(const TQPoint& inPos){ diff --git a/src/sourcelistitem.cpp b/src/sourcelistitem.cpp index 68a68d7..7cf36db 100644 --- a/src/sourcelistitem.cpp +++ b/src/sourcelistitem.cpp @@ -71,7 +71,7 @@ void SourceListItem::initItem(){ //setText(1, mSource->getName()); //item->setText(2, source->getDescription()); - connect(mSource, TQT_SIGNAL(enabledChanged(bool, Source*)), this, TQT_SLOT(setEnabled(bool))); + connect(mSource, TQ_SIGNAL(enabledChanged(bool, Source*)), this, TQ_SLOT(setEnabled(bool))); setOn(mSource->isEnabled()); } diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp index 6c6892d..c9c06d0 100644 --- a/src/sources/labelsource.cpp +++ b/src/sources/labelsource.cpp @@ -46,12 +46,12 @@ void LabelSource::createSubPrefs(TQWidget* inParent){ if(!mLabelSourcePrefs){ mLabelSourcePrefs = new LabelSourcePrefs(inParent, "labelsourceprefsui"); // disable nameCheckBox if taskbarCheckBox is disabled - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->colorLabel, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->colorButton, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontLabel, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontRequester, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentLabel, TQT_SLOT(setEnabled(bool))); - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentComboBox, TQT_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->colorLabel, TQ_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->colorButton, TQ_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontLabel, TQ_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->fontRequester, TQ_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentLabel, TQ_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mLabelSourcePrefs->alignmentComboBox, TQ_SLOT(setEnabled(bool))); addPrefs(mLabelSourcePrefs); } } @@ -129,6 +129,6 @@ void LabelSource::realizeWidget(){ // the prefs dialog is created in the addPrefs method mLabel = new TQLabel(i18n("n/a"), mParent); mLabel->setTextFormat(TQt::PlainText); - connect(this, TQT_SIGNAL(valueUpdated(const TQString&)), this, TQT_SLOT(updateLabel(const TQString&))); + connect(this, TQ_SIGNAL(valueUpdated(const TQString&)), this, TQ_SLOT(updateLabel(const TQString&))); } #include "labelsource.moc" diff --git a/src/sources/nvidiathermalsrc.cpp b/src/sources/nvidiathermalsrc.cpp index ce97a61..7cd2eee 100644 --- a/src/sources/nvidiathermalsrc.cpp +++ b/src/sources/nvidiathermalsrc.cpp @@ -50,8 +50,8 @@ NVidiaThermalSrc::NVidiaThermalSrc(TQWidget* inParent, const TQString& inID, con mRefreshTimer = new TQTimer(this, "default refresh handler" ); // connect the timer - connect(mRefreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchValue())); - connect(this, TQT_SIGNAL(enabledChanged(bool, Source*)), this, TQT_SLOT(enable(bool))); + connect(mRefreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchValue())); + connect(this, TQ_SIGNAL(enabledChanged(bool, Source*)), this, TQ_SLOT(enable(bool))); } NVidiaThermalSrc::~NVidiaThermalSrc(){ @@ -144,7 +144,7 @@ void NVidiaThermalSrc::evaluateStdout(){ #ifndef HAVE_NVCONTROL void NVidiaThermalSrc::createProcess() { mProcess = new KProcIO; - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(evaluateStdout())); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(evaluateStdout())); *mProcess << "nvidia-settings" << "-n" << "-q" << mID; } diff --git a/src/sources/source.cpp b/src/sources/source.cpp index 5c4e52a..d9a646c 100644 --- a/src/sources/source.cpp +++ b/src/sources/source.cpp @@ -101,7 +101,7 @@ TQWidget* Source::createPrefs(TQWidget* inParent){ mSourcePrefs = new SourcePrefs(inParent, "sourceprefsui"); // disable nameCheckBox if taskbarCheckBox is disabled - connect(mSourcePrefs->taskbarCheckBox, TQT_SIGNAL(toggled(bool)), mSourcePrefs->nameCheckBox, TQT_SLOT(setEnabled(bool))); + connect(mSourcePrefs->taskbarCheckBox, TQ_SIGNAL(toggled(bool)), mSourcePrefs->nameCheckBox, TQ_SLOT(setEnabled(bool))); // add prefs widgets from sub classes createSubPrefs(mSourcePrefs); diff --git a/src/sources/threadedtrigger.cpp b/src/sources/threadedtrigger.cpp index 8c667e0..1c9d25e 100644 --- a/src/sources/threadedtrigger.cpp +++ b/src/sources/threadedtrigger.cpp @@ -28,7 +28,7 @@ ThreadedTrigger::ThreadedTrigger(TriggeredSource* inSource, unsigned long inRefr mRefreshSleep(inRefreshSleep), mRunning(false) { - connect(mSource, TQT_SIGNAL(enabledChanged(bool, Source*)), this, TQT_SLOT(enable(bool))); + connect(mSource, TQ_SIGNAL(enabledChanged(bool, Source*)), this, TQ_SLOT(enable(bool))); } ThreadedTrigger::~ThreadedTrigger(){ -- cgit v1.2.1