From 4ccf391d1640a72dfb24d88c83127977b745a703 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:05:41 -0300 Subject: Replace NULL pointer constants in resource backends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- tderesources/caldav/config.cpp | 8 ++--- tderesources/caldav/preferences.cpp | 16 +++++----- tderesources/caldav/preferences.h | 2 +- tderesources/caldav/resource.cpp | 38 +++++++++++------------ tderesources/carddav/config.cpp | 8 ++--- tderesources/carddav/preferences.cpp | 16 +++++----- tderesources/carddav/preferences.h | 2 +- tderesources/carddav/resource.cpp | 58 ++++++++++++++++++------------------ tderesources/lib/webdavhandler.cpp | 2 +- 9 files changed, 75 insertions(+), 75 deletions(-) diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 1de9c988c..4307e8129 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -54,7 +54,7 @@ ResourceCalDav* ResourceCalDavConfig::getCalDavResource(KRES::Resource* resource } CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) { - CalDavPrefs* p = NULL; + CalDavPrefs* p = nullptr; if (res) { p = res->prefs(); @@ -83,7 +83,7 @@ ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent ) void ResourceCalDavConfig::loadSettings( KRES::Resource *resource ) { ResourceCalDav* res = getCalDavResource(resource); CalDavPrefs* p = getPrefs(res); - if (NULL != p) { + if (p) { mUrl->setText(p->url()); mUsername->setText(p->username()); mRememberPassword->setChecked(p->rememberPassword()); @@ -100,12 +100,12 @@ void ResourceCalDavConfig::loadSettings( KRES::Resource *resource ) { void ResourceCalDavConfig::saveSettings( KRES::Resource *resource ) { ResourceCalDav* res = getCalDavResource(resource); - if (NULL != res) { + if (res) { mReloadConfig->saveSettings(res); mSaveConfig->saveSettings(res); CalDavPrefs* p = getPrefs(res); - if (NULL != p) { + if (p) { p->setUrl(mUrl->text()); p->setUsername(mUsername->text()); p->setRememberPassword(mRememberPassword->isChecked()); diff --git a/tderesources/caldav/preferences.cpp b/tderesources/caldav/preferences.cpp index e1894162a..06752bcfa 100644 --- a/tderesources/caldav/preferences.cpp +++ b/tderesources/caldav/preferences.cpp @@ -43,7 +43,7 @@ const TQString CalDavPrefs::WALLET_PWD_SUFFIX = ":caldav_password"; bool CalDavPrefs::setWalletFolder(const TQString& folder) { bool ret = true; - if (!mNoWallet && NULL != mWallet) { + if (!mNoWallet && mWallet) { if (!mWallet->hasFolder(folder)) { if (!mWallet->createFolder(folder)) { ret = false; @@ -63,16 +63,16 @@ bool CalDavPrefs::setWalletFolder(const TQString& folder) { } Wallet* CalDavPrefs::getWallet() { - Wallet* ret = NULL; + Wallet* ret = nullptr; if (!mNoWallet) { // the wallet is not marked as inaccessible - if (NULL == mWallet) { + if (!mWallet) { kdDebug() << "creating wallet for " << mPrefix << endl; mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0); - if (NULL == mWallet) { + if (!mWallet) { mNoWallet = true; // can't open the wallet, mark it inaccessible kdWarning() << "can't create a wallet for CalDAV passwords" << endl; } else { @@ -94,7 +94,7 @@ Wallet* CalDavPrefs::getWallet() { void CalDavPrefs::removeWallet(bool noWallet) { delete mWallet; - mWallet = NULL; + mWallet = nullptr; mNoWallet = noWallet; } @@ -112,7 +112,7 @@ bool CalDavPrefs::writePasswordToWallet(const TQString& password) { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password); if (0 != rc) { kdWarning() << "CalDAV: can't write password to the wallet" << endl; @@ -128,7 +128,7 @@ bool CalDavPrefs::readPasswordFromWallet(TQString& password) { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { TQString p; int rc = w->readPassword(mPrefix + WALLET_PWD_SUFFIX, p); if (0 == rc) { @@ -149,7 +149,7 @@ bool CalDavPrefs::removePasswordFromWallet() { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { int rc = w->removeEntry(mPrefix + WALLET_PWD_SUFFIX); if (0 == rc) { ret = true; diff --git a/tderesources/caldav/preferences.h b/tderesources/caldav/preferences.h index 888c640bd..464437b31 100644 --- a/tderesources/caldav/preferences.h +++ b/tderesources/caldav/preferences.h @@ -45,7 +45,7 @@ public: * @param prefix Unique prefix of the resource instance (use identifier() method). */ CalDavPrefs(const TQString& prefix) - : mWallet(NULL) + : mWallet(nullptr) , mNoWallet(false) , mPrefix(prefix) , mPassword(NO_PASSWORD) diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 41e76f797..f1d7c1291 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -73,13 +73,13 @@ ResourceCalDav::ResourceCalDav( const TDEConfig *config ) : , readLockout(false) , mAllWritesComplete(false) , mLock(true) - , mPrefs(NULL) - , mLoader(NULL) - , mWriter(NULL) - , mProgress(NULL) + , mPrefs(nullptr) + , mLoader(nullptr) + , mWriter(nullptr) + , mProgress(nullptr) , mLoadingQueueReady(true) , mWritingQueueReady(true) - , mWriteRetryTimer(NULL) + , mWriteRetryTimer(nullptr) { log("ResourceCalDav(config)"); init(); @@ -92,7 +92,7 @@ ResourceCalDav::ResourceCalDav( const TDEConfig *config ) : ResourceCalDav::~ResourceCalDav() { log("jobs termination"); - if (mWriteRetryTimer != NULL) { + if (mWriteRetryTimer) { mWriteRetryTimer->stop(); // Unfortunately we cannot do anything at this point; if this timer is still running something is seriously wrong } @@ -134,7 +134,7 @@ ResourceCalDav::~ResourceCalDav() { bool ResourceCalDav::isSaving() { doSave(); - return (((mWriteRetryTimer != NULL) ? 1 : 0) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady || readLockout); + return (mWriteRetryTimer || mWriter->running() || !mWritingQueue.isEmpty() || !mWritingQueueReady || readLockout); } /*========================================================================= @@ -195,11 +195,11 @@ bool ResourceCalDav::doSave() { // FIXME: Calling clearChanges() here is not the ideal way since the // upload might fail, but there is no other place to call it... clearChanges(); - if (mWriteRetryTimer != NULL) { + if (mWriteRetryTimer) { if (mWriteRetryTimer->isActive() == false) { disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; - mWriteRetryTimer = NULL; + mWriteRetryTimer = nullptr; } } return true; @@ -292,14 +292,14 @@ void ResourceCalDav::updateProgressBar(int direction) { } if (current_queued_events == 0) { - if ( mProgress != NULL) { + if (mProgress) { mProgress->setComplete(); - mProgress = NULL; + mProgress = nullptr; original_queued_events = 0; } } else { - if (mProgress == NULL) { + if (!mProgress) { if (direction == 0) mProgress = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") ); if (direction == 1) mProgress = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), i18n("Uploading Calendar") ); } @@ -375,9 +375,9 @@ void ResourceCalDav::loadFinished() { if (loader->error()) { if (loader->errorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { TQString newpass; - if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { + if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), nullptr) != 1) { log("load error: " + loader->errorString() ); loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } @@ -423,7 +423,7 @@ void ResourceCalDav::loadFinished() { if (loader->tasksError()) { if (loader->tasksErrorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { // TQString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->tasksErrorString() ); @@ -471,7 +471,7 @@ void ResourceCalDav::loadFinished() { if (loader->journalsError()) { if (loader->journalsErrorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { // TQString newpass; // if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { // log("load error: " + loader->journalsErrorString() ); @@ -848,7 +848,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl, // modifies the calendar with clearChanges() or similar // Before these calls are made any existing read (and maybe write) threads should be finished if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { - if (mWriteRetryTimer == NULL) { + if (!mWriteRetryTimer) { mWriteRetryTimer = new TQTimer(this); connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } @@ -968,9 +968,9 @@ void ResourceCalDav::writingFinished() { if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) { if (mWriter->errorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { TQString newpass; - if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { + if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), nullptr) != 1) { log("write error: " + mWriter->errorString()); saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index 663d19d40..130f12e9d 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -53,7 +53,7 @@ ResourceCardDav* ResourceCardDavConfig::getCardDavResource(KRES::Resource* resou } CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) { - CardDavPrefs* p = NULL; + CardDavPrefs* p = nullptr; if (res) { p = res->prefs(); @@ -82,7 +82,7 @@ ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *parent ) void ResourceCardDavConfig::loadSettings( KRES::Resource *resource ) { ResourceCardDav* res = getCardDavResource(resource); CardDavPrefs* p = getPrefs(res); - if (NULL != p) { + if (p) { mUrl->setText(p->url()); mUsername->setText(p->username()); mRememberPassword->setChecked(p->rememberPassword()); @@ -96,12 +96,12 @@ void ResourceCardDavConfig::loadSettings( KRES::Resource *resource ) { void ResourceCardDavConfig::saveSettings( KRES::Resource *resource ) { ResourceCardDav* res = getCardDavResource(resource); - if (NULL != res) { + if (res) { mReloadConfig->saveSettings(res); mSaveConfig->saveSettings(res); CardDavPrefs* p = getPrefs(res); - if (NULL != p) { + if (p) { p->setUrl(mUrl->text()); p->setUsername(mUsername->text()); p->setRememberPassword(mRememberPassword->isChecked()); diff --git a/tderesources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp index 2bde1ff44..e03cdcceb 100644 --- a/tderesources/carddav/preferences.cpp +++ b/tderesources/carddav/preferences.cpp @@ -42,7 +42,7 @@ const TQString CardDavPrefs::WALLET_PWD_SUFFIX = ":carddav_password"; bool CardDavPrefs::setWalletFolder(const TQString& folder) { bool ret = true; - if (!mNoWallet && NULL != mWallet) { + if (!mNoWallet && mWallet) { if (!mWallet->hasFolder(folder)) { if (!mWallet->createFolder(folder)) { ret = false; @@ -62,16 +62,16 @@ bool CardDavPrefs::setWalletFolder(const TQString& folder) { } Wallet* CardDavPrefs::getWallet() { - Wallet* ret = NULL; + Wallet* ret = nullptr; if (!mNoWallet) { // the wallet is not marked as inaccessible - if (NULL == mWallet) { + if (!mWallet) { kdDebug() << "creating wallet for " << mPrefix << endl; mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0); - if (NULL == mWallet) { + if (!mWallet) { mNoWallet = true; // can't open the wallet, mark it inaccessible kdWarning() << "can't create a wallet for CardDAV passwords" << endl; } else { @@ -93,7 +93,7 @@ Wallet* CardDavPrefs::getWallet() { void CardDavPrefs::removeWallet(bool noWallet) { delete mWallet; - mWallet = NULL; + mWallet = nullptr; mNoWallet = noWallet; } @@ -111,7 +111,7 @@ bool CardDavPrefs::writePasswordToWallet(const TQString& password) { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password); if (0 != rc) { kdWarning() << "CardDAV: can't write password to the wallet" << endl; @@ -127,7 +127,7 @@ bool CardDavPrefs::readPasswordFromWallet(TQString& password) { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { TQString p; int rc = w->readPassword(mPrefix + WALLET_PWD_SUFFIX, p); if (0 == rc) { @@ -148,7 +148,7 @@ bool CardDavPrefs::removePasswordFromWallet() { Wallet* w = getWallet(); bool ret = false; - if (NULL != w) { + if (w) { int rc = w->removeEntry(mPrefix + WALLET_PWD_SUFFIX); if (0 == rc) { ret = true; diff --git a/tderesources/carddav/preferences.h b/tderesources/carddav/preferences.h index 1d205d031..d1f467b22 100644 --- a/tderesources/carddav/preferences.h +++ b/tderesources/carddav/preferences.h @@ -44,7 +44,7 @@ public: * @param prefix Unique prefix of the resource instance (use identifier() method). */ CardDavPrefs(const TQString& prefix) - : mWallet(NULL) + : mWallet(nullptr) , mNoWallet(false) , mPrefix(prefix) , mPassword(NO_PASSWORD) diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index 840d96be8..596120a41 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -73,13 +73,13 @@ ResourceCardDav::ResourceCardDav( const TDEConfig *config ) : , readLockout(false) , mAllWritesComplete(false) , mLock(true) - , mPrefs(NULL) - , mLoader(NULL) - , mWriter(NULL) - , mProgress(NULL) + , mPrefs(nullptr) + , mLoader(nullptr) + , mWriter(nullptr) + , mProgress(nullptr) , mLoadingQueueReady(true) , mWritingQueueReady(true) - , mWriteRetryTimer(NULL) + , mWriteRetryTimer(nullptr) { log("ResourceCardDav(config)"); init(); @@ -92,7 +92,7 @@ ResourceCardDav::ResourceCardDav( const TDEConfig *config ) : ResourceCardDav::~ResourceCardDav() { log("jobs termination"); - if (mWriteRetryTimer != NULL) { + if (mWriteRetryTimer) { mWriteRetryTimer->stop(); // Unfortunately we cannot do anything at this point; if this timer is still running something is seriously wrong } @@ -131,7 +131,7 @@ ResourceCardDav::~ResourceCardDav() { bool ResourceCardDav::isSaving() { doSave(); - return (((mWriteRetryTimer != NULL) ? 1 : 0) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady || readLockout); + return (mWriteRetryTimer || mWriter->running() || !mWritingQueue.isEmpty() || !mWritingQueueReady || readLockout); } /*========================================================================= @@ -155,7 +155,7 @@ bool ResourceCardDav::load() { loadCache(); //enableChangeNotification(); clearChanges(); - if (addressBook() != NULL) { + if (addressBook()) { addressBook()->emitAddressBookChanged(); } emit loadingFinished( this ); @@ -195,11 +195,11 @@ bool ResourceCardDav::doSave() { // FIXME: Calling clearChanges() here is not the ideal way since the // upload might fail, but there is no other place to call it... clearChanges(); - if (mWriteRetryTimer != NULL) { + if (mWriteRetryTimer) { if (mWriteRetryTimer->isActive() == false) { disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; - mWriteRetryTimer = NULL; + mWriteRetryTimer = nullptr; } } return true; @@ -271,7 +271,7 @@ void ResourceCardDav::ensureReadOnlyFlagHonored() { //enableChangeNotification(); - if (addressBook() != NULL) { + if (addressBook()) { addressBook()->emitAddressBookChanged(); } } @@ -295,14 +295,14 @@ void ResourceCardDav::updateProgressBar(int direction) { } if (current_queued_events == 0) { - if ( mProgress != NULL) { + if (mProgress) { mProgress->setComplete(); - mProgress = NULL; + mProgress = nullptr; original_queued_events = 0; } } else { - if (mProgress == NULL) { + if (!mProgress) { if (direction == 0) mProgress = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), i18n("Downloading Contacts") ); if (direction == 1) mProgress = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), i18n("Uploading Contacts") ); } @@ -371,11 +371,11 @@ void ResourceCardDav::loadFinished() { if (loader->error()) { if (loader->errorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { TQString newpass; - if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { + if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), nullptr) != 1) { log("load error: " + loader->errorString() ); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } else { // Set new password and try again @@ -385,12 +385,12 @@ void ResourceCardDav::loadFinished() { } else { log("load error: " + loader->errorString() ); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("load error: " + loader->errorString() ); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString()); } } else { log("successful load"); @@ -406,7 +406,7 @@ void ResourceCardDav::loadFinished() { log("clearing changes"); //enableChangeNotification(); clearChanges(); - if (addressBook() != NULL) addressBook()->emitAddressBookChanged(); + if (addressBook()) addressBook()->emitAddressBookChanged(); emit loadingFinished( this ); } } @@ -443,7 +443,7 @@ bool ResourceCardDav::parseData(const TQString& data) { // check if the data is OK // May be it's not efficient (parsing is done twice), but it should be safe if (!checkData(data)) { - if (addressBook() != NULL) addressBook()->error(i18n("Parsing calendar data failed.")); + if (addressBook()) addressBook()->error(i18n("Parsing calendar data failed.")); return false; } @@ -479,7 +479,7 @@ bool ResourceCardDav::parseData(const TQString& data) { sout << data << "\n"; fout.close(); } else { - if (addressBook() != NULL) addressBook()->error(i18n("can't open file")); + if (addressBook()) addressBook()->error(i18n("can't open file")); } #endif // KCARDDAV_DEBUG // end of debug code ---------------------------------------------------- @@ -563,7 +563,7 @@ void ResourceCardDav::writingQueuePop() { sout << "================== Deleted:\n" << t->deleted << "\n"; fout.close(); } else { - if (addressBook() != NULL) addressBook()->error(i18n("can't open file")); + if (addressBook()) addressBook()->error(i18n("can't open file")); } #endif // debug @@ -607,7 +607,7 @@ bool ResourceCardDav::startWriting(const TQString& url) { // modifies the calendar with clearChanges() or similar // Before these calls are made any existing read (and maybe write) threads should be finished if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { - if (mWriteRetryTimer == NULL) { + if (!mWriteRetryTimer) { mWriteRetryTimer = new TQTimer(this); connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } @@ -640,11 +640,11 @@ void ResourceCardDav::writingFinished() { if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) { if (mWriter->errorNumber() == -401) { - if (NULL != mPrefs) { + if (mPrefs) { TQString newpass; - if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) { + if (KPasswordDialog::getPassword (newpass, TQString("") + i18n("Remote authorization required") + TQString("

") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), nullptr) != 1) { log("write error: " + mWriter->errorString()); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } else { // Set new password and try again @@ -654,12 +654,12 @@ void ResourceCardDav::writingFinished() { } else { log("write error: " + mWriter->errorString()); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("write error: " + mWriter->errorString()); - if (addressBook() != NULL) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); + if (addressBook()) addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString()); } } else { log("success"); diff --git a/tderesources/lib/webdavhandler.cpp b/tderesources/lib/webdavhandler.cpp index d3255c364..75ef8c5bf 100644 --- a/tderesources/lib/webdavhandler.cpp +++ b/tderesources/lib/webdavhandler.cpp @@ -186,7 +186,7 @@ TQDateTime WebdavHandler::zoneAsUtc( const TQDateTime& zone, const TQString& tim TQDateTime epoch; epoch.setTime_t( 0 ); time_t v = epoch.secsTo( zone ); - struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, NULL ); + struct icaltimetype tt = icaltime_from_timet_with_zone( v, 0, nullptr ); int offset = icaltimezone_get_utc_offset( icaltimezone_get_builtin_timezone( timeZoneId.latin1() ), &tt, &daylight ); -- cgit v1.2.3