From 45b9fbd9ccfc15127227a00f54bad4415bda1185 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 19:41:05 -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/knutanalog.cpp | 2 +- src/knutanalog.h | 2 +- src/knutclient.cpp | 28 ++++++++++++++-------------- src/knutclient.h | 2 +- src/knutdock.cpp | 14 +++++++------- src/knutfrontpanel.cpp | 4 ++-- src/knutfrontpanel.h | 2 +- src/knutinstcomms.h | 2 +- src/knutmainwindow.cpp | 12 ++++++------ src/knutmainwindow.h | 2 +- src/knutmessage.cpp | 8 ++++---- src/knutmessage.h | 2 +- src/knutmessagemanager.cpp | 6 +++--- src/knutmessagemanager.h | 2 +- src/knutnet.cpp | 10 +++++----- src/knutnewupsdlg.cpp | 22 +++++++++++----------- src/knutnewupsdlg.h | 2 +- src/knutpanelmeter.cpp | 26 +++++++++++++------------- src/knutpanelmeter.h | 2 +- src/knutprefdlg.h | 2 +- src/knutprintupsvar.cpp | 8 ++++---- src/knutprintupsvar.h | 2 +- src/knutrwvar.h | 2 +- src/knutupsdata.cpp | 2 +- src/knutvardata.cpp | 2 +- src/main.cpp | 12 ++++++------ 26 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/knutanalog.cpp b/src/knutanalog.cpp index 4d86f14..2914652 100644 --- a/src/knutanalog.cpp +++ b/src/knutanalog.cpp @@ -100,7 +100,7 @@ KNutAnalog::KNutAnalog( TQWidget *parent, const char *name, int bottomLimit, int } // konec hodnot zavislych na typu zobrazeni - if (analogFonts == 0) { // pokud neni predan font nastavi se systemovy font + if (analogFonts == nullptr) { // pokud neni predan font nastavi se systemovy font m_scaleFont = tdeApp->font(); m_textFont = tdeApp->font(); } diff --git a/src/knutanalog.h b/src/knutanalog.h index a32f1b3..0f96e3f 100644 --- a/src/knutanalog.h +++ b/src/knutanalog.h @@ -75,7 +75,7 @@ public: * @param qualityOfPainter determine quality painting of pointer- 0 nothing. 1 fast antialiasing, 2 slow antialiasing, 3 blur motion + fast antialiasing, 4 blur motion + slow antialiasing * @since 0.3 **/ - KNutAnalog(TQWidget *parent = 0, const char *name = 0, int Astart = 0, int topLimit = 100, int typeOfView = 1, int countOfParts = 5, int countOfSubParts = 0, TQColor pointerColor = TQt::black, TQColor m_scaleColor = TQt::black, TQColor textColor = TQt::black, TQFont *analogFonts = 0, int qualityOfPointer = 4, bool makeBG = false ); + KNutAnalog(TQWidget *parent = nullptr, const char *name = nullptr, int Astart = 0, int topLimit = 100, int typeOfView = 1, int countOfParts = 5, int countOfSubParts = 0, TQColor pointerColor = TQt::black, TQColor m_scaleColor = TQt::black, TQColor textColor = TQt::black, TQFont *analogFonts = nullptr, int qualityOfPointer = 4, bool makeBG = false ); /** * Destruktor diff --git a/src/knutclient.cpp b/src/knutclient.cpp index 1b059dc..33bac1c 100644 --- a/src/knutclient.cpp +++ b/src/knutclient.cpp @@ -130,12 +130,12 @@ KNutClient::~KNutClient(void) { if (m_myMessMan) delete m_myMessMan; // melo by uz byt zruseno - jistota - if (m_myDock) { m_myDock->close(); m_myDock=0l;} + if (m_myDock) { m_myDock->close(); m_myDock=nullptr;} if (m_mainUpsInfo.upsNet) { // melo by uz byt zruseno - jistota delete m_mainUpsInfo.upsNet; - m_mainUpsInfo.upsNet = 0; + m_mainUpsInfo.upsNet = nullptr; } m_listKNutEvent->clear(); delete m_listKNutEvent; @@ -302,7 +302,7 @@ void KNutClient::initVars (void) { settingData.toolTipFlags = KNutDock::DefaultToolTipFlags; // informace v hlavnim panelu // information in main panel m_mainUpsInfo.record.name=""; - m_mainUpsInfo.upsNet=0L; + m_mainUpsInfo.upsNet=nullptr; m_mainUpsInfo.netError=0; // no error zadna chyba m_mainUpsInfo.name=""; m_mainUpsInfo.password=""; @@ -321,9 +321,9 @@ void KNutClient::initVars (void) { m_lastError=0; // no error - mainWindow=0; - m_myDock=0; - m_myMessMan=0; + mainWindow=nullptr; + m_myDock=nullptr; + m_myMessMan=nullptr; settingData.activatedMainWindow=false; } @@ -656,7 +656,7 @@ void KNutClient::setActiveUpsInfo (TQString name) { //presuneme jmena z databaze ups-ek - je nahrana z config. souboru KNutUpsData::upsRecordDef* upsRecordPointer; - if ((!name.isNull()) && (!name.isEmpty()) && ((upsRecordPointer = upsRecords->findName(name)) != 0L)) { + if ((!name.isNull()) && (!name.isEmpty()) && ((upsRecordPointer = upsRecords->findName(name)) != nullptr)) { m_mainUpsInfo.record.upsName = upsRecordPointer->upsName; m_mainUpsInfo.record.upsAddress = upsRecordPointer->upsAddress; @@ -1133,15 +1133,15 @@ void KNutClient::slotChangeRWVars( TQString ) { void KNutClient::exitMainWindow (void) { - mainWindow=0; + mainWindow=nullptr; if (m_mainUpsInfo.upsNet) setActiveUpsVars(false); // Pokud neni aktivovan dock musime ukoncit aplikaci.. // When dock isn't activated we must close application. - if (m_myDock == 0) { + if (m_myDock == nullptr) { saveConfiguration(false); if (m_mainUpsInfo.upsNet) { delete m_mainUpsInfo.upsNet; - m_mainUpsInfo.upsNet = 0; + m_mainUpsInfo.upsNet = nullptr; } tdeApp->quit(); } @@ -1208,7 +1208,7 @@ void KNutClient::closeMainWindow (void) { if (m_myDock) m_myDock->repaintDock(m_mainUpsInfo.netError); m_upsTimer->stop(); mainWindow->close(); - mainWindow=0; + mainWindow=nullptr; m_upsTimer->start( 1, true ); // starts timer // nastartujeme casovac } } @@ -1221,14 +1221,14 @@ void KNutClient::slotExitApplication(void) { // odpojime protoze exitMainWindow by byl vykonan az po zkonceni procedury; disconnect(mainWindow, TQ_SIGNAL(destroyed()), this, TQ_SLOT(exitMainWindow())); delete mainWindow; - mainWindow = 0; + mainWindow = nullptr; } saveConfiguration(false); if (m_mainUpsInfo.upsNet) { delete m_mainUpsInfo.upsNet; - m_mainUpsInfo.upsNet = 0; + m_mainUpsInfo.upsNet = nullptr; } - if (m_myDock) { m_myDock->close(); m_myDock = 0;} + if (m_myDock) { m_myDock->close(); m_myDock = nullptr;} tdeApp->quit(); } diff --git a/src/knutclient.h b/src/knutclient.h index 32892d3..0c85408 100644 --- a/src/knutclient.h +++ b/src/knutclient.h @@ -47,7 +47,7 @@ class KNutClient : public TQObject, public KSessionManaged { TQ_OBJECT public: - KNutClient(bool noDock = false, TQObject* parent=0,const char* name=0); + KNutClient(bool noDock = false, TQObject* parent=nullptr,const char* name=nullptr); ~KNutClient(); private slots: diff --git a/src/knutdock.cpp b/src/knutdock.cpp index bd3c716..a390321 100644 --- a/src/knutdock.cpp +++ b/src/knutdock.cpp @@ -71,8 +71,8 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD createMainMenu(); #define ICON_SIZE 22 - m_statusLayer = 0; - m_runtimeLayer = 0; + m_statusLayer = nullptr; + m_runtimeLayer = nullptr; m_loadLayer = new TQPixmap(ICON_SIZE,ICON_SIZE); m_chargeLayer = new TQPixmap(ICON_SIZE,ICON_SIZE); @@ -155,9 +155,9 @@ void KNutDock::changeTDEIcon (void) { } else { // picture Icon delete m_statusLayer; - m_statusLayer = 0; + m_statusLayer = nullptr; delete m_runtimeLayer; - m_runtimeLayer=0; + m_runtimeLayer=nullptr; } paintLoad(m_upsLoadValue); paintCharge(m_batteryChargeValue); @@ -193,7 +193,7 @@ void KNutDock::repaintDock (const bool always) { TQPainter paint; - if (m_activeUpsInfo->upsNet == 0) { repaint(); return;} + if (m_activeUpsInfo->upsNet == nullptr) { repaint(); return;} m_dataOkOld=m_dataOk; @@ -405,7 +405,7 @@ void KNutDock::toolTip (int runtime, int status, int batteryCharge, int upsLoad int min = abs(runtime/60); int sec = runtime - (min*60); - if (m_activeUpsInfo->upsNet != 0) { + if (m_activeUpsInfo->upsNet != nullptr) { myNetErr= m_activeUpsInfo->upsNet->getError(); switch (m_activeUpsInfo->nutVariables) { case 1: @@ -517,7 +517,7 @@ void KNutDock::toolTip (int runtime, int status, int batteryCharge, int upsLoad void KNutDock::slotExitApplication (void) { if (m_settingData->areYouSure) { - if (KMessageBox::warningYesNo (0,i18n("Are you sure ?")) == 3) + if (KMessageBox::warningYesNo (nullptr,i18n("Are you sure ?")) == 3) emit endApplication(); } else emit endApplication(); diff --git a/src/knutfrontpanel.cpp b/src/knutfrontpanel.cpp index f34061e..5fbaeb4 100644 --- a/src/knutfrontpanel.cpp +++ b/src/knutfrontpanel.cpp @@ -44,13 +44,13 @@ KNutFrontPanel::KNutFrontPanel( TQPalette* const paletteIn, TQWidget *parent, co m_upsBackColor = TQt::white; //backgroundColor(); m_helpColor = TQt::black; m_typeOfLCDColor=true; - m_LCDNumber1 = 0; + m_LCDNumber1 = nullptr; setFrameStyle( TQFrame::Box | TQFrame::Raised ); setLineWidth( 2 ); - if (panelFonts == 0) { + if (panelFonts == nullptr) { m_panelFont =tdeApp->font(); // sets font - system font m_panelBoldFont = tdeApp->font(); } diff --git a/src/knutfrontpanel.h b/src/knutfrontpanel.h index 1a0e649..1de9c79 100644 --- a/src/knutfrontpanel.h +++ b/src/knutfrontpanel.h @@ -87,7 +87,7 @@ enum panelBulb { * @param panelFonts Odkaz na fonts ktery se ma pouzit pro vykreslovani, pokud je = 0 (nula) pouzije se systemovy font pri aplikaci. * @since 0.8 */ - KNutFrontPanel( TQPalette* const paletteIn, TQWidget *parent = 0, const unsigned int flags = DefaultPanelFlags, TQFont* const panelFonts = 0L ,const char *name = 0); + KNutFrontPanel( TQPalette* const paletteIn, TQWidget *parent = nullptr, const unsigned int flags = DefaultPanelFlags, TQFont* const panelFonts = nullptr ,const char *name = nullptr); /** * Destruktor diff --git a/src/knutinstcomms.h b/src/knutinstcomms.h index 70b882e..5880952 100644 --- a/src/knutinstcomms.h +++ b/src/knutinstcomms.h @@ -53,7 +53,7 @@ public: * * @since 0.4 **/ - KNutInstComms(TQString* userName, TQString* userPassword, const TQString uName, const TQString password, KNutNet* const upsNet, TQWidget* parent = 0, const char* name = 0, bool const modal = true); + KNutInstComms(TQString* userName, TQString* userPassword, const TQString uName, const TQString password, KNutNet* const upsNet, TQWidget* parent = nullptr, const char* name = nullptr, bool const modal = true); /** * Destruktor diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp index 45b22cc..3f8db61 100644 --- a/src/knutmainwindow.cpp +++ b/src/knutmainwindow.cpp @@ -128,7 +128,7 @@ KNutMainWindow::KNutMainWindow(TQStringList *tListKNutEvent, KNutVarData::upsInf // sets Combo a actives connections to meter panels // Nastavime COMBO a pripadne aktivujeme spojeni na merici panely int activeUpsNameIndex = activeMainCombo (); - if (activeUpsNameIndex != -1) toolBar(0)->getCombo(1)->setCurrentItem( activeUpsNameIndex ); + if (activeUpsNameIndex != -1) toolBar(nullptr)->getCombo(1)->setCurrentItem( activeUpsNameIndex ); showUpsData(); setGeometry (m_settingData->x,m_settingData->y,m_settingData->width,m_settingData->height); @@ -363,7 +363,7 @@ void KNutMainWindow::showUpsData (void) { //tqDebug ("KNutMainWindow::showUpsData start"); - if ((m_activeUpsInfo->upsNet != 0L) && (!m_activeUpsInfo->netError) && + if ((m_activeUpsInfo->upsNet != nullptr) && (!m_activeUpsInfo->netError) && (m_activeUpsInfo->upsDriverState == knc::connected)) { int runtimeVal; TQString nutStringVar; @@ -479,13 +479,13 @@ void KNutMainWindow::hideUpsData (void) { } void KNutMainWindow::setCombo (TQString name) { - if (toolBar(0)->getCombo(1)->currentText() != name) toolBar(0)->getCombo(1)->setCurrentText(name); + if (toolBar(nullptr)->getCombo(1)->currentText() != name) toolBar(nullptr)->getCombo(1)->setCurrentText(name); } void KNutMainWindow::repaintPanel (void) { TQString nutStringVar; - if (m_activeUpsInfo->upsNet == 0) return; + if (m_activeUpsInfo->upsNet == nullptr) return; if (!m_activeUpsInfo->upsNet->existName(m_activeUpsInfo->runtimeVar)) { nutStringVar = m_activeUpsInfo->upsNet->readStringVar(m_activeUpsInfo->runtimeVar); if (nutStringVar.isEmpty()) m_frontPanel->setRuntime(0); @@ -659,7 +659,7 @@ void KNutMainWindow::slotConfigureKeys() { void KNutMainWindow::slotCloseKnutClient (void) { if (m_settingData->areYouSure) { - if (KMessageBox::warningYesNo (0,i18n("Are you sure ?")) == 3) + if (KMessageBox::warningYesNo (nullptr,i18n("Are you sure ?")) == 3) emit endApplication(); } else emit endApplication(); @@ -773,7 +773,7 @@ void KNutMainWindow::initVars ( void ) { int KNutMainWindow::activeMainCombo (void) { int activeUpsNameIndex = -1; // zadne upsName neni aktivni , any upsName is not active - KComboBox *combo = toolBar(0)->getCombo(1); + KComboBox *combo = toolBar(nullptr)->getCombo(1); //naplnime comboBox //loads comboBox diff --git a/src/knutmainwindow.h b/src/knutmainwindow.h index 6455197..c5d99c3 100644 --- a/src/knutmainwindow.h +++ b/src/knutmainwindow.h @@ -76,7 +76,7 @@ class KNutMainWindow : public TDEMainWindow { * * @since 0.3.1 **/ - KNutMainWindow(TQStringList* tListKNutEvent, KNutVarData::upsInfoDef* tActiveUpsInfo, KNutVarData::SettingDataDef* tSettingData, KNutUpsData* tUpsRecords, KNutVarData* tAnalogRecords, TQWidget* parent=0,const char *name=0); + KNutMainWindow(TQStringList* tListKNutEvent, KNutVarData::upsInfoDef* tActiveUpsInfo, KNutVarData::SettingDataDef* tSettingData, KNutUpsData* tUpsRecords, KNutVarData* tAnalogRecords, TQWidget* parent=nullptr,const char *name=nullptr); /** * Destructor diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp index d9061ea..5d01fc8 100644 --- a/src/knutmessage.cpp +++ b/src/knutmessage.cpp @@ -30,18 +30,18 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c setCaption("KNutClient"); - m_messageTimer = 0; + m_messageTimer = nullptr; TDEIconLoader *loader = TDEGlobal::iconLoader(); switch(type) { case infoMess: - m_ret = loader->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, nullptr, true); break; case warningMess: - m_ret = loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, nullptr, true); break; case criticalMess: - m_ret = loader->loadIcon("messagebox_critical", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_critical", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, nullptr, true); break; } diff --git a/src/knutmessage.h b/src/knutmessage.h index 2ef42f5..b3119fd 100644 --- a/src/knutmessage.h +++ b/src/knutmessage.h @@ -64,7 +64,7 @@ enum typeOfMessage { * @param timeValidity maximalni doba zobrazeni okna, je-li rovna nule je neomezena. * @since 0.2 */ - KNutMessage(const TQString messageText, const typeOfMessage type=infoMess, const long int timeValidity=0, TQWidget *parent=0, const char *name=0); + KNutMessage(const TQString messageText, const typeOfMessage type=infoMess, const long int timeValidity=0, TQWidget *parent=nullptr, const char *name=nullptr); /** * Destruktor. diff --git a/src/knutmessagemanager.cpp b/src/knutmessagemanager.cpp index 08a0c5c..36b4568 100644 --- a/src/knutmessagemanager.cpp +++ b/src/knutmessagemanager.cpp @@ -22,7 +22,7 @@ KNutMessageManager::KNutMessageManager( TQObject *parent, const char *name) : T //tqDebug("KNutMessageManager::KNutMessageManager"); - m_myMess =0; + m_myMess =nullptr; m_myMessLevel = knc::infoLevel; m_xPos=0; m_yPos=0; @@ -44,7 +44,7 @@ void KNutMessageManager::deleteMessage (void) { disconnect (m_myMess,TQ_SIGNAL(messageMoved(int,int)),this,TQ_SLOT(slotMessageMoved(int,int))); m_myMess->hide(); delete m_myMess; - m_myMess = 0; + m_myMess = nullptr; } } @@ -96,7 +96,7 @@ void KNutMessageManager::slotFinishedMessage (void) { disconnect (m_myMess,TQ_SIGNAL(messageMoved(int,int)),this,TQ_SLOT(slotMessageMoved(int,int))); m_myMess->hide(); m_myMess->deleteLater(); - m_myMess=0; + m_myMess=nullptr; } } diff --git a/src/knutmessagemanager.h b/src/knutmessagemanager.h index 46fad2d..bb21347 100644 --- a/src/knutmessagemanager.h +++ b/src/knutmessagemanager.h @@ -57,7 +57,7 @@ class KNutMessageManager : public TQObject { * * @since 0.1 */ - KNutMessageManager( TQObject *parent=0, const char *name=0); + KNutMessageManager( TQObject *parent=nullptr, const char *name=nullptr); /** * Destruktor. diff --git a/src/knutnet.cpp b/src/knutnet.cpp index d2a18aa..cbd2b66 100644 --- a/src/knutnet.cpp +++ b/src/knutnet.cpp @@ -953,14 +953,14 @@ void KNutNet::upsSetType (struct upsVarDef& upsVar, const TQString name, const T upsVar.upsVarMax=0; upsVar.upsValue=value; upsVar.upsDescription=""; - upsVar.upsEnumValues=0L; + upsVar.upsEnumValues=nullptr; } void KNutNet::deleteVars (void) { TQValueVector::iterator it; for (it = m_listVars.begin(); it != m_listVars.end(); it++) { - if ((*it).upsEnumValues != 0) { + if ((*it).upsEnumValues != nullptr) { (*it).upsEnumValues->clear(); delete (*it).upsEnumValues; } @@ -1251,7 +1251,7 @@ int KNutNet::getUpsVars1 ( void) { else return m_error; // ********** ENUM / STRING ****************** - TQValueVector* enumString=0; + TQValueVector* enumString=nullptr; if (!valueType) { // nacteme enum hodnoty inBuffer="ENUM "; @@ -1386,7 +1386,7 @@ int KNutNet::getUpsVars2 ( void) { int lenString; int varMax=0; - TQValueVector* enumString=0; + TQValueVector* enumString=nullptr; inBuffer = "LIST VAR " + m_upsName.local8Bit() + "\n"; if (!(m_error=getUpsData (inBuffer,outBuffer,"END LIST VAR"))) { TQString inLine, upsNameRet, varName, varNameRet, value; @@ -1411,7 +1411,7 @@ int KNutNet::getUpsVars2 ( void) { case TYPE: if (typeValue & RW_FLAG) { upsVar.upsVarMax = 0; - upsVar.upsEnumValues=0L; + upsVar.upsEnumValues=nullptr; if (typeValue & ENUM_FLAG) { upsVar.upsValueType=false; // nacteme enumValues diff --git a/src/knutnewupsdlg.cpp b/src/knutnewupsdlg.cpp index 72a8b99..b8205ce 100644 --- a/src/knutnewupsdlg.cpp +++ b/src/knutnewupsdlg.cpp @@ -158,7 +158,7 @@ if (isExistSelectedItem(codeUpsVar)) return; //Value is moved yet KNutUpsBoxItem * availableItem; availableItem =(KNutUpsBoxItem*) m_upsValueSelector->availableListBox()->firstItem(); -while (availableItem != 0) { +while (availableItem != nullptr) { if (availableItem->getVarCode() == codeUpsVar) { break; } @@ -166,7 +166,7 @@ while (availableItem != 0) { } //remove item from left list -if (availableItem != 0) { +if (availableItem != nullptr) { TQListBox* sListBox = m_upsValueSelector->selectedListBox(); new KNutUpsBoxItem (sListBox,availableItem->text(),codeUpsVar); m_upsValueSelector->availableListBox()->removeItem(m_upsValueSelector->availableListBox()->index(availableItem)); @@ -181,7 +181,7 @@ KNutUpsBoxItem * selectedItem; selectedItem =(KNutUpsBoxItem*) m_upsValueSelector->selectedListBox()->firstItem(); -while (selectedItem != 0) { +while (selectedItem != nullptr) { if (selectedItem->getVarCode() == codeUpsVar) return true; selectedItem=(KNutUpsBoxItem*)selectedItem->next(); } @@ -227,7 +227,7 @@ KNutUpsData::upsRecordDef upsRecord; KNutUpsBoxItem * selectedItem; selectedItem =(KNutUpsBoxItem*) m_upsValueSelector->selectedListBox()->firstItem(); - while (selectedItem != 0) { + while (selectedItem != nullptr) { upsRecord.upsVarCode[j++]=selectedItem->getVarCode(); selectedItem=(KNutUpsBoxItem*)selectedItem->next(); } @@ -255,38 +255,38 @@ void KNutNewUpsDlg::slotOk() { if ((m_lineEdit1->text().length() <1 ) || (m_lineEdit2->text().length() <1 )) { - KMessageBox::sorry (0,i18n("No Name or UPS address")); + KMessageBox::sorry (nullptr,i18n("No Name or UPS address")); return; } if (addMember) { // when UpsName is existed we cannot make new record // pokud UpsName jiz existuje nemuzeme vytvorit novy zaznam - if ( m_myUpsData->findName(m_lineEdit1->text()) != 0L ) { - KMessageBox::sorry (0,i18n("This Name exist")); + if ( m_myUpsData->findName(m_lineEdit1->text()) != nullptr ) { + KMessageBox::sorry (nullptr,i18n("This Name exist")); return; } } long delay = m_lineEdit3->text().toLong(&ok); if (! ok) { - KMessageBox::sorry (0,i18n("Delay must be number")); + KMessageBox::sorry (nullptr,i18n("Delay must be number")); return; } long port = m_lineEdit4->text().toLong(&ok); if (! ok) { - KMessageBox::sorry (0,i18n("Port must be number")); + KMessageBox::sorry (nullptr,i18n("Port must be number")); return; } if ((port < knc::StartPort) || (port > knc::StopPort)) { - KMessageBox::sorry (0,i18n("Port must be from 1025 until 65535")); + KMessageBox::sorry (nullptr,i18n("Port must be from 1025 until 65535")); return; } if (delay < knc::MinDelay) { - KMessageBox::sorry (0,i18n("Delay is too small")); + KMessageBox::sorry (nullptr,i18n("Delay is too small")); return; } accept (); diff --git a/src/knutnewupsdlg.h b/src/knutnewupsdlg.h index c0a477e..3ec9efb 100644 --- a/src/knutnewupsdlg.h +++ b/src/knutnewupsdlg.h @@ -67,7 +67,7 @@ public: * * @since 0.7 **/ - KNutNewUpsDlg (KNutUpsData* const upsData, KNutVarData* const analogData, const bool add = true, TQWidget* parent = 0, const char* name = 0, const bool modal = true); + KNutNewUpsDlg (KNutUpsData* const upsData, KNutVarData* const analogData, const bool add = true, TQWidget* parent = nullptr, const char* name = nullptr, const bool modal = true); /** * @since 0.3 diff --git a/src/knutpanelmeter.cpp b/src/knutpanelmeter.cpp index 981d3e9..5f1d03f 100644 --- a/src/knutpanelmeter.cpp +++ b/src/knutpanelmeter.cpp @@ -50,7 +50,7 @@ KNutPanelMeter::KNutPanelMeter(TQPalette aPanelPalette, KNutVarData::upsInfoDef* ////NUTNO PAK UPRAVIT ACTIVATE A DEAKTIVATE ANALOGS m_analogPanels = new analogPanelRecordsDef; for (int i=0; i< knc::NumberOfVars; i++) - m_analogPanels->upsAnalogs[i]=0L; + m_analogPanels->upsAnalogs[i]=nullptr; m_widthArea =0; m_heightArea =0; @@ -60,7 +60,7 @@ KNutPanelMeter::~KNutPanelMeter(){ deActivateAnalogs(); delete m_analogPanels; - m_analogPanels=0L; + m_analogPanels=nullptr; } @@ -71,10 +71,10 @@ void KNutPanelMeter::deActivateAnalogs (void) { if (m_analogPanels) { for (int i=0; i< knc::NumberOfVars; i++) { - if (m_analogPanels->upsAnalogs[i] != 0) { + if (m_analogPanels->upsAnalogs[i] != nullptr) { delete m_analogPanels->upsAnalogs[i]; // uvolnime meraky } - m_analogPanels->upsAnalogs[i]=0L; + m_analogPanels->upsAnalogs[i]=nullptr; } } m_widthArea =0; @@ -91,7 +91,7 @@ void KNutPanelMeter::activateAnalogs (void) { // vyjmeme promene ktere ups nepodporuje //// nasledujici radka neni nutna - for (int i=0; i< knc::NumberOfVars; i++) m_analogPanels->upsAnalogs[i]=0L; + for (int i=0; i< knc::NumberOfVars; i++) m_analogPanels->upsAnalogs[i]=nullptr; for (int i=0; i< knc::NumberOfVars; i++) { // otestujeme zda dane UPS podporuje tuto promenou // pokud existuje vrati 1 @@ -128,9 +128,9 @@ void KNutPanelMeter::activateAnalogs (void) { if (m_settingData->customFont) // doesn't make background - m_analogPanels->upsAnalogs[i] = new KNutAnalog( m_analogArea,0L,analogMemberData.start,analogMemberData.end,analogMemberData.typeAnalog,analogMemberData.numberItem,analogMemberData.numberInItem,analogFingerColor,analogScaleColor,analogFontColor,&(m_settingData->aPanelFont),m_settingData->typeDigitalProcessing); + m_analogPanels->upsAnalogs[i] = new KNutAnalog( m_analogArea,nullptr,analogMemberData.start,analogMemberData.end,analogMemberData.typeAnalog,analogMemberData.numberItem,analogMemberData.numberInItem,analogFingerColor,analogScaleColor,analogFontColor,&(m_settingData->aPanelFont),m_settingData->typeDigitalProcessing); else - m_analogPanels->upsAnalogs[i] = new KNutAnalog( m_analogArea,0L,analogMemberData.start,analogMemberData.end,analogMemberData.typeAnalog,analogMemberData.numberItem,analogMemberData.numberInItem,analogFingerColor,analogScaleColor,analogFontColor,&(m_settingData->systemFont),m_settingData->typeDigitalProcessing); + m_analogPanels->upsAnalogs[i] = new KNutAnalog( m_analogArea,nullptr,analogMemberData.start,analogMemberData.end,analogMemberData.typeAnalog,analogMemberData.numberItem,analogMemberData.numberInItem,analogFingerColor,analogScaleColor,analogFontColor,&(m_settingData->systemFont),m_settingData->typeDigitalProcessing); //nastavime barvu mezikruzi @@ -194,7 +194,7 @@ void KNutPanelMeter::setSize (bool showPanels) { void KNutPanelMeter::repaintScaleAnalogPanel (int panelNumber, float value) { - if (m_analogPanels->upsAnalogs[panelNumber] != 0L){ + if (m_analogPanels->upsAnalogs[panelNumber] != nullptr){ switch (m_activeUpsInfo->record.upsVarCode[panelNumber]) { case knc::VarCurrent : // output.current if (m_analogPanels->scaleEnd[panelNumber] < MaxCurrent) { @@ -242,7 +242,7 @@ void KNutPanelMeter::repaintScaleAnalogPanel (int panelNumber, float value) { void KNutPanelMeter::repaintAnalogPointer (int panelNumber, float value, bool run) { - if (m_analogPanels->upsAnalogs[panelNumber] != 0L) + if (m_analogPanels->upsAnalogs[panelNumber] != nullptr) m_analogPanels->upsAnalogs[panelNumber]->setPointer (value,run); // nastavi hodnotu rucicky } @@ -260,10 +260,10 @@ void KNutPanelMeter::setAnalogBG(TQPalette aPanelPalette) { void KNutPanelMeter::changeAnalogPanelsDigProcessing (void) { - if (m_analogPanels == 0) return; + if (m_analogPanels == nullptr) return; for (int i=0; i< knc::NumberOfVars; i++) { - if (m_analogPanels->upsAnalogs[i] != 0L) m_analogPanels->upsAnalogs[i]->setDigitalProcesing(m_settingData->typeDigitalProcessing,true); + if (m_analogPanels->upsAnalogs[i] != nullptr) m_analogPanels->upsAnalogs[i]->setDigitalProcesing(m_settingData->typeDigitalProcessing,true); } } @@ -273,7 +273,7 @@ void KNutPanelMeter::repaintAnalogPanels (bool repaintFrequencyPanels, bool repa KNutVarData::VarStrucDef analogMemberData; - if (m_analogPanels == 0) return; + if (m_analogPanels == nullptr) return; // pregenerovani panelu slouzi pro settingMain a setting Analog for (int i=0; i< knc::NumberOfVars; i++) { @@ -326,7 +326,7 @@ KNutVarData::VarStrucDef analogMemberData; void KNutPanelMeter::zeroingPanels (void) { if (m_analogPanels) { for (int i=0; i< knc::NumberOfVars; i++) { - if ((m_analogPanels->upsAnalogs[i] != 0L) && (m_activeUpsInfo->record.upsVarCode[i] != 0)) // jistota pokud by nam to nekde propadlo + if ((m_analogPanels->upsAnalogs[i] != nullptr) && (m_activeUpsInfo->record.upsVarCode[i] != 0)) // jistota pokud by nam to nekde propadlo m_analogPanels->upsAnalogs[i]->setPointer (0); // nastavi hodnotu rucicky } } diff --git a/src/knutpanelmeter.h b/src/knutpanelmeter.h index 66bb317..4453bf5 100644 --- a/src/knutpanelmeter.h +++ b/src/knutpanelmeter.h @@ -47,7 +47,7 @@ public: * * @since 0.2 **/ - KNutPanelMeter(TQPalette aPanelPalette, KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingDataDef* settingData, KNutVarData* analogRecords, TQWidget *parent=0, const char *name=0); + KNutPanelMeter(TQPalette aPanelPalette, KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingDataDef* settingData, KNutVarData* analogRecords, TQWidget *parent=nullptr, const char *name=nullptr); /** * Destruktor diff --git a/src/knutprefdlg.h b/src/knutprefdlg.h index 4f38506..77fd941 100644 --- a/src/knutprefdlg.h +++ b/src/knutprefdlg.h @@ -115,7 +115,7 @@ enum changePref { * * @since 0.5 **/ - KNutPrefDlg(KNutUpsData* const upsData, KNutVarData* const analogData, KNutVarData::SettingDataDef* const settingData, const TQString upsName, TQWidget* parent = 0, const char* name = 0, const bool modal = true); + KNutPrefDlg(KNutUpsData* const upsData, KNutVarData* const analogData, KNutVarData::SettingDataDef* const settingData, const TQString upsName, TQWidget* parent = nullptr, const char* name = nullptr, const bool modal = true); /** * @since 0.3 diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp index 423dbe2..9b3e843 100644 --- a/src/knutprintupsvar.cpp +++ b/src/knutprintupsvar.cpp @@ -55,7 +55,7 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio if (myUpsNet->getState() != KNutNet::Connected) { KNutVarData::showError (KNutNet::NotConnection); upsConnectOk = false; - page=0; + page=nullptr; } else { upsConnectOk = true; @@ -188,19 +188,19 @@ void KNutPrintUpsVar::slotReloadVars (void) { return helpListItem; } } while (n > -1); - return 0; // for compiler only + return nullptr; // for compiler only } TDEListViewItem* KNutPrintUpsVar::existListItem (TDEListViewItem* listItem, TQString name) { TDEListViewItem* myItem; - if (!(myItem = (TDEListViewItem *)listItem->firstChild())) return 0l; + if (!(myItem = (TDEListViewItem *)listItem->firstChild())) return nullptr; while (myItem) { if (myItem->text(0) == name) return myItem; myItem = (TDEListViewItem *)myItem->nextSibling(); } - return 0l; + return nullptr; } bool KNutPrintUpsVar::upsOk (void) { return upsConnectOk; } diff --git a/src/knutprintupsvar.h b/src/knutprintupsvar.h index c8c4a5a..eb364ae 100644 --- a/src/knutprintupsvar.h +++ b/src/knutprintupsvar.h @@ -69,7 +69,7 @@ public: * * since 0.3.1 **/ - KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescription, TQWidget* parent = 0, const char* name = 0, const bool modal = true); + KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescription, TQWidget* parent = nullptr, const char* name = nullptr, const bool modal = true); /** * @since 0.1 diff --git a/src/knutrwvar.h b/src/knutrwvar.h index 029f826..f47ab6d 100644 --- a/src/knutrwvar.h +++ b/src/knutrwvar.h @@ -56,7 +56,7 @@ class KNutRWVar : public KDialogBase { * @param initUpsNet Je odkaz na instanci tridy KNutNet. * @since 0.2 **/ - KNutRWVar(TQString* userName, TQString* userPassword, const TQString uName, const TQString password, KNutNet* const initUpsNet, TQWidget* parent = 0, const char* name = 0, const bool modal = true); + KNutRWVar(TQString* userName, TQString* userPassword, const TQString uName, const TQString password, KNutNet* const initUpsNet, TQWidget* parent = nullptr, const char* name = nullptr, const bool modal = true); /** * Destructor diff --git a/src/knutupsdata.cpp b/src/knutupsdata.cpp index b5868fb..f60739a 100644 --- a/src/knutupsdata.cpp +++ b/src/knutupsdata.cpp @@ -73,6 +73,6 @@ KNutUpsData::upsRecordDef* KNutUpsData::findName (const TQString name) { return &(*it); // vratime adresu } } - return 0l; + return nullptr; } diff --git a/src/knutvardata.cpp b/src/knutvardata.cpp index 957866e..4e25688 100644 --- a/src/knutvardata.cpp +++ b/src/knutvardata.cpp @@ -238,5 +238,5 @@ const TQString KNutVarData::errorToText (const int error) { } void KNutVarData::showError (const int error) { - KMessageBox::sorry (0,errorToText(error)); + KMessageBox::sorry (nullptr,errorToText(error)); } diff --git a/src/main.cpp b/src/main.cpp index 3a2ef96..f9fc34a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,8 +34,8 @@ static const char *description = static TDECmdLineOptions options[] = { - {"nodock",I18N_NOOP("Don't dock in Kicker"),0}, - { 0, 0, 0 } + {"nodock",I18N_NOOP("Don't dock in Kicker"),nullptr}, + { nullptr, nullptr, nullptr } // INSERT YOUR COMMANDLINE OPTIONS HERE }; @@ -46,10 +46,10 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "knutclient", I18N_NOOP("KNutClient"), VERSION, description, TDEAboutData::License_GPL, - "(c) 2002 - 2009 Daniel Prynych", "Zajecov, Czech Republic", 0, "Daniel@prynych.cz"); - aboutData.addAuthor("Daniel Prynych",0, "Daniel@prynych.cz","http://www.knut.noveradsl.cz/knutclient/"); - aboutData.addCredit("Arnaud Quette",0,"arnaud.quette@free.fr","http://www.networkupstools.org/"); - aboutData.addCredit("MGE",0,0,"http://opensource.mgeups.com"); + "(c) 2002 - 2009 Daniel Prynych", "Zajecov, Czech Republic", nullptr, "Daniel@prynych.cz"); + aboutData.addAuthor("Daniel Prynych",nullptr, "Daniel@prynych.cz","http://www.knut.noveradsl.cz/knutclient/"); + aboutData.addCredit("Arnaud Quette",nullptr,"arnaud.quette@free.fr","http://www.networkupstools.org/"); + aboutData.addCredit("MGE",nullptr,nullptr,"http://opensource.mgeups.com"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. -- cgit v1.2.3