From f382ddf47576dd8e78450553066ff9aa79bd2278 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 20:33:12 -0300 Subject: Replace zero pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- src/cpupanel.h | 2 +- src/cputimepanel.h | 2 +- src/generalcfg.cpp | 2 +- src/generalcfg.h | 2 +- src/hdsensorslist.cpp | 8 ++++---- src/infopanels.h | 2 +- src/ksensors.cpp | 2 +- src/ksensorscfg.cpp | 2 +- src/ksensorscfg.h | 2 +- src/ksensorssplash.h | 2 +- src/lmsensor.h | 2 +- src/lmsensordockpanel.cpp | 6 +++--- src/lmsensordockpanel.h | 2 +- src/lmsensorpanel.h | 2 +- src/lmsensors.cpp | 4 ++-- src/lmsensors.h | 6 +++--- src/lmsensorsalarms.h | 2 +- src/lmsensorscfg.cpp | 8 ++++---- src/lmsensorscfg.h | 2 +- src/lmsensorschip.cpp | 2 +- src/lmsensorschip.h | 2 +- src/lmsensorsdock.cpp | 14 +++++++------- src/lmsensorsdock.h | 2 +- src/lmsensorswidget.cpp | 18 +++++++++--------- src/lmsensorswidget.h | 10 +++++----- src/main.cpp | 10 +++++----- src/palettecfg.cpp | 2 +- src/palettecfg.h | 2 +- src/panelsgroup.h | 2 +- src/qbarmeter.h | 2 +- src/qdialarc.h | 2 +- src/qlcddraw.h | 4 ++-- src/qlcdstring.h | 2 +- src/rampanel.h | 2 +- src/sensor.h | 2 +- src/sensorslist.cpp | 2 +- src/sensorslist.h | 4 ++-- src/systemcfg.cpp | 2 +- src/systemcfg.h | 2 +- src/uptimepanel.h | 2 +- 40 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/cpupanel.h b/src/cpupanel.h index ac48526..83d1ad3 100644 --- a/src/cpupanel.h +++ b/src/cpupanel.h @@ -32,7 +32,7 @@ class CpuPanel : public Panel { TQ_OBJECT public: - CpuPanel(TQWidget *parent=0, const char *name=0); + CpuPanel(TQWidget *parent=nullptr, const char *name=nullptr); ~CpuPanel(); protected: diff --git a/src/cputimepanel.h b/src/cputimepanel.h index ac06ebd..b15db3c 100644 --- a/src/cputimepanel.h +++ b/src/cputimepanel.h @@ -30,7 +30,7 @@ class CpuTimePanel : public Panel { public: - CpuTimePanel(TQWidget *parent=0, const char *name=0); + CpuTimePanel(TQWidget *parent=nullptr, const char *name=nullptr); ~CpuTimePanel(); protected: diff --git a/src/generalcfg.cpp b/src/generalcfg.cpp index f833c45..ef92ac4 100644 --- a/src/generalcfg.cpp +++ b/src/generalcfg.cpp @@ -38,7 +38,7 @@ GeneralCfg::GeneralCfg(LMSensors *lsensors, TQWidget *parent, const char *name) boxGeneralPaletteLayout->setAlignment( TQt::AlignTop ); boxGeneralPaletteLayout->addWidget( palPanelCfg, 0, 0 ); - palPanelCfg->readPalette(0); + palPanelCfg->readPalette(nullptr); int panelSize= LMSensorsWidget::cfgReadPanelSize(); switch(panelSize) { diff --git a/src/generalcfg.h b/src/generalcfg.h index 0ab676e..539e289 100644 --- a/src/generalcfg.h +++ b/src/generalcfg.h @@ -29,7 +29,7 @@ class GeneralCfg : public GeneralCfgDesign { TQ_OBJECT public: - GeneralCfg(LMSensors *lsensors, TQWidget *parent=0, const char *name=0); + GeneralCfg(LMSensors *lsensors, TQWidget *parent=nullptr, const char *name=nullptr); ~GeneralCfg(); public slots: diff --git a/src/hdsensorslist.cpp b/src/hdsensorslist.cpp index 651527b..391e5b2 100644 --- a/src/hdsensorslist.cpp +++ b/src/hdsensorslist.cpp @@ -31,7 +31,7 @@ HDSensorsList::HDSensorsList(TQObject *parent, const char * name): SensorsList(parent,name) { - process= 0; + process= nullptr; setDescription( i18n("Hard Disks") ); @@ -81,7 +81,7 @@ void HDSensorsList::updateSensors() if(!list) return; TQStringList params; - for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) + for(Sensor *obj= (Sensor *)list->first(); obj!=nullptr; obj= (Sensor *)list->next()) if(obj->monitorized()) params << obj->name(); @@ -104,14 +104,14 @@ void HDSensorsList::slotProcessExited(TDEProcess *) TQStringList buf = TQStringList::split(TQChar('\n'), process->getStdoutData()); for(TQStringList::Iterator it = buf.begin(); it != buf.end(); ++it ) { - for(Sensor *obj= (Sensor *)list->first(); obj!=0; obj= (Sensor *)list->next()) { + for(Sensor *obj= (Sensor *)list->first(); obj!=nullptr; obj= (Sensor *)list->next()) { TQRegExp rx(TQString(obj->name()) + TQString(":\\s+.+:\\s+(\\d+).*C")); if (rx.search((*it)) > -1) obj->setValue(rx.cap(1).toDouble(), Sensor::dgCelsius); } } delete process; - process= 0; + process= nullptr; } // *************** Static methods diff --git a/src/infopanels.h b/src/infopanels.h index a4ad51a..63d3868 100644 --- a/src/infopanels.h +++ b/src/infopanels.h @@ -36,7 +36,7 @@ class InfoPanels : public PanelsGroup { TQ_OBJECT public: - InfoPanels(TQWidget *panelsWidget, TQObject *parent=0, const char *name=0); + InfoPanels(TQWidget *panelsWidget, TQObject *parent=nullptr, const char *name=nullptr); ~InfoPanels(); static int cfgReadUpdateInterval(); diff --git a/src/ksensors.cpp b/src/ksensors.cpp index e085eb6..5323a6e 100644 --- a/src/ksensors.cpp +++ b/src/ksensors.cpp @@ -10,7 +10,7 @@ #include ksensors::ksensors() - : TDEMainWindow( 0, "ksensors" ) + : TDEMainWindow( nullptr, "ksensors" ) { // set the shell's ui resource file setXMLFile("ksensorsui.rc"); diff --git a/src/ksensorscfg.cpp b/src/ksensorscfg.cpp index 3436d73..bbd8672 100644 --- a/src/ksensorscfg.cpp +++ b/src/ksensorscfg.cpp @@ -60,7 +60,7 @@ KSensorsCfg::KSensorsCfg(LMSensors *lsensors, const char *name) TQObjectList *list= sensors->getSensorsChips(); if(list) { - for(SensorsList *chip= (SensorsList *)list->first(); chip!=0; chip= (SensorsList *)list->next()) + for(SensorsList *chip= (SensorsList *)list->first(); chip!=nullptr; chip= (SensorsList *)list->next()) { if(chip->getClass()==Sensor::lmSensor) { diff --git a/src/ksensorscfg.h b/src/ksensorscfg.h index 3ebea8b..3f07ef7 100644 --- a/src/ksensorscfg.h +++ b/src/ksensorscfg.h @@ -42,7 +42,7 @@ class KSensorsCfg : public KDialogBase { TQ_OBJECT public: - KSensorsCfg(LMSensors *lsensors, const char *name=0); + KSensorsCfg(LMSensors *lsensors, const char *name=nullptr); ~KSensorsCfg(); /*protected slots: diff --git a/src/ksensorssplash.h b/src/ksensorssplash.h index 694010a..1072629 100644 --- a/src/ksensorssplash.h +++ b/src/ksensorssplash.h @@ -30,7 +30,7 @@ class KSensorsSplash : public TQWidget { TQ_OBJECT public: - KSensorsSplash(TQWidget *parent=0, const char *name=0 ); + KSensorsSplash(TQWidget *parent=nullptr, const char *name=nullptr ); ~KSensorsSplash(); protected: diff --git a/src/lmsensor.h b/src/lmsensor.h index da11a3f..cb86ad7 100644 --- a/src/lmsensor.h +++ b/src/lmsensor.h @@ -40,7 +40,7 @@ class LMSensor : public Sensor { public: - LMSensor(SensorsList *parent=0); + LMSensor(SensorsList *parent=nullptr); ~LMSensor(); public slots: diff --git a/src/lmsensordockpanel.cpp b/src/lmsensordockpanel.cpp index 6f83267..b525aa6 100644 --- a/src/lmsensordockpanel.cpp +++ b/src/lmsensordockpanel.cpp @@ -25,7 +25,7 @@ #include "lmsensordockpanel.h" -LMSensorDockPanel::LMSensorDockPanel(Sensor *newSensor, const char *name) : KSystemTray( 0, name ) +LMSensorDockPanel::LMSensorDockPanel(Sensor *newSensor, const char *name) : KSystemTray( nullptr, name ) { strValue = ""; if(newSensor) { @@ -33,9 +33,9 @@ LMSensorDockPanel::LMSensorDockPanel(Sensor *newSensor, const char *name) : KSys updateConfig(); connect( newSensor, TQ_SIGNAL(valueChanged(double)) , this, TQ_SLOT(setValue(double)) ); connect( newSensor, TQ_SIGNAL(configChanged()) , this, TQ_SLOT(updateConfig()) ); - setPixmap(0); + setPixmap(nullptr); } else { - sensor= 0; + sensor= nullptr; setPixmap(BarIcon("ksensorsdocked")); } } diff --git a/src/lmsensordockpanel.h b/src/lmsensordockpanel.h index 9293d8d..e23fad5 100644 --- a/src/lmsensordockpanel.h +++ b/src/lmsensordockpanel.h @@ -35,7 +35,7 @@ class LMSensorDockPanel : public KSystemTray { TQ_OBJECT public: - LMSensorDockPanel(Sensor *newSensor=0, const char *name=0); + LMSensorDockPanel(Sensor *newSensor=nullptr, const char *name=nullptr); ~LMSensorDockPanel(); static void writeColorAlarm (const char *name, const TQColor &color); diff --git a/src/lmsensorpanel.h b/src/lmsensorpanel.h index 88228fc..f6ae99c 100644 --- a/src/lmsensorpanel.h +++ b/src/lmsensorpanel.h @@ -34,7 +34,7 @@ class LMSensorPanel : public Panel { TQ_OBJECT public: - LMSensorPanel(Sensor *newSensor, TQWidget *parent=0, const char *name=0); + LMSensorPanel(Sensor *newSensor, TQWidget *parent=nullptr, const char *name=nullptr); ~LMSensorPanel(); public slots: diff --git a/src/lmsensors.cpp b/src/lmsensors.cpp index a54fe30..32756dc 100644 --- a/src/lmsensors.cpp +++ b/src/lmsensors.cpp @@ -117,7 +117,7 @@ void LMSensors::setMonitorized(bool enable) { TQObjectList *list= getSensorsChips(); if(list) - for(LMSensorsChip *sensor=(LMSensorsChip*)list->first(); sensor!=0; sensor= (LMSensorsChip *)list->next()) + for(LMSensorsChip *sensor=(LMSensorsChip*)list->first(); sensor!=nullptr; sensor= (LMSensorsChip *)list->next()) sensor->setMonitorized(enable); } @@ -125,7 +125,7 @@ void LMSensors::setMonitorized(bool enable) Sensor *LMSensors::getSensor(const char *name) { int index= count(); - Sensor *sensor= 0; + Sensor *sensor= nullptr; while(--index>=0 && !sensor) { sensor= getSensorsChip(index)->getSensor(name); } diff --git a/src/lmsensors.h b/src/lmsensors.h index e16626a..4260721 100644 --- a/src/lmsensors.h +++ b/src/lmsensors.h @@ -40,17 +40,17 @@ TQ_OBJECT public: - LMSensors(TQObject *parent=0, const char *name=0); + LMSensors(TQObject *parent=nullptr, const char *name=nullptr); ~LMSensors(); void setMonitorized(bool enable); TQObjectList *getSensorsChips() { return (TQObjectList *)children(); }; - SensorsList *getSensorsChip(int index) { return children() ? (SensorsList *)((TQObjectList *)children())->at(index) : 0; } + SensorsList *getSensorsChip(int index) { return children() ? (SensorsList *)((TQObjectList *)children())->at(index) : nullptr; } SensorsList *getSensorsChip(const char *name) { return (SensorsList *)child(name); } int count() { return children() ? children()->count() : 0; } Sensor *getSensor(const char *name); - void emitConfigChanged(const char *name=0) { emit configChanged(name); } + void emitConfigChanged(const char *name=nullptr) { emit configChanged(name); } signals: diff --git a/src/lmsensorsalarms.h b/src/lmsensorsalarms.h index 83d7a88..ce382f7 100644 --- a/src/lmsensorsalarms.h +++ b/src/lmsensorsalarms.h @@ -32,7 +32,7 @@ public: enum Actions { acNothing, acSound, acCommand }; - LMSensorsAlarms(LMSensors *sensors, TQObject *parent=0, const char *name=0); + LMSensorsAlarms(LMSensors *sensors, TQObject *parent=nullptr, const char *name=nullptr); ~LMSensorsAlarms(); static int readAlarm(const char *name); diff --git a/src/lmsensorscfg.cpp b/src/lmsensorscfg.cpp index 068c030..9fdff9c 100644 --- a/src/lmsensorscfg.cpp +++ b/src/lmsensorscfg.cpp @@ -43,7 +43,7 @@ LMSensorsCfg::LMSensorsCfg(SensorsList *lsensors,TQWidget *parent, const char *n { sensors = lsensors; - curSensor= 0; + curSensor= nullptr; palPanelCfg= new PaletteCfg( boxPanelPalette ); boxPanelPalette->setColumnLayout(0, TQt::Vertical ); @@ -73,7 +73,7 @@ void LMSensorsCfg::readSensorsList() if(list) { listSensors->clear(); TQPixmap pm; - for(LMSensor *sensor=(LMSensor*)list->first(); sensor!=0; sensor= (LMSensor*)list->next()) { + for(LMSensor *sensor=(LMSensor*)list->first(); sensor!=nullptr; sensor= (LMSensor*)list->next()) { switch(sensor->getType()) { case LMSensor::lmTemp : pm= UserIcon("thermometer18x18.png"); break; case LMSensor::lmFan : pm= UserIcon("cooler18x18.png"); break; @@ -96,7 +96,7 @@ void LMSensorsCfg::readSensorInfo(int index) if(!curSensor) return; - if( oldSensor==0 || curSensor->getType()!=oldSensor->getType() || curSensor->getClass()!=oldSensor->getClass() ) + if( oldSensor==nullptr || curSensor->getType()!=oldSensor->getType() || curSensor->getClass()!=oldSensor->getClass() ) switch(curSensor->getType()) { case LMSensor::lmTemp : GroupBoxDes->setTitle(i18n("Temperature")); pixmapSensor->setPixmap( UserIcon( @@ -196,7 +196,7 @@ void LMSensorsCfg::applySensorChanges() // Apply alarms configuration if( CheckAllSensors->isChecked() ) { TQObjectList *list= sensors->getSensors(); - for(Sensor *sensor=(Sensor*)list->first(); sensor!=0; sensor= (Sensor*)list->next()) { + for(Sensor *sensor=(Sensor*)list->first(); sensor!=nullptr; sensor= (Sensor*)list->next()) { applySensorAlarmConfig(sensor); sensor->writeConfig(); } diff --git a/src/lmsensorscfg.h b/src/lmsensorscfg.h index 72d4a23..4fa971b 100644 --- a/src/lmsensorscfg.h +++ b/src/lmsensorscfg.h @@ -31,7 +31,7 @@ class LMSensorsCfg : public LMSensorsCfgDesign { TQ_OBJECT public: - LMSensorsCfg(SensorsList *lsensors,TQWidget *parent=0, const char *name=0); + LMSensorsCfg(SensorsList *lsensors,TQWidget *parent=nullptr, const char *name=nullptr); ~LMSensorsCfg(); protected slots: diff --git a/src/lmsensorschip.cpp b/src/lmsensorschip.cpp index 688b7be..292984b 100644 --- a/src/lmsensorschip.cpp +++ b/src/lmsensorschip.cpp @@ -71,7 +71,7 @@ void LMSensorsChip::updateSensors() TQObjectList *sensors= (TQObjectList *)children(); if(sensors) - for(LMSensor *sensor= (LMSensor *)sensors->first(); sensor!=0; sensor= (LMSensor *)sensors->next()) + for(LMSensor *sensor= (LMSensor *)sensors->first(); sensor!=nullptr; sensor= (LMSensor *)sensors->next()) if(sensor->monitorized()) sensor->updateValue(); } diff --git a/src/lmsensorschip.h b/src/lmsensorschip.h index f10812d..220f26b 100644 --- a/src/lmsensorschip.h +++ b/src/lmsensorschip.h @@ -33,7 +33,7 @@ TQ_OBJECT public: - LMSensorsChip(const sensors_chip_name *chip=0, TQObject *parent=0, const char *name=0); + LMSensorsChip(const sensors_chip_name *chip=nullptr, TQObject *parent=nullptr, const char *name=nullptr); ~LMSensorsChip(); public slots: diff --git a/src/lmsensorsdock.cpp b/src/lmsensorsdock.cpp index 58eaaf5..eef8fc6 100644 --- a/src/lmsensorsdock.cpp +++ b/src/lmsensorsdock.cpp @@ -104,16 +104,16 @@ TQObjectList *chips= sensors->getSensorsChips(); countSensors= 0; if(chips) - for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=0; chip= (LMSensorsChip *)chips->next()) { + for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=nullptr; chip= (LMSensorsChip *)chips->next()) { TQObjectList *list= (TQObjectList *)chip->getSensors(); if(list) { - for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=0; sensor= (LMSensor *)list->next()) { + for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=nullptr; sensor= (LMSensor *)list->next()) { if( LMSensorDockPanel::readShowInDock(sensor->name()) ) createDockSensor(sensor); } } } - if(countSensors==0) createDockSensor(0); + if(countSensors==0) createDockSensor(nullptr); } void LMSensorsDock::createAlarmControl() @@ -176,10 +176,10 @@ void LMSensorsDock::createDockSensor(Sensor *sensor) if(countSensors==0) { TQObjectList *list= (TQObjectList *)children(); if(list) - for(LMSensorDockPanel *sensor= (LMSensorDockPanel *)list->first(); sensor!=0; sensor= (LMSensorDockPanel *)list->next()) + for(LMSensorDockPanel *sensor= (LMSensorDockPanel *)list->first(); sensor!=nullptr; sensor= (LMSensorDockPanel *)list->next()) delete sensor; } - const char *name= sensor ? sensor->name() : 0; + const char *name= sensor ? sensor->name() : nullptr; LMSensorDockPanel *dock= new LMSensorDockPanel(sensor,name); connect( dock, TQ_SIGNAL(mouseEvent(TQMouseEvent *)), this, TQ_SLOT(mouseEventReceived(TQMouseEvent *)) ); insertChild(dock); @@ -190,7 +190,7 @@ void LMSensorsDock::createDockSensor(Sensor *sensor) void LMSensorsDock::deleteDockSensor(LMSensorDockPanel *sensor) { delete sensor; - if(--countSensors==0) createDockSensor(0); + if(--countSensors==0) createDockSensor(nullptr); } void LMSensorsDock::updateItemDock(const char *name) @@ -206,7 +206,7 @@ void LMSensorsDock::updateItemDock(const char *name) if(dockSensor) deleteDockSensor(dockSensor); else createDockSensor(sensor); } else { - if(dockSensor!=0) + if(dockSensor!=nullptr) dockSensor->updateConfig(); } // } diff --git a/src/lmsensorsdock.h b/src/lmsensorsdock.h index 40347e5..33600d4 100644 --- a/src/lmsensorsdock.h +++ b/src/lmsensorsdock.h @@ -48,7 +48,7 @@ class LMSensorsDock : public TQObject TQ_OBJECT public: - LMSensorsDock(bool fNoDock=false, TQObject *parent=0, const char *name=0); + LMSensorsDock(bool fNoDock=false, TQObject *parent=nullptr, const char *name=nullptr); ~LMSensorsDock(); public slots: diff --git a/src/lmsensorswidget.cpp b/src/lmsensorswidget.cpp index 9b54b13..ac8994c 100644 --- a/src/lmsensorswidget.cpp +++ b/src/lmsensorswidget.cpp @@ -45,7 +45,7 @@ LMSensorsWidget::LMSensorsWidget(LMSensors *lsensors,TQWidget *parent, const cha // sensors= lsensors; // - childDraging = 0; + childDraging = nullptr; // setCaption("KSensors"); // @@ -136,7 +136,7 @@ TQMouseEvent *m = (TQMouseEvent*)e; void LMSensorsWidget::startDragChild(TQMouseEvent *m, TQWidget *w) { - if(childDraging==0) + if(childDraging==nullptr) { childDraging= w; grabMouse(sizeAllCursor); @@ -160,7 +160,7 @@ int y= childDraging->y(); ((y+childDraging->height()/2) / panelsSize) * panelsSize ); saveDisplayConfig((Panel *)childDraging); - childDraging= 0; + childDraging= nullptr; } void LMSensorsWidget::mouseMoveEvent ( TQMouseEvent *m ) @@ -191,7 +191,7 @@ TQObjectList *list= (TQObjectList *)children(); for(y=0; y<32; y++) a[y]= 0; mx= 0; my= 0; if(list) - for(TQWidget *obj= (TQWidget *)list->first(); obj!=0; obj= (TQWidget *)list->next()) + for(TQWidget *obj= (TQWidget *)list->first(); obj!=nullptr; obj= (TQWidget *)list->next()) { y=obj->y()/panelsSize; x=obj->x()/panelsSize; @@ -218,7 +218,7 @@ TQObjectList *list= (TQObjectList *)children(); void LMSensorsWidget::loadDisplayConfig(Panel *display) { - if(display==0) return; + if(display==nullptr) return; loadPalette(display); @@ -255,10 +255,10 @@ void LMSensorsWidget::createSensorPanels() { TQObjectList *chips= sensors->getSensorsChips(); if(chips) - for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=0; chip= (LMSensorsChip *)chips->next()) { + for(LMSensorsChip *chip= (LMSensorsChip *)chips->first(); chip!=nullptr; chip= (LMSensorsChip *)chips->next()) { TQObjectList *list= (TQObjectList *)chip->getSensors(); if(list) { - for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=0; sensor= (LMSensor *)list->next()) { + for(LMSensor *sensor= (LMSensor *)list->first(); sensor!=nullptr; sensor= (LMSensor *)list->next()) { if( Panel::readShow(sensor->name()) ) (void) new LMSensorPanel(sensor, this, sensor->name() ); } @@ -271,7 +271,7 @@ void LMSensorsWidget::resizePanels(int newSize) TQObjectList *panels= (TQObjectList *)children(); if(panels) - for(TQWidget *panel= (TQWidget *)panels->first(); panel!=0; panel= (TQWidget *)panels->next()) { + for(TQWidget *panel= (TQWidget *)panels->first(); panel!=nullptr; panel= (TQWidget *)panels->next()) { panel->move( (panel->x()/panelsSize)*newSize, (panel->y()/panelsSize)*newSize); panel->resize(newSize,newSize); } @@ -313,7 +313,7 @@ void LMSensorsWidget::loadPalette(Panel *panel) if(cfgReadPalette(pal,panel->name(),false)) panel->setPalette(pal); else panel->unsetPalette(); } else { - cfgReadPalette(pal,0,true); + cfgReadPalette(pal,nullptr,true); setPalette(pal); } } diff --git a/src/lmsensorswidget.h b/src/lmsensorswidget.h index 011d458..077afb6 100644 --- a/src/lmsensorswidget.h +++ b/src/lmsensorswidget.h @@ -33,12 +33,12 @@ class LMSensorsWidget : public TQWidget { TQ_OBJECT public: - LMSensorsWidget(LMSensors *lsensors,TQWidget *parent=0, const char *name=0); + LMSensorsWidget(LMSensors *lsensors,TQWidget *parent=nullptr, const char *name=nullptr); ~LMSensorsWidget(); - static bool cfgReadPalette(TQPalette &pal,const char *name=0, bool returnDefault= false); - static void cfgWritePalette(const TQPalette &pal,const char *name=0); - static void cfgUnsetPalette(const char *name=0); + static bool cfgReadPalette(TQPalette &pal,const char *name=nullptr, bool returnDefault= false); + static void cfgWritePalette(const TQPalette &pal,const char *name=nullptr); + static void cfgUnsetPalette(const char *name=nullptr); static void getDefaultPalette(TQPalette &pal); static void cfgWritePanelSize(int newSize); static int cfgReadPanelSize(); @@ -59,7 +59,7 @@ private: int panelsSize; TQPoint origMousePt; - void loadPalette(Panel *panel=0); + void loadPalette(Panel *panel=nullptr); void loadDisplayConfig(Panel *display); void saveDisplayConfig(Panel *display); void mouseReleaseEvent ( TQMouseEvent *m ); diff --git a/src/main.cpp b/src/main.cpp index 0408e21..e21bcf0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,9 +30,9 @@ static const char *description = static TDECmdLineOptions options[] = { - { "nodock", I18N_NOOP("Don't dock in TDE system tray."), 0 }, - { "splash", I18N_NOOP("Show splash screen."), 0 }, - { 0, 0, 0 } + { "nodock", I18N_NOOP("Don't dock in TDE system tray."), nullptr }, + { "splash", I18N_NOOP("Show splash screen."), nullptr }, + { nullptr, nullptr, nullptr } // INSERT YOUR COMMANDLINE OPTIONS HERE }; @@ -42,8 +42,8 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "ksensors", I18N_NOOP("KSensors"), VERSION, description, TDEAboutData::License_GPL, - "(c) 2001, Miguel Novas", 0, 0, "michaell@teleline.es"); - aboutData.addAuthor("Miguel Novas",0, "michaell@teleline.es"); + "(c) 2001, Miguel Novas", nullptr, nullptr, "michaell@teleline.es"); + aboutData.addAuthor("Miguel Novas",nullptr, "michaell@teleline.es"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/src/palettecfg.cpp b/src/palettecfg.cpp index 4a92013..0cc05c6 100644 --- a/src/palettecfg.cpp +++ b/src/palettecfg.cpp @@ -25,7 +25,7 @@ PaletteCfg::PaletteCfg(TQWidget *parent, const char *name): PaletteCfgDesign(parent,name) { - groupName= 0; + groupName= nullptr; slotComboSelected(0); connect( comboSelect,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotComboSelected(int)) ); connect( buttonColor,TQ_SIGNAL(changed(const TQColor &)),this,TQ_SLOT(slotColorChanged(const TQColor &)) ); diff --git a/src/palettecfg.h b/src/palettecfg.h index 694c7f1..60ec10e 100644 --- a/src/palettecfg.h +++ b/src/palettecfg.h @@ -29,7 +29,7 @@ class PaletteCfg : public PaletteCfgDesign { TQ_OBJECT public: - PaletteCfg(TQWidget *parent=0, const char *name=0); + PaletteCfg(TQWidget *parent=nullptr, const char *name=nullptr); ~PaletteCfg(); void readPalette(const char *name); diff --git a/src/panelsgroup.h b/src/panelsgroup.h index 197e8d8..afe1120 100644 --- a/src/panelsgroup.h +++ b/src/panelsgroup.h @@ -29,7 +29,7 @@ class PanelsGroup : public TQObject { TQ_OBJECT public: - PanelsGroup(TQWidget *widget, TQObject *parent=0, const char *name=0) {}; + PanelsGroup(TQWidget *widget, TQObject *parent=nullptr, const char *name=nullptr) {}; ~PanelsGroup() {}; diff --git a/src/qbarmeter.h b/src/qbarmeter.h index 5fd3c7c..735a274 100644 --- a/src/qbarmeter.h +++ b/src/qbarmeter.h @@ -32,7 +32,7 @@ public: enum Direction { dirLeft, dirRight ,dirUp, dirDown }; - TQBarMeter(TQWidget *parent=0, const char *name=0); + TQBarMeter(TQWidget *parent=nullptr, const char *name=nullptr); ~TQBarMeter(); void setDirection(Direction dir); diff --git a/src/qdialarc.h b/src/qdialarc.h index 625b8a3..829d5d6 100644 --- a/src/qdialarc.h +++ b/src/qdialarc.h @@ -27,7 +27,7 @@ class TQDialArc : public TQWidget { TQ_OBJECT public: - TQDialArc(TQWidget *parent=0, const char *name=0); + TQDialArc(TQWidget *parent=nullptr, const char *name=nullptr); ~TQDialArc(); void setValue (double value); diff --git a/src/qlcddraw.h b/src/qlcddraw.h index 533087a..fe64447 100644 --- a/src/qlcddraw.h +++ b/src/qlcddraw.h @@ -46,8 +46,8 @@ public: int w, int h, const char *str, int options=0, - const TQColor *color=0, - const TQColor *colorShadow=0); + const TQColor *color=nullptr, + const TQColor *colorShadow=nullptr); static void draw(TQPainter *p,int x,int y,int w,int h, char c); diff --git a/src/qlcdstring.h b/src/qlcdstring.h index 6f70eb4..874ad36 100644 --- a/src/qlcdstring.h +++ b/src/qlcdstring.h @@ -42,7 +42,7 @@ public: alignJustify= 0x0003 }; - TQLCDString( TQWidget *parent=0, const char *name=0 ); + TQLCDString( TQWidget *parent=nullptr, const char *name=nullptr ); ~TQLCDString(); void display( const TQString &str ); diff --git a/src/rampanel.h b/src/rampanel.h index a52dc06..74467ae 100644 --- a/src/rampanel.h +++ b/src/rampanel.h @@ -31,7 +31,7 @@ public: enum RamType { memRAM, memSWAP }; - RamPanel(TQWidget *parent=0, const char *name=0, RamType type= memRAM); + RamPanel(TQWidget *parent=nullptr, const char *name=nullptr, RamType type= memRAM); ~RamPanel(); protected: diff --git a/src/sensor.h b/src/sensor.h index 4979c18..c709d96 100644 --- a/src/sensor.h +++ b/src/sensor.h @@ -44,7 +44,7 @@ public: enum SensorType { lmTemp, lmFan, lmVoltage }; - Sensor(SensorsList *parent=0, const char *name=0); + Sensor(SensorsList *parent=nullptr, const char *name=nullptr); ~Sensor(); inline void setType(SensorType newType) { type= newType; }; diff --git a/src/sensorslist.cpp b/src/sensorslist.cpp index 67e971e..abf8be6 100644 --- a/src/sensorslist.cpp +++ b/src/sensorslist.cpp @@ -58,7 +58,7 @@ void SensorsList::setTempScale(Sensor::TempScale scale) tempScale= scale; TQObjectList *list= getSensors(); if(list) - for(Sensor *sensor=(Sensor*)list->first(); sensor!=0; sensor= (Sensor*)list->next()) + for(Sensor *sensor=(Sensor*)list->first(); sensor!=nullptr; sensor= (Sensor*)list->next()) if(sensor->getType()==Sensor::lmTemp) emit sensor->configChanged(); } diff --git a/src/sensorslist.h b/src/sensorslist.h index d4ed463..152be30 100644 --- a/src/sensorslist.h +++ b/src/sensorslist.h @@ -36,14 +36,14 @@ TQ_OBJECT public: - SensorsList(TQObject *parent=0, const char *name=0); + SensorsList(TQObject *parent=nullptr, const char *name=nullptr); ~SensorsList(); void setMonitorized(bool enable); const TQString &getDescription() { return description; }; TQObjectList *getSensors() { return (TQObjectList *)children(); }; - Sensor *getSensor(int index) { return children() ? (Sensor *)((TQObjectList *)children())->at(index) : 0; } + Sensor *getSensor(int index) { return children() ? (Sensor *)((TQObjectList *)children())->at(index) : nullptr; } Sensor *getSensor(const char *name) { return (Sensor *)child(name); } int count() { return children() ? children()->count() : 0; } diff --git a/src/systemcfg.cpp b/src/systemcfg.cpp index 8eca841..1c6a27a 100644 --- a/src/systemcfg.cpp +++ b/src/systemcfg.cpp @@ -76,7 +76,7 @@ const char *SystemCfg::getPanelName(int index) case 3: return "proc.SWAPINFO"; case 4: return "proc.UPTIME"; } - return 0; + return nullptr; } void SystemCfg::slotCurrentSensorChanged(int index) diff --git a/src/systemcfg.h b/src/systemcfg.h index 16149ff..917f2b6 100644 --- a/src/systemcfg.h +++ b/src/systemcfg.h @@ -29,7 +29,7 @@ class SystemCfg : public SystemCfgDesign { TQ_OBJECT public: - SystemCfg(LMSensors *lsensors, TQWidget *parent=0, const char *name=0); + SystemCfg(LMSensors *lsensors, TQWidget *parent=nullptr, const char *name=nullptr); ~SystemCfg(); protected slots: diff --git a/src/uptimepanel.h b/src/uptimepanel.h index 3551b29..a81180d 100644 --- a/src/uptimepanel.h +++ b/src/uptimepanel.h @@ -30,7 +30,7 @@ class UpTimePanel : public Panel { TQ_OBJECT public: - UpTimePanel(TQWidget *parent=0, const char *name=0); + UpTimePanel(TQWidget *parent=nullptr, const char *name=nullptr); ~UpTimePanel(); protected: -- cgit v1.2.3