From 6da2ba677c47d91e60cc819e29620bc4c919bfaa Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 7 Jan 2024 19:47:53 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/generalcfg.cpp | 2 +- src/hdsensorslist.cpp | 2 +- src/infopanels.cpp | 4 ++-- src/ksensorscfg.cpp | 8 ++++---- src/lmsensordockpanel.cpp | 4 ++-- src/lmsensorpanel.cpp | 4 ++-- src/lmsensors.cpp | 4 ++-- src/lmsensorsalarms.cpp | 2 +- src/lmsensorscfg.cpp | 12 ++++++------ src/lmsensorsdock.cpp | 18 +++++++++--------- src/lmsensorswidget.cpp | 4 ++-- src/main.cpp | 4 ++-- src/palettecfg.cpp | 6 +++--- src/processexec.cpp | 4 ++-- src/sensorslist.cpp | 4 ++-- src/systemcfg.cpp | 6 +++--- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/generalcfg.cpp b/src/generalcfg.cpp index 415536c..1955dc6 100644 --- a/src/generalcfg.cpp +++ b/src/generalcfg.cpp @@ -50,7 +50,7 @@ GeneralCfg::GeneralCfg(LMSensors *lsensors, TQWidget *parent, const char *name) TDEConfig *cfg= TDEGlobal::config(); cfg->setGroup( "General" ); CheckBoxAutoStart->setChecked(cfg->readBoolEntry("AutoStart",true)); - //connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); + //connect( buttonApply ,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotApplyChanges())); } GeneralCfg::~GeneralCfg(){ diff --git a/src/hdsensorslist.cpp b/src/hdsensorslist.cpp index 412b4c6..54fe789 100644 --- a/src/hdsensorslist.cpp +++ b/src/hdsensorslist.cpp @@ -88,7 +88,7 @@ void HDSensorsList::updateSensors() if(params.count()>0) { process= new ProcessExec; *process << "hddtemp" << "-q" << params; - connect( process, SIGNAL(processExited(TDEProcess *)), this, SLOT(slotProcessExited(TDEProcess *)) ); + connect( process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)) ); process->run(); } } diff --git a/src/infopanels.cpp b/src/infopanels.cpp index a0f8975..34442a3 100644 --- a/src/infopanels.cpp +++ b/src/infopanels.cpp @@ -60,8 +60,8 @@ void InfoPanels::configChanged(const char *name) void InfoPanels::timerConnect(Panel *display) { if(timerPanelCount==0) timer->start( cfgReadUpdateInterval()*1000 ); - connect( timer , SIGNAL(timeout() ), display, SLOT(updateInfo()) ); - connect( display, SIGNAL(destroyed()), this , SLOT(infoPanelDestroyed()) ); + connect( timer , TQ_SIGNAL(timeout() ), display, TQ_SLOT(updateInfo()) ); + connect( display, TQ_SIGNAL(destroyed()), this , TQ_SLOT(infoPanelDestroyed()) ); timerPanelCount++; } diff --git a/src/ksensorscfg.cpp b/src/ksensorscfg.cpp index 7c80fec..f35495b 100644 --- a/src/ksensorscfg.cpp +++ b/src/ksensorscfg.cpp @@ -57,7 +57,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) m_generalcfg = new GeneralCfg(sensors, page); lay = new TQVBoxLayout( page ); lay->addWidget(m_generalcfg); - connect(this, SIGNAL(applyClicked()), m_generalcfg, SLOT(slotApplyChanges()) ); + connect(this, TQ_SIGNAL(applyClicked()), m_generalcfg, TQ_SLOT(slotApplyChanges()) ); TQObjectList *list= sensors->getSensorsChips(); if(list) { @@ -69,7 +69,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) cfgWidget = new LMSensorsCfg(chip, page); lay = new TQVBoxLayout( page ); lay->addWidget(cfgWidget); - connect(this, SIGNAL(applyClicked()), cfgWidget, SLOT(slotApplyChanges()) ); + connect(this, TQ_SIGNAL(applyClicked()), cfgWidget, TQ_SLOT(slotApplyChanges()) ); } else { @@ -77,7 +77,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) cfgWidget = new LMSensorsCfg(chip, page); lay = new TQVBoxLayout( page ); lay->addWidget(cfgWidget); - connect(this, SIGNAL(applyClicked()), cfgWidget, SLOT(slotApplyChanges()) ); + connect(this, TQ_SIGNAL(applyClicked()), cfgWidget, TQ_SLOT(slotApplyChanges()) ); } } } @@ -86,7 +86,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) m_systemcfg = new SystemCfg(sensors, page); lay = new TQVBoxLayout( page ); lay->addWidget(m_systemcfg); - connect(this, SIGNAL(applyClicked()), m_systemcfg, SLOT(slotApplyChanges()) ); + connect(this, TQ_SIGNAL(applyClicked()), m_systemcfg, TQ_SLOT(slotApplyChanges()) ); adjustSize(); } diff --git a/src/lmsensordockpanel.cpp b/src/lmsensordockpanel.cpp index 6dbf1ed..a0cc8f1 100644 --- a/src/lmsensordockpanel.cpp +++ b/src/lmsensordockpanel.cpp @@ -31,8 +31,8 @@ LMSensorDockPanel::LMSensorDockPanel(Sensor *newSensor, const char *name) : KSys if(newSensor) { sensor= newSensor; updateConfig(); - connect( newSensor, SIGNAL(valueChanged(double)) , this, SLOT(setValue(double)) ); - connect( newSensor, SIGNAL(configChanged()) , this, SLOT(updateConfig()) ); + connect( newSensor, TQ_SIGNAL(valueChanged(double)) , this, TQ_SLOT(setValue(double)) ); + connect( newSensor, TQ_SIGNAL(configChanged()) , this, TQ_SLOT(updateConfig()) ); setPixmap(0); } else { sensor= 0; diff --git a/src/lmsensorpanel.cpp b/src/lmsensorpanel.cpp index a6a3ee8..0ca322a 100644 --- a/src/lmsensorpanel.cpp +++ b/src/lmsensorpanel.cpp @@ -29,8 +29,8 @@ LMSensorPanel::LMSensorPanel(Sensor *newSensor, TQWidget *parent, const char *na // updateConfig(); // - connect( sensor, SIGNAL(valueChanged(double)) , this, SLOT(setValue(double)) ); - connect( sensor, SIGNAL(configChanged()) , this, SLOT(updateConfig()) ); + connect( sensor, TQ_SIGNAL(valueChanged(double)) , this, TQ_SLOT(setValue(double)) ); + connect( sensor, TQ_SIGNAL(configChanged()) , this, TQ_SLOT(updateConfig()) ); // } diff --git a/src/lmsensors.cpp b/src/lmsensors.cpp index 42e00a1..eecb552 100644 --- a/src/lmsensors.cpp +++ b/src/lmsensors.cpp @@ -135,8 +135,8 @@ Sensor *LMSensors::getSensor(const char *name) void LMSensors::childEvent( TQChildEvent *e ) { if(e->inserted()) { - connect((SensorsList *)e->child(),SIGNAL(valueChanged(Sensor *)) ,this,SIGNAL(valueChanged(Sensor *))); - connect((SensorsList *)e->child(),SIGNAL(configChanged(const char *)),this,SIGNAL(configChanged(const char *))); + connect((SensorsList *)e->child(),TQ_SIGNAL(valueChanged(Sensor *)) ,this,TQ_SIGNAL(valueChanged(Sensor *))); + connect((SensorsList *)e->child(),TQ_SIGNAL(configChanged(const char *)),this,TQ_SIGNAL(configChanged(const char *))); } } diff --git a/src/lmsensorsalarms.cpp b/src/lmsensorsalarms.cpp index 5a69cac..f44300e 100644 --- a/src/lmsensorsalarms.cpp +++ b/src/lmsensorsalarms.cpp @@ -32,7 +32,7 @@ LMSensorsAlarms::LMSensorsAlarms(LMSensors *sensors, TQObject *parent, const cha { sensorCount= 0; soundPlay = ""; - connect( sensors, SIGNAL(valueChanged(Sensor *)) , this, SLOT(setValueChanged(Sensor *)) ); + connect( sensors, TQ_SIGNAL(valueChanged(Sensor *)) , this, TQ_SLOT(setValueChanged(Sensor *)) ); } LMSensorsAlarms::~LMSensorsAlarms() diff --git a/src/lmsensorscfg.cpp b/src/lmsensorscfg.cpp index 938c6b1..d2d0371 100644 --- a/src/lmsensorscfg.cpp +++ b/src/lmsensorscfg.cpp @@ -55,12 +55,12 @@ LMSensorsCfg::LMSensorsCfg(SensorsList *lsensors,TQWidget *parent, const char *n readSensorsList(); - connect( MainTab ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotMainTabPageChanged(TQWidget *))); - connect( listSensors ,SIGNAL(highlighted(int)),this,SLOT(slotCurrentSensorChanged(int)) ); - //connect( buttonApply ,SIGNAL(clicked()),this,SLOT(slotApplyChanges())); - connect( buttonTest ,SIGNAL(clicked()),this,SLOT(slotTestAlarm())); - connect( editMinValue ,SIGNAL(activated(int)),this,SLOT(slotComboMinMaxSelected(int))); - connect( editMaxValue ,SIGNAL(activated(int)),this,SLOT(slotComboMinMaxSelected(int))); + connect( MainTab ,TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotMainTabPageChanged(TQWidget *))); + connect( listSensors ,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotCurrentSensorChanged(int)) ); + //connect( buttonApply ,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotApplyChanges())); + connect( buttonTest ,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotTestAlarm())); + connect( editMinValue ,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboMinMaxSelected(int))); + connect( editMaxValue ,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboMinMaxSelected(int))); } LMSensorsCfg::~LMSensorsCfg() diff --git a/src/lmsensorsdock.cpp b/src/lmsensorsdock.cpp index c41c497..8125cae 100644 --- a/src/lmsensorsdock.cpp +++ b/src/lmsensorsdock.cpp @@ -33,7 +33,7 @@ LMSensorsDock::LMSensorsDock(bool fNoDock, TQObject *parent, const char *name): sensors= new LMSensors; sensors->setMonitorized(true); - connect(sensors,SIGNAL(configChanged(const char *)),this,SLOT(updateItemDock(const char *))); + connect(sensors,TQ_SIGNAL(configChanged(const char *)),this,TQ_SLOT(updateItemDock(const char *))); createAlarmControl(); createWidgets(); @@ -65,17 +65,17 @@ LMSensorsDock::~LMSensorsDock() void LMSensorsDock::createMenu() { helpmenu=new TDEPopupMenu; - helpmenu->insertItem(SmallIcon("help"), i18n("&KSensors Handbook"), this, SLOT(showHandbook())); - helpmenu->insertItem(kapp->miniIcon(), i18n("&About KSensors"), this, SLOT(showAbout())); + helpmenu->insertItem(SmallIcon("help"), i18n("&KSensors Handbook"), this, TQ_SLOT(showHandbook())); + helpmenu->insertItem(kapp->miniIcon(), i18n("&About KSensors"), this, TQ_SLOT(showAbout())); menu= new TDEPopupMenu; menu->insertTitle(kapp->miniIcon(),"KSensors"); - menu->insertItem(SmallIcon("configure"),i18n("&Configure"), this, SLOT(createConfigWidget() ) ,0,101 ); + menu->insertItem(SmallIcon("configure"),i18n("&Configure"), this, TQ_SLOT(createConfigWidget() ) ,0,101 ); menu->insertSeparator(); helpmenu_id=menu->insertItem(SmallIcon("help"), i18n("&Help"), helpmenu); menu->insertSeparator(); - if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, SLOT(minimizeRestoreWidget() ) ,0,100 ); - menu->insertItem(SmallIcon("system-log-out"),i18n("&Exit"), this, SLOT(close()),0,102); + if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, TQ_SLOT(minimizeRestoreWidget() ) ,0,100 ); + menu->insertItem(SmallIcon("system-log-out"),i18n("&Exit"), this, TQ_SLOT(close()),0,102); } void LMSensorsDock::createWidgets() @@ -141,8 +141,8 @@ void LMSensorsDock::createShowWidget(int desktop) { if(!sensorsWidget) { sensorsWidget= new LMSensorsWidget(sensors); - connect( sensorsWidget, SIGNAL(rightMouseClicked(TQMouseEvent *)), this, SLOT(mouseEventReceived(TQMouseEvent *)) ); - connect( sensorsWidget, SIGNAL(destroyed()), this, SLOT(updateMenu()) ); + connect( sensorsWidget, TQ_SIGNAL(rightMouseClicked(TQMouseEvent *)), this, TQ_SLOT(mouseEventReceived(TQMouseEvent *)) ); + connect( sensorsWidget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu()) ); } if ((desktop != 0) && (desktop <= KWin::numberOfDesktops())) KWin::setOnDesktop(sensorsWidget->winId(), desktop); sensorsWidget->show(); @@ -181,7 +181,7 @@ void LMSensorsDock::createDockSensor(Sensor *sensor) } const char *name= sensor ? sensor->name() : 0; LMSensorDockPanel *dock= new LMSensorDockPanel(sensor,name); - connect( dock, SIGNAL(mouseEvent(TQMouseEvent *)), this, SLOT(mouseEventReceived(TQMouseEvent *)) ); + connect( dock, TQ_SIGNAL(mouseEvent(TQMouseEvent *)), this, TQ_SLOT(mouseEventReceived(TQMouseEvent *)) ); insertChild(dock); dock->show(); if(name) countSensors++; diff --git a/src/lmsensorswidget.cpp b/src/lmsensorswidget.cpp index ae4f909..630dd51 100644 --- a/src/lmsensorswidget.cpp +++ b/src/lmsensorswidget.cpp @@ -66,7 +66,7 @@ LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,TQWidget *parent, const cha // infoPanels= new InfoPanels(this); // - connect(sensors, SIGNAL(configChanged(const char *)), this, SLOT(slotConfigChanged(const char *)) ); + connect(sensors, TQ_SIGNAL(configChanged(const char *)), this, TQ_SLOT(slotConfigChanged(const char *)) ); } @@ -237,7 +237,7 @@ void LMSensorsWidget::loadDisplayConfig(Panel *display) adjustSize(); } display->installEventFilter(this); - connect(display, SIGNAL(eventReceived(TQEvent *)), this, SLOT(childEventReceived(TQEvent *)) ); + connect(display, TQ_SIGNAL(eventReceived(TQEvent *)), this, TQ_SLOT(childEventReceived(TQEvent *)) ); } diff --git a/src/main.cpp b/src/main.cpp index 708db35..c8bda6a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,8 +69,8 @@ int main(int argc, char *argv[]) if(showSplash) (void)new KSensorsSplash(); LMSensorsDock *ksensors= new LMSensorsDock(noDock); - TQObject::connect( ksensors, SIGNAL(destroyed()), kapp, SLOT(quit()) ); - TQObject::connect( kapp, SIGNAL(saveYourself()), ksensors, SLOT(saveConfig()) ); + TQObject::connect( ksensors, TQ_SIGNAL(destroyed()), kapp, TQ_SLOT(quit()) ); + TQObject::connect( kapp, TQ_SIGNAL(saveYourself()), ksensors, TQ_SLOT(saveConfig()) ); return a.exec(); } diff --git a/src/palettecfg.cpp b/src/palettecfg.cpp index 2c2fef3..d963d9a 100644 --- a/src/palettecfg.cpp +++ b/src/palettecfg.cpp @@ -27,9 +27,9 @@ PaletteCfg::PaletteCfg(TQWidget *parent, const char *name): PaletteCfgDesign(par { groupName= 0; slotComboSelected(0); - connect( comboSelect,SIGNAL(activated(int)),this,SLOT(slotComboSelected(int)) ); - connect( buttonColor,SIGNAL(changed(const TQColor &)),this,SLOT(slotColorChanged(const TQColor &)) ); - connect( buttonDefaultPalette, SIGNAL(clicked()),this,SLOT(slotPaletteDefault()) ); + connect( comboSelect,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboSelected(int)) ); + connect( buttonColor,TQ_SIGNAL(changed(const TQColor &)),this,TQ_SLOT(slotColorChanged(const TQColor &)) ); + connect( buttonDefaultPalette, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPaletteDefault()) ); } PaletteCfg::~PaletteCfg() diff --git a/src/processexec.cpp b/src/processexec.cpp index 42c6f81..03800cb 100644 --- a/src/processexec.cpp +++ b/src/processexec.cpp @@ -21,8 +21,8 @@ ProcessExec::ProcessExec(): TDEProcess() { clearData(); - connect( this, SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, SLOT(slotReceivedStdout(TDEProcess *, char *, int)) ); - connect( this, SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, SLOT(slotReceivedStderr(TDEProcess *, char *, int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char *, int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(slotReceivedStderr(TDEProcess *, char *, int)) ); } ProcessExec::~ProcessExec(){ diff --git a/src/sensorslist.cpp b/src/sensorslist.cpp index 90bcac4..67e971e 100644 --- a/src/sensorslist.cpp +++ b/src/sensorslist.cpp @@ -108,8 +108,8 @@ void SensorsList::timerEvent( TQTimerEvent * ) void SensorsList::childEvent ( TQChildEvent *e ) { if(e->inserted()) { - connect((Sensor *)e->child(),SIGNAL(configChanged()),this,SLOT(slotConfigChanged())); - connect((Sensor *)e->child(),SIGNAL(valueChanged(double)) ,this,SLOT(slotValueChanged())); + connect((Sensor *)e->child(),TQ_SIGNAL(configChanged()),this,TQ_SLOT(slotConfigChanged())); + connect((Sensor *)e->child(),TQ_SIGNAL(valueChanged(double)) ,this,TQ_SLOT(slotValueChanged())); } } diff --git a/src/systemcfg.cpp b/src/systemcfg.cpp index 79ebc66..97c2480 100644 --- a/src/systemcfg.cpp +++ b/src/systemcfg.cpp @@ -40,8 +40,8 @@ SystemCfg::SystemCfg(LMSensors *lsensors, TQWidget *parent, const char *name): S boxPanelPaletteLayout->setAlignment( TQt::AlignTop ); boxPanelPaletteLayout->addWidget( palPanelCfg, 0, 0 ); - connect( TabWidget ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotTabWidgetChanged(TQWidget *))); - //connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); + connect( TabWidget ,TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotTabWidgetChanged(TQWidget *))); + //connect( buttonApply ,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotApplyChanges())); listSensors->clear(); listSensors->insertItem( i18n("CPU Speed")); @@ -52,7 +52,7 @@ SystemCfg::SystemCfg(LMSensors *lsensors, TQWidget *parent, const char *name): S listSensors->setCurrentItem(0); readSensorInfo(0); - connect( listSensors,SIGNAL(highlighted(int)),this,SLOT(slotCurrentSensorChanged(int)) ); + connect( listSensors,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotCurrentSensorChanged(int)) ); } SystemCfg::~SystemCfg(){