From 288ec3460af2ac260e23721a2c728e137b621f71 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 4 Oct 2026 06:47:28 -0300 Subject: Replace NULL 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/app/mainwindow.cpp | 8 ++++---- src/gvcore/documentloadingimpl.cpp | 2 +- src/gvcore/fileviewcontroller.cpp | 12 ++++++------ src/gvcore/slideshow.cpp | 10 +++++----- src/gvcore/threadgate.cpp | 2 +- src/gvcore/thumbnailloadjob.cpp | 12 ++++++------ src/gvcore/xcursor.cpp | 2 +- src/gvimagepart/gvimagepart.cpp | 6 +++--- src/imageutils/scale.cpp | 16 ++++++++-------- src/tsthread/tsthread.cpp | 22 +++++++++++----------- src/tsthread/tsthread.h | 6 +++--- src/tsthread/tswaitcondition.cpp | 2 +- 12 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index f2e3927..5ae19e4 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -884,14 +884,14 @@ void MainWindow::createWidgets() { mSBHintLabel, TQ_SLOT(clear()) ); // Pixmap widget - mImageDock = mDockArea->createDockWidget("Image",SmallIcon("gwenview"),NULL,i18n("Image")); + mImageDock = mDockArea->createDockWidget("Image",SmallIcon("gwenview"),nullptr,i18n("Image")); mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection()); mImageDock->setWidget(mImageViewController->widget()); connect(mImageViewController, TQ_SIGNAL(requestHintDisplay(const TQString&)), this, TQ_SLOT(showHint(const TQString&)) ); // Folder widget - mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),NULL,i18n("Folders")); + mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),nullptr,i18n("Folders")); VTabWidget* vtabWidget=new VTabWidget(mFolderDock); mFolderDock->setWidget(vtabWidget); @@ -902,14 +902,14 @@ void MainWindow::createWidgets() { vtabWidget->addTab(mBookmarkViewController->widget(), SmallIcon("bookmark"), i18n("Bookmarks")); // File widget - mFileDock = mDockArea->createDockWidget("Files",SmallIcon("image-x-generic"),NULL,i18n("Files")); + mFileDock = mDockArea->createDockWidget("Files",SmallIcon("image-x-generic"),nullptr,i18n("Files")); mFileViewController=new FileViewController(this, actionCollection()); mFileDock->setWidget(mFileViewController); mFileDock->setEnableDocking(KDockWidget::DockNone); mDockArea->setMainDockWidget(mFileDock); // Meta info edit widget - mMetaDock = mDockArea->createDockWidget("File Attributes", SmallIcon("application-vnd.tde.info"),NULL, + mMetaDock = mDockArea->createDockWidget("File Attributes", SmallIcon("application-vnd.tde.info"),nullptr, i18n("Image Comment")); mMetaEdit = new MetaEdit(mMetaDock, mDocument); mMetaDock->setWidget(mMetaEdit); diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp index 091982a..3bcb3e8 100644 --- a/src/gvcore/documentloadingimpl.cpp +++ b/src/gvcore/documentloadingimpl.cpp @@ -53,7 +53,7 @@ namespace Gwenview { class DocumentLoadingImplPrivate { public: DocumentLoadingImplPrivate() - : mLoader( NULL ) + : mLoader( nullptr ) {} ImageLoader* mLoader; diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index 576f9c6..716e49a 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -257,7 +257,7 @@ struct FileViewController::Private { FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* actionCollection) : TQWidget(parent) , mMode(FILE_LIST) -, mPrefetch( NULL ) +, mPrefetch( nullptr ) , mChangeDirStatus(CHANGE_DIR_STATUS_NONE) , mBrowsing(false) , mSelecting(false) @@ -269,7 +269,7 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act d->initFilterBar(); d->initFilterCombo(); d->mStack=new TQWidgetStack(this); - d->mMetaInfoJob=NULL; + d->mMetaInfoJob=nullptr; TQVBoxLayout *layout=new TQVBoxLayout(this); layout->addWidget(d->mToolBar); @@ -546,15 +546,15 @@ void FileViewController::setFileNameToSelect(const TQString& fileName) { void FileViewController::prefetch( KFileItem* item ) { prefetchDone(); - if( item == NULL ) return; + if( !item ) return; mPrefetch = ImageLoader::loader( item->url(), this, BUSY_PRELOADING ); connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); } void FileViewController::prefetchDone() { - if( mPrefetch != NULL ) { + if( mPrefetch ) { mPrefetch->release( this ); - mPrefetch = NULL; + mPrefetch = nullptr; } } @@ -1375,7 +1375,7 @@ void FileViewController::nextMetaInfoJob() { this, TQ_SLOT(updateItemMetaInfo(const KFileItem *)) ); d->mMetaInfoTodo.clear(); } else { - d->mMetaInfoJob = NULL; + d->mMetaInfoJob = nullptr; // When we finished all metadata load we should update view sorting // We can't do it during the item update due to performance impact diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp index d6a4799..cc74e8e 100644 --- a/src/gvcore/slideshow.cpp +++ b/src/gvcore/slideshow.cpp @@ -49,7 +49,7 @@ namespace Gwenview { #endif SlideShow::SlideShow(Document* document) -: mDocument(document), mStarted(false), mPrefetch( NULL ) { +: mDocument(document), mStarted(false), mPrefetch( nullptr ) { mTimer=new TQTimer(this); connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) ); @@ -138,7 +138,7 @@ TQValueVector::ConstIterator SlideShow::findNextURL() const { void SlideShow::slotTimeout() { LOG(""); // wait for prefetching to finish - if( mPrefetch != NULL ) { + if( mPrefetch ) { LOG("mPrefetch is working"); return; } @@ -168,7 +168,7 @@ void SlideShow::prefetch() { } LOG("url=" << (*it).pathOrURL()); - if( mPrefetch != NULL ) mPrefetch->release( this ); + if( mPrefetch ) mPrefetch->release( this ); // TODO don't use prefetching with disabled optimizations (and add that option ;) ) // (and also don't use prefetching in other places if the image won't fit in cache) mPrefetch = ImageLoader::loader( *it, this, BUSY_PRELOADING ); @@ -199,12 +199,12 @@ void SlideShow::slotUrlKindDetermined() { void SlideShow::prefetchDone() { LOG(""); - if( mPrefetch != NULL ) { + if( mPrefetch ) { LOG("mPrefetch!=0"); // don't call Cache::setPriorityURL( ... , false ) here - it will still take // a short while to reuse the image from the cache mPrefetch->release( this ); - mPrefetch = NULL; + mPrefetch = nullptr; // prefetching completed and delay has already elapsed if( mStarted && !mTimer->isActive()) { LOG("Calling slotTimeout"); diff --git a/src/gvcore/threadgate.cpp b/src/gvcore/threadgate.cpp index 098e183..211270f 100644 --- a/src/gvcore/threadgate.cpp +++ b/src/gvcore/threadgate.cpp @@ -42,7 +42,7 @@ ThreadGate* ThreadGate::instance() { } TQColor ThreadGate::color( const char* name ) { - if( name == NULL || name[ 0 ] == '\0' || name[ 0 ] == '#' ) + if( !name || name[ 0 ] == '\0' || name[ 0 ] == '#' ) return TQColor( name ); // named color ... needs to be created in the main thread if( TSThread::currentThread() == TSThread::mainThread()) diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index 33e63ed..0621ee1 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -382,7 +382,7 @@ ThumbnailLoadJob::ThumbnailLoadJob(const TQValueVector* items, mAllItems=*items; mProcessedState.resize( mAllItems.count()); tqFill( mProcessedState.begin(), mProcessedState.end(), false ); - mCurrentItem = NULL; + mCurrentItem = nullptr; connect(&mThumbnailThread, TQ_SIGNAL(done(const TQImage&, const TQSize&)), TQ_SLOT(thumbnailReady(const TQImage&, const TQSize&)) ); @@ -400,7 +400,7 @@ ThumbnailLoadJob::~ThumbnailLoadJob() { void ThumbnailLoadJob::start() { // build mItems from mAllItems if not done yet if (mLastVisibleIndex == -1 ) { - setPriorityItems( NULL, NULL, NULL ); + setPriorityItems( nullptr, nullptr, nullptr ); } if (mItems.isEmpty()) { LOG("Nothing to do"); @@ -450,7 +450,7 @@ void ThumbnailLoadJob::itemRemoved(const KFileItem* item) { if (item == mCurrentItem) { // Abort - mCurrentItem = NULL; + mCurrentItem = nullptr; if (subjobs.first()) { subjobs.first()->kill(); subjobs.removeFirst(); @@ -468,9 +468,9 @@ void ThumbnailLoadJob::setPriorityItems(const KFileItem* current, const KFileIte mFirstVisibleIndex = -1; mLastVisibleIndex = - 1; mCurrentVisibleIndex = -1; - if( first != NULL ) mFirstVisibleIndex = thumbnailIndex( first ); - if( last != NULL ) mLastVisibleIndex = thumbnailIndex( last ); - if( current != NULL ) mCurrentVisibleIndex = thumbnailIndex( current ); + if( first ) mFirstVisibleIndex = thumbnailIndex( first ); + if( last ) mLastVisibleIndex = thumbnailIndex( last ); + if( current ) mCurrentVisibleIndex = thumbnailIndex( current ); if( mFirstVisibleIndex == -1 ) mFirstVisibleIndex = 0; if( mLastVisibleIndex == -1 ) mLastVisibleIndex = mAllItems.count() - 1; if( mCurrentVisibleIndex == -1 ) mCurrentVisibleIndex = mFirstVisibleIndex; diff --git a/src/gvcore/xcursor.cpp b/src/gvcore/xcursor.cpp index d3c3acc..d00c3b2 100644 --- a/src/gvcore/xcursor.cpp +++ b/src/gvcore/xcursor.cpp @@ -125,7 +125,7 @@ int XCursorFormat::decode(TQImage& img, TQImageConsumer* cons, { XcursorImage* cursor = cursors->images[ cur ]; img = TQImage( reinterpret_cast( cursor->pixels ), - cursor->width, cursor->height, 32, NULL, 0, TQImage::BigEndian ); + cursor->width, cursor->height, 32, nullptr, 0, TQImage::BigEndian ); img.setAlphaBuffer( true ); // Convert the image to non-premultiplied alpha TQ_UINT32 *pixels = reinterpret_cast( img.bits() ); diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 2a1d9f3..95405fd 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -78,7 +78,7 @@ K_EXPORT_COMPONENT_FACTORY( libgvimagepart /*library name*/, GVImageFactory ) GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQObject* parent, const char* name, const TQStringList &) : KParts::ReadOnlyPart( parent, name ) - , mPrefetch( NULL ) + , mPrefetch( nullptr ) , mLastDirection( DirectionUnknown ) { GVImageFactory::instance()->iconLoader()->addAppDir( "gwenview"); setInstance( GVImageFactory::instance() ); @@ -205,10 +205,10 @@ void GVImagePart::slotLoaded(const KURL& url) { } void GVImagePart::prefetchDone() { - if( mPrefetch != NULL ) { + if( mPrefetch ) { mPrefetch->release( this ); } - mPrefetch = NULL; + mPrefetch = nullptr; } void GVImagePart::print() { diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp index 3c719a7..f539c6c 100644 --- a/src/imageutils/scale.cpp +++ b/src/imageutils/scale.cpp @@ -1140,7 +1140,7 @@ MImageScaleInfo* MImageScale::mimageFreeScaleInfo(MImageScaleInfo *isi) delete[] isi->yapoints; delete isi; } - return(NULL); + return(nullptr); } MImageScaleInfo* MImageScale::mimageCalcScaleInfo(TQImage &img, int sw, int sh, @@ -1154,7 +1154,7 @@ MImageScaleInfo* MImageScale::mimageCalcScaleInfo(TQImage &img, int sw, int sh, isi = new MImageScaleInfo; if(!isi) - return(NULL); + return(nullptr); memset(isi, 0, sizeof(MImageScaleInfo)); isi->xup_yup = (abs(dw) >= sw) + ((abs(dh) >= sh) << 1); @@ -1893,10 +1893,10 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, int extraScalePixels( SmoothAlgorithm alg, double zoom, double blur ) { double filtersupport = 0; - Filter filter = NULL; + Filter filter = nullptr; switch( alg ) { case SMOOTH_NONE: - filter = NULL; + filter = nullptr; filtersupport = 0.0; break; case SMOOTH_FAST: @@ -1936,12 +1936,12 @@ TQImage scale(const TQImage& image, int width, int height, width = newSize.width(); height = newSize.height(); - Filter filter = NULL; + Filter filter = nullptr; fastfloat filtersupport; switch( alg ) { case SMOOTH_NONE: - filter = NULL; + filter = nullptr; filtersupport = 0.0; break; case SMOOTH_FAST: @@ -1964,10 +1964,10 @@ TQImage scale(const TQImage& image, int width, int height, return MImageScale::smoothScale( image, width, height ); if( filter == Box && width > image.width() && height > image.height() && blur == 1.0 ) { - filter = NULL; // Box doesn't really smooth when enlarging + filter = nullptr; // Box doesn't really smooth when enlarging } - if( filter == NULL ) { + if( !filter ) { return SampleImage( image, width, height ); // doesn't need 32bit } diff --git a/src/tsthread/tsthread.cpp b/src/tsthread/tsthread.cpp index c93184f..f849574 100644 --- a/src/tsthread/tsthread.cpp +++ b/src/tsthread/tsthread.cpp @@ -36,7 +36,7 @@ TQThreadStorage< TSThread** >* TSThread::current_thread; #else TSCurrentThread* TSThread::current_thread; #endif -TSThread* TSThread::main_thread = NULL; +TSThread* TSThread::main_thread = nullptr; class TSMainThread : public TSThread @@ -61,21 +61,21 @@ TSThread::TSThread() : thread( this ) , cancelling( false ) , emit_pending( false ) - , cancel_mutex( NULL ) - , cancel_cond( NULL ) - , deleted_flag( NULL ) + , cancel_mutex( nullptr ) + , cancel_cond( nullptr ) + , deleted_flag( nullptr ) { } TSThread::~TSThread() { - if( deleted_flag != NULL ) + if( deleted_flag ) *deleted_flag = true; } void TSThread::start() { - if( current_thread == NULL ) + if( !current_thread ) initCurrentThread(); thread.start(); } @@ -84,7 +84,7 @@ void TSThread::cancel() { TQMutexLocker lock( &mutex ); cancelling = true; - if( cancel_mutex != NULL ) + if( cancel_mutex ) { TQMutexLocker lock( cancel_mutex ); cancel_cond->wakeAll(); @@ -112,7 +112,7 @@ void TSThread::initCurrentThread() current_thread = new TQThreadStorage< TSThread** >(); typedef TSThread* TSThreadPtr; // set pointer for main thread (this must be main thread) - current_thread->setLocalData( new TSThreadPtr( NULL )); // TODO NULL ? + current_thread->setLocalData( new TSThreadPtr( nullptr )); // TODO NULL ? #else current_thread = new TSCurrentThread(); main_thread = new TSMainThread; @@ -132,13 +132,13 @@ void TSThread::executeThread() current_thread->setLocalData( this ); #endif run(); - postSignal( this, NULL ); // = terminated() + postSignal( this, nullptr ); // = terminated() } void TSThread::postSignal( TQObject* obj, const char* signal ) { assert( currentThread() == this ); - tqApp->postEvent( this, new SignalEvent( signal, obj, NULL )); + tqApp->postEvent( this, new SignalEvent( signal, obj, nullptr )); } void TSThread::emitSignalInternal( TQObject* obj, const char* signal, TQUObject* o ) @@ -182,7 +182,7 @@ void TSThread::customEvent( TQCustomEvent* ev ) kdWarning() << "Cannot emit signal \"" << e->signal << "\"." << endl; if( deleted ) // some slot deleted 'this' return; - deleted_flag = NULL; + deleted_flag = nullptr; TQMutexLocker locker( &signal_mutex ); if( emit_pending ) { diff --git a/src/tsthread/tsthread.h b/src/tsthread/tsthread.h index 15ac57b..5eff8f1 100644 --- a/src/tsthread/tsthread.h +++ b/src/tsthread/tsthread.h @@ -234,7 +234,7 @@ class TSCurrentThread inline TSCurrentThread::TSCurrentThread() { - pthread_key_create( &key, NULL ); + pthread_key_create( &key, nullptr ); } inline TSCurrentThread::~TSCurrentThread() @@ -265,7 +265,7 @@ inline bool TSThread::setCancelData( TQMutex* m, TQWaitCondition* c ) { TQMutexLocker lock( &mutex ); - if( cancelling && m != NULL ) + if( cancelling && m ) return false; cancel_mutex = m; cancel_cond = c; @@ -275,7 +275,7 @@ bool TSThread::setCancelData( TQMutex* m, TQWaitCondition* c ) inline TSThread* TSThread::currentThread() { - if( current_thread == NULL ) + if( !current_thread ) initCurrentThread(); #ifdef TS_TQTHREADSTORAGE return *current_thread->localData(); diff --git a/src/tsthread/tswaitcondition.cpp b/src/tsthread/tswaitcondition.cpp index fb038ff..1bfabd7 100644 --- a/src/tsthread/tswaitcondition.cpp +++ b/src/tsthread/tswaitcondition.cpp @@ -41,7 +41,7 @@ bool TSWaitCondition::cancellableWait( TQMutex* m, unsigned long time ) } m->unlock(); bool ret = cond.wait( &mutex, time ); - TSThread::currentThread()->setCancelData( NULL, NULL ); + TSThread::currentThread()->setCancelData( nullptr, nullptr ); mutex.unlock(); m->lock(); return ret; -- cgit v1.2.3