From 92678af90da20844247a9698990732f3c9b9b8c9 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 8 Nov 2026 08:04:33 -0300 Subject: Replace NULL pointer constants in feeds and mobile components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- akregator/src/librss/document.cpp | 2 +- akregator/src/librss/image.cpp | 6 +++--- akregator/src/librss/loader.cpp | 26 +++++++++++++------------- akregator/src/notificationmanager.cpp | 6 +++--- akregator/src/tabwidget.cpp | 4 ++-- kmobile/devices/gnokii/gnokii_mobile.cpp | 14 +++++++------- kontact/plugins/knotes/knotes_part.cpp | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp index 7d94a252a..07ea2b0e8 100644 --- a/akregator/src/librss/document.cpp +++ b/akregator/src/librss/document.cpp @@ -28,7 +28,7 @@ using namespace RSS; struct Document::Private : public Shared { - Private() : version(v0_90), image(NULL), textInput(NULL), language(en) + Private() : version(v0_90), image(nullptr), textInput(nullptr), language(en) { format=UnknownFormat; valid=false; diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 65aaf5392..149534e18 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -22,7 +22,7 @@ using namespace RSS; struct Image::Private : public Shared { - Private() : height(31), width(88), pixmapBuffer(NULL), job(NULL) + Private() : height(31), width(88), pixmapBuffer(nullptr), job(nullptr) { } TQString title; @@ -130,7 +130,7 @@ void Image::slotResult(TDEIO::Job *job) emit gotPixmap(pixmap); delete d->pixmapBuffer; - d->pixmapBuffer = NULL; + d->pixmapBuffer = nullptr; } void Image::abort() @@ -138,7 +138,7 @@ void Image::abort() if (d->job) { d->job->kill(true); - d->job = NULL; + d->job = nullptr; } } diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 8674dfb79..d6ed25db7 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -40,8 +40,8 @@ class FileRetriever::Private public: Private() - : buffer(NULL), - lastError(0), job(NULL) + : buffer(nullptr), + lastError(0), job(nullptr) { } @@ -125,7 +125,7 @@ void FileRetriever::slotTimeout() abort(); delete d->buffer; - d->buffer = NULL; + d->buffer = nullptr; d->lastError = TDEIO::ERR_SERVER_TIMEOUT; @@ -148,7 +148,7 @@ void FileRetriever::slotResult(TDEIO::Job *job) data.detach(); delete d->buffer; - d->buffer = NULL; + d->buffer = nullptr; d->lastError = job->error(); emit dataRetrieved(data, d->lastError == 0); @@ -164,14 +164,14 @@ void FileRetriever::abort() if (d->job) { d->job->kill(true); - d->job = NULL; + d->job = nullptr; } } struct OutputRetriever::Private { - Private() : process(NULL), - buffer(NULL), + Private() : process(nullptr), + buffer(nullptr), lastError(0) { } @@ -234,17 +234,17 @@ void OutputRetriever::slotExited(TDEProcess *p) data.detach(); delete d->buffer; - d->buffer = NULL; + d->buffer = nullptr; delete d->process; - d->process = NULL; + d->process = nullptr; emit dataRetrieved(data, p->normalExit() && p->exitStatus() == 0); } struct Loader::Private { - Private() : retriever(NULL), + Private() : retriever(nullptr), lastError(0) { } @@ -284,7 +284,7 @@ Loader::~Loader() void Loader::loadFrom(const KURL &url, DataRetriever *retriever) { - if (d->retriever != NULL) + if (d->retriever) return; d->url=url; @@ -307,7 +307,7 @@ void Loader::abort() { d->retriever->abort(); delete d->retriever; - d->retriever=NULL; + d->retriever=nullptr; } emit loadingComplete(this, TQDomDocument(), Aborted); delete this; @@ -323,7 +323,7 @@ void Loader::slotRetrieverDone(const TQByteArray &data, bool success) d->lastError = d->retriever->errorCode(); delete d->retriever; - d->retriever = NULL; + d->retriever = nullptr; Document rssDoc; Status status = Success; diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 23a3a3a81..6faf7b85a 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -43,8 +43,8 @@ NotificationManager::NotificationManager() : TQObject() m_running = false; m_addedInLastInterval = false; m_maxArticles = 20; - m_widget = NULL; - m_instance = NULL; + m_widget = nullptr; + m_instance = nullptr; } NotificationManager::~NotificationManager() @@ -55,7 +55,7 @@ NotificationManager::~NotificationManager() void NotificationManager::setWidget(TQWidget* widget, TDEInstance* inst) { m_widget = widget; - m_instance = inst != NULL ? inst : TDEGlobal::instance(); + m_instance = inst ? inst : TDEGlobal::instance(); } void NotificationManager::slotNotifyArticle(const Article& article) diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index f1f1bb895..3af5fd808 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -298,7 +298,7 @@ void TabWidget::slotCloseTab() d->currentItem = currentPage(); if (indexOf(d->currentItem) == 0) return; - if (d->frames.find(d->currentItem) != NULL) + if (d->frames.find(d->currentItem)) removeFrame(d->frames.find(d->currentItem)); delete d->currentItem; d->currentItem = 0; @@ -323,7 +323,7 @@ void TabWidget::initiateDrag(int tab) void TabWidget::slotCloseRequest(TQWidget* widget) { - if (d->frames.find(widget) != NULL) + if (d->frames.find(widget)) removeFrame(d->frames.find(widget)); } } // namespace Akregator diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 68b085c14..1d4f0da72 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -64,7 +64,7 @@ TQObject *KMobileGnokii::createObject( TQObject *parent, const char *name, static char *BinDir; -static char *lockfile = NULL; +static char *lockfile = nullptr; static char model[GN_MODEL_MAX_LENGTH+1], revision[GN_REVISION_MAX_LENGTH+1], imei[GN_IMEI_MAX_LENGTH+1]; static TQString PhoneProductId; @@ -205,7 +205,7 @@ bool KMobileGnokii::loadDeviceConfiguration() static void busterminate(void) { - gn_sm_functions(GN_OP_Terminate, NULL, &state); + gn_sm_functions(GN_OP_Terminate, nullptr, &state); if (lockfile) gn_device_unlock(lockfile); } @@ -223,7 +223,7 @@ static TQString businit(void) // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { lockfile = gn_device_lock(state.config.port_device); - if (lockfile == NULL) { + if (!lockfile) { return i18n("Lock file error.\n " "Please exit all other running instances of gnokii and try again."); } @@ -248,21 +248,21 @@ static TQString businit(void) GNOKII_CHECK_ERROR(error); if (model[0] == 0) strcpy(model, i18n("unknown").utf8()); - data.model = NULL; + data.model = nullptr; // revision data.revision = revision; revision[0] = 0; error = gn_sm_functions(GN_OP_GetRevision, &data, &state); GNOKII_CHECK_ERROR(error); - data.revision = NULL; + data.revision = nullptr; // imei data.imei = imei; imei[0] = 0; error = gn_sm_functions(GN_OP_GetImei, &data, &state); GNOKII_CHECK_ERROR(error); - data.imei = NULL; + data.imei = nullptr; GNOKII_DEBUG( TQString("Found mobile phone: Model: %1, Revision: %2, IMEI: %3\n") .arg(model).arg(revision).arg(imei) ); @@ -558,7 +558,7 @@ TQString KMobileGnokii::deviceUniqueID() int KMobileGnokii::numAddresses() { - if (!connectDevice(NULL)) + if (!connectDevice(nullptr)) return 0; gn_memory_status memstat; diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 7ec3df6c7..385a6f897 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -321,7 +321,7 @@ void KNotesPart::killSelectedNotes() void KNotesPart::popupRMB( TQIconViewItem *item, const TQPoint& pos ) { - TQPopupMenu *contextMenu = NULL; + TQPopupMenu *contextMenu = nullptr; if ( item ) contextMenu = static_cast( factory()->container( "note_context", this ) ); -- cgit v1.2.3