From e18dce5b54ddcf44fedf40094e7b691281b8e107 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:05:37 -0300 Subject: Replace NULL pointer constants in KMail components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- kmail/cachedimapjob.cpp | 2 +- kmail/filterlog.cpp | 2 +- kmail/imapaccountbase.cpp | 2 +- kmail/kmfoldercachedimap.cpp | 2 +- kmail/kmheaders.cpp | 8 ++++---- kmail/kmkernel.cpp | 18 +++++++++--------- kmail/kmmainwidget.cpp | 6 +++--- kmail/popaccount.cpp | 2 +- kmail/snippetitem.cpp | 4 ++-- kmail/snippetsettings.cpp | 2 +- kmail/snippetwidget.cpp | 14 +++++++------- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index 89dd11167..e2be083b9 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -518,7 +518,7 @@ void CachedImapJob::slotPutMessageResult(TDEIO::Job *job) kmkernel->iCalIface().setResourceQuiet( b ); } } - mMsg = NULL; + mMsg = nullptr; mAccount->removeJob( it ); slotPutNextMessage(); } diff --git a/kmail/filterlog.cpp b/kmail/filterlog.cpp index b5e1d3913..a9fc91550 100644 --- a/kmail/filterlog.cpp +++ b/kmail/filterlog.cpp @@ -40,7 +40,7 @@ using namespace KMail; -FilterLog * FilterLog::mSelf = NULL; +FilterLog * FilterLog::mSelf = nullptr; FilterLog::FilterLog() diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 231b88fdb..e256037da 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -378,7 +378,7 @@ namespace KMail { return;// ## doesn't handle Connecting TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false); TDEIO::Scheduler::assignJobToSlave(mSlave, job); - jobData jd( url.url(), NULL ); + jobData jd( url.url(), nullptr ); // a bit of a hack to save one slot if (subscribe) jd.onlySubscribed = true; else jd.onlySubscribed = false; diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index ecceb4630..740abf94b 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -189,7 +189,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName ) mIncidencesFor( IncForAdmins ), mSharedSeenFlags( false ), mIsSelected( false ), - mCheckFlags( true ), mReadOnly( false ), mAccount( NULL ), uidMapDirty( true ), + mCheckFlags( true ), mReadOnly( false ), mAccount( nullptr ), uidMapDirty( true ), uidWriteTimer( -1 ), mLastUid( 0 ), mTentativeHighestUid( 0 ), mFoundAnIMAPDigest( false ), mUserRights( 0 ), mOldUserRights( 0 ), mUserRightsState( KMail::ACLJobs::NotFetchedYet ), diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 06de88fbc..d127e32b0 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -929,7 +929,7 @@ void KMHeaders::msgAdded(int id) // cosmetic, as getting this wrong leads to circular threading. if (msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToIdMD5() || msgId == mFolder->getMsgBase(parent->item()->msgId())->replyToAuxIdMD5()) - parent = NULL; + parent = nullptr; } } @@ -2775,7 +2775,7 @@ bool KMHeaders::writeSortOrder() // I see this crash too. after rebuilding a broken index on a dimap folder. always TQString replymd5 = kmb->replyToIdMD5(); TQString replyToAuxId = kmb->replyToAuxIdMD5(); - SortCacheItem *p = NULL; + SortCacheItem *p = nullptr; if(!replymd5.isEmpty()) p = mSortCacheItems[replymd5]; @@ -2995,7 +2995,7 @@ void KMHeaders::buildSubjectThreadingTree( TQMemArray sortCache SortCacheItem* KMHeaders::findParent(SortCacheItem *item) { - SortCacheItem *parent = NULL; + SortCacheItem *parent = nullptr; if (!item) return parent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); TQString replyToIdMD5 = msg->replyToIdMD5(); @@ -3023,7 +3023,7 @@ SortCacheItem* KMHeaders::findParent(SortCacheItem *item) SortCacheItem* KMHeaders::findParentBySubject(SortCacheItem *item) { - SortCacheItem *parent = NULL; + SortCacheItem *parent = nullptr; if (!item) return parent; KMMsgBase *msg = mFolder->getMsgBase(item->id()); diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index cf0c581e1..2e7f6b062 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -421,7 +421,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, msg->setBody( TQString(TQString::fromLocal8Bit( str )).utf8() ); } else { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, NULL ); + parser.process( nullptr, nullptr ); } } else if (!body.isEmpty()) @@ -431,7 +431,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, else { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, NULL ); + parser.process( nullptr, nullptr ); } if (!customHeaders.isEmpty()) @@ -536,7 +536,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, msg->setBody(body.utf8()); } else { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, NULL ); + parser.process( nullptr, nullptr ); } bool iCalAutoSend = false; @@ -643,7 +643,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc, msg->setBody(body.utf8()); } else { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, NULL ); + parser.process( nullptr, nullptr ); } KMail::Composer * cWin = KMail::makeComposer( msg ); @@ -670,7 +670,7 @@ DCOPRef KMKernel::newMessage(const TQString &to, { KMail::Composer * win = 0; KMMessage *msg = new KMMessage; - KMFolder *folder = NULL; + KMFolder *folder = nullptr; uint id; if ( useFolderId ) { @@ -689,11 +689,11 @@ DCOPRef KMKernel::newMessage(const TQString &to, if ( useFolderId ) { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, folder ); + parser.process( nullptr, folder ); win = makeComposer( msg, id ); } else { TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, folder ); + parser.process( nullptr, folder ); win = makeComposer( msg ); } @@ -856,7 +856,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, if (readFolderMsgIds) { if ( foldername.contains("/")) { TQString tmp_fname = ""; - KMFolder *folder = NULL; + KMFolder *folder = nullptr; KMFolderDir *subfolder; bool root = true; @@ -1034,7 +1034,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, if (createNewFolder) { if ( foldername.contains("/")) { TQString tmp_fname = ""; - KMFolder *folder = NULL; + KMFolder *folder = nullptr; KMFolderDir *subfolder; bool root = true; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 33d6685a3..8e354c7f7 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -655,7 +655,7 @@ void KMMainWidget::createWidgets(void) accel->connectItem(accel->insertItem(Key_Next), mMsgView, TQ_SLOT(slotScrollNext())); } else { - mMsgView = NULL; + mMsgView = nullptr; } TDEAction *action; @@ -994,12 +994,12 @@ void KMMainWidget::slotCompose() if ( mFolder ) { msg->initHeader( mFolder->identity() ); TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, mFolder ); + parser.process( nullptr, mFolder ); win = KMail::makeComposer( msg, mFolder->identity() ); } else { msg->initHeader(); TemplateParser parser( msg, TemplateParser::NewMessage ); - parser.process( NULL, NULL ); + parser.process( nullptr, nullptr ); win = KMail::makeComposer( msg ); } diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index e485e4468..d03347124 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -982,7 +982,7 @@ void PopAccount::slotData( TDEIO::Job* job, const TQByteArray &data) TQString datestring, serialstring; serialstring.setNum ( ++dataCounter, 10 ); - datestring.setNum ( time(NULL),10 ); + datestring.setNum ( time(nullptr),10 ); uid = TQString( "uidlgen" ) + datestring + TQString( "." ) + serialstring; kdDebug(5006) << "PopAccount::slotData message " << id.ascii() << "%d has bad UIDL, cannot keep a copy on server" << endl; diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index 3e10cd90e..134b8b2e5 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -109,7 +109,7 @@ SnippetItem * SnippetItem::findItemByName(TQString name, TQPtrList if (item->getName() == name) return item; } - return NULL; + return nullptr; } SnippetGroup * SnippetItem::findGroupById(int id, TQPtrList &list) @@ -119,7 +119,7 @@ SnippetGroup * SnippetItem::findGroupById(int id, TQPtrList &list) if (group && group->getId() == id) return group; } - return NULL; + return nullptr; } diff --git a/kmail/snippetsettings.cpp b/kmail/snippetsettings.cpp index 749943887..c30168e6d 100644 --- a/kmail/snippetsettings.cpp +++ b/kmail/snippetsettings.cpp @@ -23,7 +23,7 @@ SnippetSettings::SnippetSettings(TQWidget *parent, const char *name) : SnippetSettingsBase(parent, name) { - _widget = NULL; + _widget = nullptr; } SnippetSettings::SnippetSettings(SnippetWidget * w, TQWidget *parent, const char *name) diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 9612b9462..6bb924315 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -417,7 +417,7 @@ void SnippetWidget::writeConfig() */ void SnippetWidget::initConfig() { - if (_cfg == NULL) + if (!_cfg) _cfg = new TDEConfig("kmailsnippetrc", false, false); _cfg->setGroup("SnippetPart"); @@ -665,9 +665,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap * map, TQMapsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, @@ -793,9 +793,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMapaddWidget(labTop, 0, 0); -- cgit v1.2.3