Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 6da2ba677c)
r14.1.x
Michele Calgaro 11 months ago
parent 7453b1ad93
commit b7fce5c4dd
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -50,7 +50,7 @@ GeneralCfg::GeneralCfg(LMSensors *lsensors, TQWidget *parent, const char *name)
TDEConfig *cfg= TDEGlobal::config(); TDEConfig *cfg= TDEGlobal::config();
cfg->setGroup( "General" ); cfg->setGroup( "General" );
CheckBoxAutoStart->setChecked(cfg->readBoolEntry("AutoStart",true)); CheckBoxAutoStart->setChecked(cfg->readBoolEntry("AutoStart",true));
//connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); //connect( buttonApply ,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotApplyChanges()));
} }
GeneralCfg::~GeneralCfg(){ GeneralCfg::~GeneralCfg(){

@ -88,7 +88,7 @@ void HDSensorsList::updateSensors()
if(params.count()>0) { if(params.count()>0) {
process= new ProcessExec; process= new ProcessExec;
*process << "hddtemp" << "-q" << params; *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(); process->run();
} }
} }

@ -60,8 +60,8 @@ void InfoPanels::configChanged(const char *name)
void InfoPanels::timerConnect(Panel *display) void InfoPanels::timerConnect(Panel *display)
{ {
if(timerPanelCount==0) timer->start( cfgReadUpdateInterval()*1000 ); if(timerPanelCount==0) timer->start( cfgReadUpdateInterval()*1000 );
connect( timer , SIGNAL(timeout() ), display, SLOT(updateInfo()) ); connect( timer , TQ_SIGNAL(timeout() ), display, TQ_SLOT(updateInfo()) );
connect( display, SIGNAL(destroyed()), this , SLOT(infoPanelDestroyed()) ); connect( display, TQ_SIGNAL(destroyed()), this , TQ_SLOT(infoPanelDestroyed()) );
timerPanelCount++; timerPanelCount++;
} }

@ -57,7 +57,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name)
m_generalcfg = new GeneralCfg(sensors, page); m_generalcfg = new GeneralCfg(sensors, page);
lay = new TQVBoxLayout( page ); lay = new TQVBoxLayout( page );
lay->addWidget(m_generalcfg); 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(); TQObjectList *list= sensors->getSensorsChips();
if(list) { if(list) {
@ -69,7 +69,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name)
cfgWidget = new LMSensorsCfg(chip, page); cfgWidget = new LMSensorsCfg(chip, page);
lay = new TQVBoxLayout( page ); lay = new TQVBoxLayout( page );
lay->addWidget(cfgWidget); lay->addWidget(cfgWidget);
connect(this, SIGNAL(applyClicked()), cfgWidget, SLOT(slotApplyChanges()) ); connect(this, TQ_SIGNAL(applyClicked()), cfgWidget, TQ_SLOT(slotApplyChanges()) );
} }
else else
{ {
@ -77,7 +77,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name)
cfgWidget = new LMSensorsCfg(chip, page); cfgWidget = new LMSensorsCfg(chip, page);
lay = new TQVBoxLayout( page ); lay = new TQVBoxLayout( page );
lay->addWidget(cfgWidget); 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); m_systemcfg = new SystemCfg(sensors, page);
lay = new TQVBoxLayout( page ); lay = new TQVBoxLayout( page );
lay->addWidget(m_systemcfg); lay->addWidget(m_systemcfg);
connect(this, SIGNAL(applyClicked()), m_systemcfg, SLOT(slotApplyChanges()) ); connect(this, TQ_SIGNAL(applyClicked()), m_systemcfg, TQ_SLOT(slotApplyChanges()) );
adjustSize(); adjustSize();
} }

@ -31,8 +31,8 @@ LMSensorDockPanel::LMSensorDockPanel(Sensor *newSensor, const char *name) : KSys
if(newSensor) { if(newSensor) {
sensor= newSensor; sensor= newSensor;
updateConfig(); updateConfig();
connect( newSensor, SIGNAL(valueChanged(double)) , this, SLOT(setValue(double)) ); connect( newSensor, TQ_SIGNAL(valueChanged(double)) , this, TQ_SLOT(setValue(double)) );
connect( newSensor, SIGNAL(configChanged()) , this, SLOT(updateConfig()) ); connect( newSensor, TQ_SIGNAL(configChanged()) , this, TQ_SLOT(updateConfig()) );
setPixmap(0); setPixmap(0);
} else { } else {
sensor= 0; sensor= 0;

@ -29,8 +29,8 @@ LMSensorPanel::LMSensorPanel(Sensor *newSensor, TQWidget *parent, const char *na
// //
updateConfig(); updateConfig();
// //
connect( sensor, SIGNAL(valueChanged(double)) , this, SLOT(setValue(double)) ); connect( sensor, TQ_SIGNAL(valueChanged(double)) , this, TQ_SLOT(setValue(double)) );
connect( sensor, SIGNAL(configChanged()) , this, SLOT(updateConfig()) ); connect( sensor, TQ_SIGNAL(configChanged()) , this, TQ_SLOT(updateConfig()) );
// //
} }

@ -135,8 +135,8 @@ Sensor *LMSensors::getSensor(const char *name)
void LMSensors::childEvent( TQChildEvent *e ) void LMSensors::childEvent( TQChildEvent *e )
{ {
if(e->inserted()) { if(e->inserted()) {
connect((SensorsList *)e->child(),SIGNAL(valueChanged(Sensor *)) ,this,SIGNAL(valueChanged(Sensor *))); connect((SensorsList *)e->child(),TQ_SIGNAL(valueChanged(Sensor *)) ,this,TQ_SIGNAL(valueChanged(Sensor *)));
connect((SensorsList *)e->child(),SIGNAL(configChanged(const char *)),this,SIGNAL(configChanged(const char *))); connect((SensorsList *)e->child(),TQ_SIGNAL(configChanged(const char *)),this,TQ_SIGNAL(configChanged(const char *)));
} }
} }

@ -32,7 +32,7 @@ LMSensorsAlarms::LMSensorsAlarms(LMSensors *sensors, TQObject *parent, const cha
{ {
sensorCount= 0; sensorCount= 0;
soundPlay = ""; soundPlay = "";
connect( sensors, SIGNAL(valueChanged(Sensor *)) , this, SLOT(setValueChanged(Sensor *)) ); connect( sensors, TQ_SIGNAL(valueChanged(Sensor *)) , this, TQ_SLOT(setValueChanged(Sensor *)) );
} }
LMSensorsAlarms::~LMSensorsAlarms() LMSensorsAlarms::~LMSensorsAlarms()

@ -55,12 +55,12 @@ LMSensorsCfg::LMSensorsCfg(SensorsList *lsensors,TQWidget *parent, const char *n
readSensorsList(); readSensorsList();
connect( MainTab ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotMainTabPageChanged(TQWidget *))); connect( MainTab ,TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotMainTabPageChanged(TQWidget *)));
connect( listSensors ,SIGNAL(highlighted(int)),this,SLOT(slotCurrentSensorChanged(int)) ); connect( listSensors ,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotCurrentSensorChanged(int)) );
//connect( buttonApply ,SIGNAL(clicked()),this,SLOT(slotApplyChanges())); //connect( buttonApply ,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotApplyChanges()));
connect( buttonTest ,SIGNAL(clicked()),this,SLOT(slotTestAlarm())); connect( buttonTest ,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotTestAlarm()));
connect( editMinValue ,SIGNAL(activated(int)),this,SLOT(slotComboMinMaxSelected(int))); connect( editMinValue ,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboMinMaxSelected(int)));
connect( editMaxValue ,SIGNAL(activated(int)),this,SLOT(slotComboMinMaxSelected(int))); connect( editMaxValue ,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboMinMaxSelected(int)));
} }
LMSensorsCfg::~LMSensorsCfg() LMSensorsCfg::~LMSensorsCfg()

@ -33,7 +33,7 @@ LMSensorsDock::LMSensorsDock(bool fNoDock, TQObject *parent, const char *name):
sensors= new LMSensors; sensors= new LMSensors;
sensors->setMonitorized(true); 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(); createAlarmControl();
createWidgets(); createWidgets();
@ -65,17 +65,17 @@ LMSensorsDock::~LMSensorsDock()
void LMSensorsDock::createMenu() void LMSensorsDock::createMenu()
{ {
helpmenu=new TDEPopupMenu; helpmenu=new TDEPopupMenu;
helpmenu->insertItem(SmallIcon("help"), i18n("&KSensors Handbook"), this, SLOT(showHandbook())); helpmenu->insertItem(SmallIcon("help"), i18n("&KSensors Handbook"), this, TQ_SLOT(showHandbook()));
helpmenu->insertItem(kapp->miniIcon(), i18n("&About KSensors"), this, SLOT(showAbout())); helpmenu->insertItem(kapp->miniIcon(), i18n("&About KSensors"), this, TQ_SLOT(showAbout()));
menu= new TDEPopupMenu; menu= new TDEPopupMenu;
menu->insertTitle(kapp->miniIcon(),"KSensors"); 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(); menu->insertSeparator();
helpmenu_id=menu->insertItem(SmallIcon("help"), i18n("&Help"), helpmenu); helpmenu_id=menu->insertItem(SmallIcon("help"), i18n("&Help"), helpmenu);
menu->insertSeparator(); menu->insertSeparator();
if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, SLOT(minimizeRestoreWidget() ) ,0,100 ); if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, TQ_SLOT(minimizeRestoreWidget() ) ,0,100 );
menu->insertItem(SmallIcon("system-log-out"),i18n("&Exit"), this, SLOT(close()),0,102); menu->insertItem(SmallIcon("system-log-out"),i18n("&Exit"), this, TQ_SLOT(close()),0,102);
} }
void LMSensorsDock::createWidgets() void LMSensorsDock::createWidgets()
@ -141,8 +141,8 @@ void LMSensorsDock::createShowWidget(int desktop)
{ {
if(!sensorsWidget) { if(!sensorsWidget) {
sensorsWidget= new LMSensorsWidget(sensors); sensorsWidget= new LMSensorsWidget(sensors);
connect( sensorsWidget, SIGNAL(rightMouseClicked(TQMouseEvent *)), this, SLOT(mouseEventReceived(TQMouseEvent *)) ); connect( sensorsWidget, TQ_SIGNAL(rightMouseClicked(TQMouseEvent *)), this, TQ_SLOT(mouseEventReceived(TQMouseEvent *)) );
connect( sensorsWidget, SIGNAL(destroyed()), this, SLOT(updateMenu()) ); connect( sensorsWidget, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu()) );
} }
if ((desktop != 0) && (desktop <= KWin::numberOfDesktops())) KWin::setOnDesktop(sensorsWidget->winId(), desktop); if ((desktop != 0) && (desktop <= KWin::numberOfDesktops())) KWin::setOnDesktop(sensorsWidget->winId(), desktop);
sensorsWidget->show(); sensorsWidget->show();
@ -181,7 +181,7 @@ void LMSensorsDock::createDockSensor(Sensor *sensor)
} }
const char *name= sensor ? sensor->name() : 0; const char *name= sensor ? sensor->name() : 0;
LMSensorDockPanel *dock= new LMSensorDockPanel(sensor,name); 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); insertChild(dock);
dock->show(); dock->show();
if(name) countSensors++; if(name) countSensors++;

@ -66,7 +66,7 @@ LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,TQWidget *parent, const cha
// //
infoPanels= new InfoPanels(this); 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(); adjustSize();
} }
display->installEventFilter(this); display->installEventFilter(this);
connect(display, SIGNAL(eventReceived(TQEvent *)), this, SLOT(childEventReceived(TQEvent *)) ); connect(display, TQ_SIGNAL(eventReceived(TQEvent *)), this, TQ_SLOT(childEventReceived(TQEvent *)) );
} }

@ -69,8 +69,8 @@ int main(int argc, char *argv[])
if(showSplash) (void)new KSensorsSplash(); if(showSplash) (void)new KSensorsSplash();
LMSensorsDock *ksensors= new LMSensorsDock(noDock); LMSensorsDock *ksensors= new LMSensorsDock(noDock);
TQObject::connect( ksensors, SIGNAL(destroyed()), kapp, SLOT(quit()) ); TQObject::connect( ksensors, TQ_SIGNAL(destroyed()), kapp, TQ_SLOT(quit()) );
TQObject::connect( kapp, SIGNAL(saveYourself()), ksensors, SLOT(saveConfig()) ); TQObject::connect( kapp, TQ_SIGNAL(saveYourself()), ksensors, TQ_SLOT(saveConfig()) );
return a.exec(); return a.exec();
} }

@ -27,9 +27,9 @@ PaletteCfg::PaletteCfg(TQWidget *parent, const char *name): PaletteCfgDesign(par
{ {
groupName= 0; groupName= 0;
slotComboSelected(0); slotComboSelected(0);
connect( comboSelect,SIGNAL(activated(int)),this,SLOT(slotComboSelected(int)) ); connect( comboSelect,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboSelected(int)) );
connect( buttonColor,SIGNAL(changed(const TQColor &)),this,SLOT(slotColorChanged(const TQColor &)) ); connect( buttonColor,TQ_SIGNAL(changed(const TQColor &)),this,TQ_SLOT(slotColorChanged(const TQColor &)) );
connect( buttonDefaultPalette, SIGNAL(clicked()),this,SLOT(slotPaletteDefault()) ); connect( buttonDefaultPalette, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPaletteDefault()) );
} }
PaletteCfg::~PaletteCfg() PaletteCfg::~PaletteCfg()

@ -21,8 +21,8 @@
ProcessExec::ProcessExec(): TDEProcess() ProcessExec::ProcessExec(): TDEProcess()
{ {
clearData(); clearData();
connect( this, SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, SLOT(slotReceivedStdout(TDEProcess *, char *, int)) ); connect( this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(slotReceivedStdout(TDEProcess *, char *, int)) );
connect( this, SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, SLOT(slotReceivedStderr(TDEProcess *, char *, int)) ); connect( this, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(slotReceivedStderr(TDEProcess *, char *, int)) );
} }
ProcessExec::~ProcessExec(){ ProcessExec::~ProcessExec(){

@ -108,8 +108,8 @@ void SensorsList::timerEvent( TQTimerEvent * )
void SensorsList::childEvent ( TQChildEvent *e ) void SensorsList::childEvent ( TQChildEvent *e )
{ {
if(e->inserted()) { if(e->inserted()) {
connect((Sensor *)e->child(),SIGNAL(configChanged()),this,SLOT(slotConfigChanged())); connect((Sensor *)e->child(),TQ_SIGNAL(configChanged()),this,TQ_SLOT(slotConfigChanged()));
connect((Sensor *)e->child(),SIGNAL(valueChanged(double)) ,this,SLOT(slotValueChanged())); connect((Sensor *)e->child(),TQ_SIGNAL(valueChanged(double)) ,this,TQ_SLOT(slotValueChanged()));
} }
} }

@ -40,8 +40,8 @@ SystemCfg::SystemCfg(LMSensors *lsensors, TQWidget *parent, const char *name): S
boxPanelPaletteLayout->setAlignment( TQt::AlignTop ); boxPanelPaletteLayout->setAlignment( TQt::AlignTop );
boxPanelPaletteLayout->addWidget( palPanelCfg, 0, 0 ); boxPanelPaletteLayout->addWidget( palPanelCfg, 0, 0 );
connect( TabWidget ,SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotTabWidgetChanged(TQWidget *))); connect( TabWidget ,TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotTabWidgetChanged(TQWidget *)));
//connect( buttonApply ,SIGNAL(clicked()),this, SLOT(slotApplyChanges())); //connect( buttonApply ,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotApplyChanges()));
listSensors->clear(); listSensors->clear();
listSensors->insertItem( i18n("CPU Speed")); listSensors->insertItem( i18n("CPU Speed"));
@ -52,7 +52,7 @@ SystemCfg::SystemCfg(LMSensors *lsensors, TQWidget *parent, const char *name): S
listSensors->setCurrentItem(0); listSensors->setCurrentItem(0);
readSensorInfo(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(){ SystemCfg::~SystemCfg(){

Loading…
Cancel
Save