From 879f698ca5abf95b6c948d4884bd5c839cda833b Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:47:32 -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 --- libkipi/libkipi/KDStream.cpp | 2 +- libkipi/libkipi/KDStream.h | 2 +- libkipi/libkipi/batchprogressdialog.h | 2 +- libkipi/libkipi/imagecollection.cpp | 8 ++++---- libkipi/libkipi/imagecollectionselector.cpp | 6 +++--- libkipi/libkipi/imagecollectionselector.h | 2 +- libkipi/libkipi/imagedialog.cpp | 4 ++-- libkipi/libkipi/interface.h | 2 +- libkipi/libkipi/plugin.cpp | 4 ++-- libkipi/libkipi/plugin.h | 4 ++-- libkipi/libkipi/pluginloader.cpp | 14 +++++++------- libkipi/libkipi/uploadwidget.h | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libkipi/libkipi/KDStream.cpp b/libkipi/libkipi/KDStream.cpp index 790ee78..c375102 100644 --- a/libkipi/libkipi/KDStream.cpp +++ b/libkipi/libkipi/KDStream.cpp @@ -673,7 +673,7 @@ KDStream& KDStream::operator<<( const TQPixmap& pixmap ) { _output += TQString("TQPixmap[null=%1,width=%2,height=%3,depth=%4,hasMask=%5,hasAlpha=%6]") .arg(pixmap.isNull()).arg(pixmap.width()).arg(pixmap.height()) - .arg(pixmap.depth()).arg(pixmap.mask() != 0).arg(pixmap.hasAlpha() ); + .arg(pixmap.depth()).arg(pixmap.mask() != nullptr).arg(pixmap.hasAlpha() ); return *this; } diff --git a/libkipi/libkipi/KDStream.h b/libkipi/libkipi/KDStream.h index 046f8c9..84f37e3 100644 --- a/libkipi/libkipi/KDStream.h +++ b/libkipi/libkipi/KDStream.h @@ -77,7 +77,7 @@ KDStream& flush( KDStream& stream); class KDStream { public: - KDStream( TQString* outputString = 0); + KDStream( TQString* outputString = nullptr); ~KDStream(); void flush(); diff --git a/libkipi/libkipi/batchprogressdialog.h b/libkipi/libkipi/batchprogressdialog.h index 86f489c..f5cc826 100644 --- a/libkipi/libkipi/batchprogressdialog.h +++ b/libkipi/libkipi/batchprogressdialog.h @@ -57,7 +57,7 @@ TQ_OBJECT public: - BatchProgressDialog( TQWidget *parent=0, const TQString &caption=TQString() ); + BatchProgressDialog( TQWidget *parent=nullptr, const TQString &caption=TQString() ); ~BatchProgressDialog(); void addedAction(const TQString &text, int type); diff --git a/libkipi/libkipi/imagecollection.cpp b/libkipi/libkipi/imagecollection.cpp index 3afcb8f..48c1729 100644 --- a/libkipi/libkipi/imagecollection.cpp +++ b/libkipi/libkipi/imagecollection.cpp @@ -117,12 +117,12 @@ KIPI::ImageCollection::ImageCollection( const ImageCollection& rhs ) _data->addRef(); } else - _data = 0; + _data = nullptr; } KIPI::ImageCollection::ImageCollection() { - _data = 0; + _data = nullptr; } KIPI::ImageCollection& KIPI::ImageCollection::operator=( const KIPI::ImageCollection& rhs ) @@ -134,7 +134,7 @@ KIPI::ImageCollection& KIPI::ImageCollection::operator=( const KIPI::ImageCollec _data->removeRef(); if ( !rhs._data ) { printNullError(); - _data = 0; + _data = nullptr; } else { _data = rhs._data; @@ -240,7 +240,7 @@ bool KIPI::ImageCollection::isDirectory() const bool KIPI::ImageCollection::isValid() const { - return (_data != 0); + return (_data != nullptr); } void KIPI::ImageCollection::printNullError() const diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp index 1f27a20..24b39d2 100644 --- a/libkipi/libkipi/imagecollectionselector.cpp +++ b/libkipi/libkipi/imagecollectionselector.cpp @@ -88,7 +88,7 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in { d=new Private; d->_interface=interface; - d->_itemToSelect = 0; + d->_itemToSelect = nullptr; d->_list=new TDEListView(this); d->_list->setResizeMode( TQListView::LastColumn ); @@ -133,7 +133,7 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in } else { - d->_thumbLabel = 0; + d->_thumbLabel = nullptr; } d->_textLabel = new TQLabel(rightBox); @@ -338,7 +338,7 @@ void ImageCollectionSelector::slotInitialShow() { d->_list->setSelected(d->_itemToSelect, true); d->_list->ensureItemVisible(d->_itemToSelect); - d->_itemToSelect = 0; + d->_itemToSelect = nullptr; } emit selectionChanged(); } diff --git a/libkipi/libkipi/imagecollectionselector.h b/libkipi/libkipi/imagecollectionselector.h index d6a68a3..66ff91d 100644 --- a/libkipi/libkipi/imagecollectionselector.h +++ b/libkipi/libkipi/imagecollectionselector.h @@ -50,7 +50,7 @@ TQ_OBJECT public: - ImageCollectionSelector(TQWidget* parent, Interface*, const char* name=0); + ImageCollectionSelector(TQWidget* parent, Interface*, const char* name=nullptr); ~ImageCollectionSelector(); TQValueList selectedImageCollections() const; diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp index 08ff695..ce03f49 100644 --- a/libkipi/libkipi/imagedialog.cpp +++ b/libkipi/libkipi/imagedialog.cpp @@ -130,7 +130,7 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface, I18N_NOOP("A Kipi dialog for image selection"), TDEAboutData::License_GPL, "(c) 2004,2005, Kipi development team", - 0, + nullptr, "http://extragear.kde.org/apps/kipi"); TQPushButton *helpButton = actionButton( Help ); @@ -256,7 +256,7 @@ void ImageDialog::slotImagesSelected() d->_urls.clear(); d->_preview->clear(); - TQListViewItem* selectedItem = 0; + TQListViewItem* selectedItem = nullptr; TQListViewItem* listItem = d->_imageList->firstChild(); while (listItem) { diff --git a/libkipi/libkipi/interface.h b/libkipi/libkipi/interface.h index f954c60..c7a8e25 100644 --- a/libkipi/libkipi/interface.h +++ b/libkipi/libkipi/interface.h @@ -62,7 +62,7 @@ namespace KIPI public: - Interface(TQObject *parent, const char *name=0); + Interface(TQObject *parent, const char *name=nullptr); virtual ~Interface(); virtual ImageCollection currentAlbum() = 0; diff --git a/libkipi/libkipi/plugin.cpp b/libkipi/libkipi/plugin.cpp index 32f76fa..4d80db2 100644 --- a/libkipi/libkipi/plugin.cpp +++ b/libkipi/libkipi/plugin.cpp @@ -57,7 +57,7 @@ KIPI::Plugin::~Plugin() TDEActionCollection* KIPI::Plugin::actionCollection( TQWidget* widget ) { - if ( widget == 0 ) + if ( !widget ) widget = d->m_defaultWidget; if (!d->m_actionCollection.contains( widget )) @@ -73,7 +73,7 @@ void KIPI::Plugin::addAction( TDEAction* action ) TDEActionPtrList KIPI::Plugin::actions( TQWidget* widget ) { - if ( widget == 0 ) + if ( !widget ) widget = d->m_defaultWidget; return d->m_actions[widget]; diff --git a/libkipi/libkipi/plugin.h b/libkipi/libkipi/plugin.h index f10939a..2a1fe16 100644 --- a/libkipi/libkipi/plugin.h +++ b/libkipi/libkipi/plugin.h @@ -60,8 +60,8 @@ namespace KIPI virtual ~Plugin(); virtual void setup( TQWidget* widget ) = 0; - TDEActionPtrList actions( TQWidget* parent = 0 ); - TDEActionCollection* actionCollection( TQWidget* parent = 0 ); + TDEActionPtrList actions( TQWidget* parent = nullptr ); + TDEActionCollection* actionCollection( TQWidget* parent = nullptr ); virtual Category category( TDEAction* action ) const = 0; protected: diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp index b3c5eae..92e3d52 100644 --- a/libkipi/libkipi/pluginloader.cpp +++ b/libkipi/libkipi/pluginloader.cpp @@ -126,7 +126,7 @@ PluginLoader::Info::Info(const TQString& name, const TQString& comment, const TQ d->m_name=name; d->m_comment=comment; d->m_library=library; - d->m_plugin=0; + d->m_plugin=nullptr; d->m_shouldLoad=shouldLoad; } @@ -184,7 +184,7 @@ void PluginLoader::Info::setShouldLoad(bool value) // PluginLoader // //--------------------------------------------------------------------- -static PluginLoader* s_instance = 0; +static PluginLoader* s_instance = nullptr; struct PluginLoader::Private @@ -197,7 +197,7 @@ struct PluginLoader::Private PluginLoader::PluginLoader( const TQStringList& ignores, Interface* interface ) { - Q_ASSERT( s_instance == 0 ); + Q_ASSERT( !s_instance ); s_instance = this; d=new Private; @@ -262,12 +262,12 @@ void PluginLoader::loadPlugins() void PluginLoader::loadPlugin( Info* info ) { - if ( info->plugin() == 0 && info->shouldLoad() ) { - Plugin *plugin = 0; + if ( !info->plugin() && info->shouldLoad() ) { + Plugin *plugin = nullptr; int error; plugin = KParts::ComponentFactory ::createInstanceFromLibrary(info->library().local8Bit().data(), - d->m_interface, 0, TQStringList(), &error); + d->m_interface, nullptr, TQStringList(), &error); if (plugin) kdDebug( 51001 ) << "KIPI::PluginLoader: Loaded plugin " << plugin->name()<< endl; @@ -296,7 +296,7 @@ const PluginLoader::PluginList& PluginLoader::pluginList() PluginLoader* PluginLoader::instance() { - Q_ASSERT( s_instance != 0); + Q_ASSERT( s_instance ); return s_instance; } diff --git a/libkipi/libkipi/uploadwidget.h b/libkipi/libkipi/uploadwidget.h index 2ace488..8a956a2 100644 --- a/libkipi/libkipi/uploadwidget.h +++ b/libkipi/libkipi/uploadwidget.h @@ -48,7 +48,7 @@ namespace KIPI public: - UploadWidget( KIPI::Interface* interface, TQWidget* parent, const char* name = 0 ); + UploadWidget( KIPI::Interface* interface, TQWidget* parent, const char* name = nullptr ); ~UploadWidget(); KURL path() const; -- cgit v1.2.3