From d1b2e166d71fabe1f7c360f3e1c3a042550d530f Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 20 Sep 2026 18:16:50 -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 --- kdirstat/kcleanup.cpp | 2 +- kdirstat/kcleanup.h | 2 +- kdirstat/kcleanupcollection.cpp | 2 +- kdirstat/kcleanupcollection.h | 2 +- kdirstat/kdirstatapp.cpp | 20 +++++++-------- kdirstat/kdirstatapp.h | 4 +-- kdirstat/kdirstatmain.cpp | 6 ++--- kdirstat/kdirstatsettings.cpp | 6 ++--- kdirstat/kdirstatsettings.h | 4 +-- kdirstat/kdirtree.cpp | 54 ++++++++++++++++++++--------------------- kdirstat/kdirtree.h | 26 ++++++++++---------- kdirstat/kdirtreeiterators.cpp | 10 ++++---- kdirstat/kdirtreeiterators.h | 4 +-- kdirstat/kdirtreeview.cpp | 38 ++++++++++++++--------------- kdirstat/kdirtreeview.h | 2 +- kdirstat/kpacman.h | 4 +-- kdirstat/kstdcleanup.h | 14 +++++------ kdirstat/ktreemapview.cpp | 26 ++++++++++---------- kdirstat/ktreemapview.h | 2 +- 19 files changed, 114 insertions(+), 114 deletions(-) diff --git a/kdirstat/kcleanup.cpp b/kdirstat/kcleanup.cpp index d2e97f7..91e3c8b 100644 --- a/kdirstat/kcleanup.cpp +++ b/kdirstat/kcleanup.cpp @@ -41,7 +41,7 @@ KCleanup::KCleanup( TQString id, , _command ( command ) , _title ( title ) { - _selection = 0; + _selection = nullptr; _enabled = true; _worksForDir = true; _worksForFile = false; diff --git a/kdirstat/kcleanup.h b/kdirstat/kcleanup.h index a32f3aa..b9f173c 100644 --- a/kdirstat/kcleanup.h +++ b/kdirstat/kcleanup.h @@ -56,7 +56,7 @@ namespace KDirStat KCleanup( TQString id = "", TQString command = "", TQString title = "", - TDEActionCollection * parent = 0 ); + TDEActionCollection * parent = nullptr ); /** * Copy Constructor. diff --git a/kdirstat/kcleanupcollection.cpp b/kdirstat/kcleanupcollection.cpp index a913d8b..6f1f038 100644 --- a/kdirstat/kcleanupcollection.cpp +++ b/kdirstat/kcleanupcollection.cpp @@ -43,7 +43,7 @@ KCleanupCollection::KCleanupCollection( const KCleanupCollection &src ) // Keep consistent with the KCleanup copy constructor: It explicitly uses a // zero TDEActionCollecton to make sure no duplicates of cleanups get into // the action collection. - _actionCollection = 0; + _actionCollection = nullptr; } diff --git a/kdirstat/kcleanupcollection.h b/kdirstat/kcleanupcollection.h index 5d16341..99725cf 100644 --- a/kdirstat/kcleanupcollection.h +++ b/kdirstat/kcleanupcollection.h @@ -60,7 +60,7 @@ namespace KDirStat * All @ref KCleanup actions ever added to this collection will get * this as their parent. **/ - KCleanupCollection( TDEActionCollection * actionCollection = 0 ); + KCleanupCollection( TDEActionCollection * actionCollection = nullptr ); /** * Copy Constructor. diff --git a/kdirstat/kdirstatapp.cpp b/kdirstat/kdirstatapp.cpp index 0fc9e66..d63a4a2 100644 --- a/kdirstat/kdirstatapp.cpp +++ b/kdirstat/kdirstatapp.cpp @@ -55,20 +55,20 @@ using namespace KDirStat; KDirStatApp::KDirStatApp( TQWidget* , const char* name ) - : TDEMainWindow( 0, name ) + : TDEMainWindow( nullptr, name ) { // Simple inits - _activityTracker = 0; // Might or might not be needed + _activityTracker = nullptr; // Might or might not be needed // Those will be created delayed, only when needed - _settingsDialog = 0; - _feedbackDialog = 0; - _treemapView = 0; - _pacMan = 0; - _pacManDelimiter = 0; + _settingsDialog = nullptr; + _feedbackDialog = nullptr; + _treemapView = nullptr; + _pacMan = nullptr; + _pacManDelimiter = nullptr; // Set up internal (mainWin -> mainWin) connections @@ -289,13 +289,13 @@ KDirStatApp::initPacMan( bool enablePacMan ) if ( _pacMan ) { delete _pacMan; - _pacMan = 0; + _pacMan = nullptr; } if ( _pacManDelimiter ) { delete _pacManDelimiter; - _pacManDelimiter = 0; + _pacManDelimiter = nullptr; } } } @@ -838,7 +838,7 @@ KDirStatApp::deleteTreemapView() delete _treemapView; } - _treemapView = 0; + _treemapView = nullptr; updateActions(); } diff --git a/kdirstat/kdirstatapp.h b/kdirstat/kdirstatapp.h index 57f88c6..525a16c 100644 --- a/kdirstat/kdirstatapp.h +++ b/kdirstat/kdirstatapp.h @@ -79,7 +79,7 @@ public: * Construtor of KDirStatApp, calls all init functions to create the * application. **/ - KDirStatApp( TQWidget* parent=0, const char* name=0 ); + KDirStatApp( TQWidget* parent=nullptr, const char* name=nullptr ); /** * Destructor. @@ -267,7 +267,7 @@ public slots: * Returns true if the pacman animation in the tool bar is enabled, false * otherwise. **/ - bool pacManEnabled() const { return _pacMan != 0; } + bool pacManEnabled() const { return _pacMan != nullptr; } /** * Ask user if he wouldn't like to rate this program. diff --git a/kdirstat/kdirstatmain.cpp b/kdirstat/kdirstatmain.cpp index b6d54e7..f085296 100644 --- a/kdirstat/kdirstatmain.cpp +++ b/kdirstat/kdirstatmain.cpp @@ -35,7 +35,7 @@ static const char *description = static TDECmdLineOptions options[] = { { "+[Dir/URL]", I18N_NOOP("Directory or URL to open"), 0 }, - { 0, 0, 0 } + { nullptr, nullptr, 0 } }; int main(int argc, char *argv[]) @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) TDEAboutData aboutData( "kdirstat", I18N_NOOP("KDirStat"), VERSION, description, TDEAboutData::License_GPL, - "(c) 1999-2003 Stefan Hundhammer", 0, 0, + "(c) 1999-2003 Stefan Hundhammer", nullptr, nullptr, "sh@suse.de" ); aboutData.addAuthor( "Stefan Hundhammer", @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) aboutData.addCredit( I18N_NOOP( "All the people who worked on SequoiaView" ), I18N_NOOP( "for showing just how useful treemaps really can be.\n" ), - 0, // e-mail + nullptr, // e-mail "http://www.win.tue.nl/sequoiaview" ); aboutData.addCredit( I18N_NOOP( "Jarke J. van Wijk, Huub van de Wetering, and Mark Bruls" ), diff --git a/kdirstat/kdirstatsettings.cpp b/kdirstat/kdirstatsettings.cpp index 80853f1..4bdb23c 100644 --- a/kdirstat/kdirstatsettings.cpp +++ b/kdirstat/kdirstatsettings.cpp @@ -278,7 +278,7 @@ KCleanupPage::KCleanupPage( KSettingsDialog * dialog, KDirStatApp * mainWin ) : KSettingsPage( dialog, parent ) , _mainWin( mainWin ) - , _currentCleanup( 0 ) + , _currentCleanup( nullptr ) { // Copy the main window's cleanup collection. @@ -385,7 +385,7 @@ KCleanupPage::importCleanups() // Pointers to the old collection contents are now invalid! - _currentCleanup = 0; + _currentCleanup = nullptr; } @@ -428,7 +428,7 @@ KCleanupPage::storeProps( KCleanup * cleanup ) KCleanupListBox::KCleanupListBox( TQWidget *parent ) : TQListBox( parent ) { - _selection = 0; + _selection = nullptr; connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem *) ), diff --git a/kdirstat/kdirstatsettings.h b/kdirstat/kdirstatsettings.h index 953ec68..5a43e35 100644 --- a/kdirstat/kdirstatsettings.h +++ b/kdirstat/kdirstatsettings.h @@ -414,7 +414,7 @@ namespace KDirStat /** * Constructor. **/ - KCleanupListBox( TQWidget * parent = 0 ); + KCleanupListBox( TQWidget * parent = nullptr ); /** * Destructor. @@ -443,7 +443,7 @@ namespace KDirStat * Update the list item's text that corresponds to 'cleanup' - the user * may have entered a new cleanup name. '0' means "check all items". **/ - void updateTitle( KCleanup * cleanup = 0 ); + void updateTitle( KCleanup * cleanup = nullptr ); signals: diff --git a/kdirstat/kdirtree.cpp b/kdirstat/kdirtree.cpp index 6f48507..0a5b146 100644 --- a/kdirstat/kdirtree.cpp +++ b/kdirstat/kdirtree.cpp @@ -32,7 +32,7 @@ KFileInfo::KFileInfo( KDirTree * tree, KDirInfo * parent, const char * name ) : _parent( parent ) - , _next( 0 ) + , _next( nullptr ) , _tree( tree ) { _isLocalFile = true; @@ -52,7 +52,7 @@ KFileInfo::KFileInfo( const TQString & filenameWithoutPath, KDirTree * tree, KDirInfo * parent ) : _parent( parent ) - , _next( 0 ) + , _next( nullptr ) , _tree( tree ) { TQ_CHECK_PTR( statInfo ); @@ -104,7 +104,7 @@ KFileInfo::KFileInfo( const KFileItem * fileItem, KDirTree * tree, KDirInfo * parent ) : _parent( parent ) - , _next( 0 ) + , _next( nullptr ) , _tree( tree ) { TQ_CHECK_PTR( fileItem ); @@ -282,7 +282,7 @@ KFileInfo * KFileInfo::locate( TQString url, bool findDotEntries ) { if ( ! url.startsWith( _name ) ) - return 0; + return nullptr; else // URL starts with this node's name { url.remove( 0, _name.length() ); // Remove leading name of this node @@ -334,7 +334,7 @@ KFileInfo::locate( TQString url, bool findDotEntries ) } } - return 0; + return nullptr; } @@ -352,7 +352,7 @@ KDirInfo::KDirInfo( KDirTree * tree, if ( asDotEntry ) { _isDotEntry = true; - _dotEntry = 0; + _dotEntry = nullptr; _name = "."; } else @@ -394,8 +394,8 @@ KDirInfo::init() { _isDotEntry = false; _pendingReadJobs = 0; - _dotEntry = 0; - _firstChild = 0; + _dotEntry = nullptr; + _firstChild = nullptr; _totalSize = _size; _totalBlocks = _blocks; _totalItems = 0; @@ -578,7 +578,7 @@ KDirInfo::insertChild( KFileInfo *newChild ) { TQ_CHECK_PTR( newChild ); - if ( newChild->isDir() || _dotEntry == 0 || _isDotEntry ) + if ( newChild->isDir() || _dotEntry == nullptr || _isDotEntry ) { /** * Only directories are stored directly in pure directory nodes - @@ -781,7 +781,7 @@ KDirInfo::cleanupDotEntries() KFileInfo *child = _dotEntry->firstChild(); _firstChild = child; // Move the entire children chain here. - _dotEntry->setFirstChild( 0 ); // _dotEntry will be deleted below. + _dotEntry->setFirstChild( nullptr ); // _dotEntry will be deleted below. while ( child ) { @@ -797,7 +797,7 @@ KDirInfo::cleanupDotEntries() { // kdDebug() << "Removing empty dot entry " << this << endl; delete _dotEntry; - _dotEntry = 0; + _dotEntry = nullptr; } } @@ -842,7 +842,7 @@ KDirReadJob::deletingChild( KFileInfo *deletedChild ) KLocalDirReadJob::KLocalDirReadJob( KDirTree * tree, KDirInfo * dir ) : KDirReadJob( tree, dir ) - , _diskDir( 0 ) + , _diskDir( nullptr ) { } @@ -974,7 +974,7 @@ KLocalDirReadJob::stat( const KURL & url, return new KFileInfo( name, &statInfo, tree, parent ); } else // lstat() failed - return 0; + return nullptr; } @@ -987,7 +987,7 @@ KAnyDirReadJob::KAnyDirReadJob( KDirTree * tree, : TQObject() , KDirReadJob( tree, dir ) { - _job = 0; + _job = nullptr; } @@ -1085,7 +1085,7 @@ KAnyDirReadJob::finished( TDEIO::Job * job ) _tree->sendFinalizeLocal( _dir ); _dir->finalizeLocal(); - _job = 0; // The job deletes itself after this signal! + _job = nullptr; // The job deletes itself after this signal! _tree->jobFinishedNotify( this ); // Don't add anything after _tree->jobFinishedNotify() @@ -1110,7 +1110,7 @@ KAnyDirReadJob::stat( const KURL & url, return entry.isDir() ? new KDirInfo ( &entry, tree, parent ) : new KFileInfo( &entry, tree, parent ); } else // remote stat() failed - return 0; + return nullptr; #if HAVE_STUPID_COMPILER @@ -1120,7 +1120,7 @@ KAnyDirReadJob::stat( const KURL & url, * * Sigh. **/ - return 0; + return nullptr; #endif } @@ -1150,8 +1150,8 @@ KAnyDirReadJob::owner( KURL url ) KDirTree::KDirTree() : TQObject() { - _root = 0; - _selection = 0; + _root = nullptr; + _selection = nullptr; _isFileProtocol = false; _isBusy = false; _readMethod = KDirReadUnknown; @@ -1162,7 +1162,7 @@ KDirTree::KDirTree() KDirTree::~KDirTree() { - selectItem( 0 ); + selectItem( nullptr ); // Jobs still in the job queue are automatically deleted along with the // queue since autoDelete is set. @@ -1211,12 +1211,12 @@ KDirTree::startReading( const KURL & url ) { // Clean up leftover stuff - selectItem( 0 ); + selectItem( nullptr ); emit deletingChild( _root ); // kdDebug() << "Deleting root prior to reading" << endl; delete _root; - _root = 0; + _root = nullptr; emit childDeleted(); } @@ -1262,7 +1262,7 @@ KDirTree::startReading( const KURL & url ) // kdWarning() << "stat(" << url.url() << ") failed" << endl; _isBusy = false; emit finished(); - emit finalizeLocal( 0 ); + emit finalizeLocal( nullptr ); } if ( ! _jobQueue.isEmpty() ) @@ -1291,7 +1291,7 @@ KDirTree::refresh( KFileInfo *subtree ) // Select nothing if the current selection is to be deleted if ( _selection && _selection->isInSubtree( subtree ) ) - selectItem( 0 ); + selectItem( nullptr ); // Get rid of the old subtree. @@ -1426,10 +1426,10 @@ KDirTree::deletingChildNotify( KFileInfo *deletedChild ) // (i.e. views) a chance to change either while handling the signal. if ( _selection && _selection->isInSubtree( deletedChild ) ) - selectItem( 0 ); + selectItem( nullptr ); if ( deletedChild == _root ) - _root = 0; + _root = nullptr; } @@ -1471,7 +1471,7 @@ KDirTree::deleteSubtree( KFileInfo *subtree ) // kdDebug() << "Removing empty dot entry " << parent << endl; deletingChildNotify( parent ); - parent->parent()->setDotEntry( 0 ); + parent->parent()->setDotEntry( nullptr ); delete parent; } diff --git a/kdirstat/kdirtree.h b/kdirstat/kdirtree.h index cafac28..80d85e0 100644 --- a/kdirstat/kdirtree.h +++ b/kdirstat/kdirtree.h @@ -106,8 +106,8 @@ namespace KDirStat * Default constructor. **/ KFileInfo( KDirTree * tree, - KDirInfo * parent = 0, - const char * name = 0 ); + KDirInfo * parent = nullptr, + const char * name = nullptr ); /** * Constructor from a stat buffer (i.e. based on an lstat() call). @@ -115,14 +115,14 @@ namespace KDirStat KFileInfo( const TQString & filenameWithoutPath, struct stat * statInfo, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); /** * Constructor from a KFileItem, i.e. from a @ref TDEIO::StatJob **/ KFileInfo( const KFileItem * fileItem, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); /** * Destructor. @@ -364,7 +364,7 @@ namespace KDirStat * * This default implementation always returns 0. **/ - virtual KFileInfo * firstChild() const { return 0; } + virtual KFileInfo * firstChild() const { return nullptr; } /** * Set this entry's first child. @@ -422,7 +422,7 @@ namespace KDirStat * * This default implementation always returns 0. **/ - virtual KFileInfo *dotEntry() const { return 0; } + virtual KFileInfo *dotEntry() const { return nullptr; } /** * Set a "Dot Entry". This makes sense for directories only. @@ -598,7 +598,7 @@ namespace KDirStat * entry"! **/ KDirInfo( KDirTree * tree, - KDirInfo * parent = 0, + KDirInfo * parent = nullptr, bool asDotEntry = false ); /** @@ -607,14 +607,14 @@ namespace KDirStat KDirInfo( const TQString & filenameWithoutPath, struct stat * statInfo, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); /** * Constructor from a KFileItem, i.e. from a @ref TDEIO::StatJob **/ KDirInfo( const KFileItem * fileItem, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); /** * Destructor. @@ -1007,7 +1007,7 @@ namespace KDirStat **/ static KFileInfo * stat( const KURL & url, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); protected: DIR * _diskDir; @@ -1058,7 +1058,7 @@ namespace KDirStat **/ static KFileInfo * stat( const KURL & url, KDirTree * tree, - KDirInfo * parent = 0 ); + KDirInfo * parent = nullptr ); /** * Obtain the owner of the URL specified. @@ -1146,7 +1146,7 @@ namespace KDirStat * When 0 is passed, the entire tree will be refreshed, i.e. from the * root element on. **/ - void refresh( KFileInfo *subtree = 0 ); + void refresh( KFileInfo *subtree = nullptr ); /** * Select some other item in this tree. Triggers the @ref @@ -1186,7 +1186,7 @@ namespace KDirStat * KDirTree::root()->locate( url, findDotEntries ) **/ KFileInfo * locate( TQString url, bool findDotEntries = false ) - { return _root ? _root->locate( url, findDotEntries ) : 0; } + { return _root ? _root->locate( url, findDotEntries ) : nullptr; } /** * Notification of a finished directory read job. diff --git a/kdirstat/kdirtreeiterators.cpp b/kdirstat/kdirtreeiterators.cpp index 0ede37d..b0f92c1 100644 --- a/kdirstat/kdirtreeiterators.cpp +++ b/kdirstat/kdirtreeiterators.cpp @@ -39,7 +39,7 @@ KFileInfoIterator::init( KFileInfo * parent, { _parent = parent; _policy = dotEntryPolicy; - _current = 0; + _current = nullptr; _directChildrenProcessed = false; _dotEntryProcessed = false; @@ -115,7 +115,7 @@ void KFileInfoIterator::next() } else // _policy != KDotEntryTransparent { - _current = 0; + _current = nullptr; _dotEntryChildrenProcessed = true; } } @@ -183,8 +183,8 @@ KFileInfoSortedIterator::KFileInfoSortedIterator( KFileInfo * parent, _sortOrder = sortOrder; _ascending = ascending; _initComplete = false; - _childrenList = 0; - _current = 0; + _childrenList = nullptr; + _current = nullptr; } @@ -308,7 +308,7 @@ KFileInfoSortedIterator::finished() if ( ! _initComplete ) delayedInit(); - return _current == 0; + return _current == nullptr; } diff --git a/kdirstat/kdirtreeiterators.h b/kdirstat/kdirtreeiterators.h index f211e2f..93ce9c3 100644 --- a/kdirstat/kdirtreeiterators.h +++ b/kdirstat/kdirtreeiterators.h @@ -151,7 +151,7 @@ namespace KDirStat /** * Returns 'true' if this iterator is finished and 'false' if not. **/ - virtual bool finished() { return _current == 0; } + virtual bool finished() { return _current == nullptr; } /** * Check whether or not the current child is a directory, i.e. can be @@ -164,7 +164,7 @@ namespace KDirStat * there either is no more or it isn't a directory. Check with @ref * currentIsDir() before using this! **/ - KDirInfo * currentDir() { return currentIsDir() ? (KDirInfo *) _current : 0; } + KDirInfo * currentDir() { return currentIsDir() ? (KDirInfo *) _current : nullptr; } /** * Return the number of items that will be processed. diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp index e3ab3f6..542ab4e 100644 --- a/kdirstat/kdirtreeview.cpp +++ b/kdirstat/kdirtreeview.cpp @@ -36,9 +36,9 @@ using namespace KDirStat; KDirTreeView::KDirTreeView( TQWidget * parent ) : KDirTreeViewParentClass( parent ) { - _tree = 0; - _updateTimer = 0; - _selection = 0; + _tree = nullptr; + _updateTimer = nullptr; + _selection = nullptr; _openLevel = 1; _doLazyClone = true; _doPacManAnimation = false; @@ -297,7 +297,7 @@ KDirTreeView::refreshAll() { clear(); // Implicitly calling prepareReading() via the tree's startingReading() signal - _tree->refresh( 0 ); + _tree->refresh( nullptr ); } } @@ -374,7 +374,7 @@ KDirTreeView::deleteChild( KFileInfo *child ) KDirTreeViewItem *clone = locate( child, false, // lazy false ); // doClone - KDirTreeViewItem *nextSelection = 0; + KDirTreeViewItem *nextSelection = nullptr; if ( clone ) { @@ -438,7 +438,7 @@ KDirTreeView::slotFinished() if ( _updateTimer ) { delete _updateTimer; - _updateTimer = 0; + _updateTimer = nullptr; } idleDisplay(); @@ -468,7 +468,7 @@ KDirTreeView::slotAborted() if ( _updateTimer ) { delete _updateTimer; - _updateTimer = 0; + _updateTimer = nullptr; } idleDisplay(); @@ -523,7 +523,7 @@ KDirTreeView::locate( KFileInfo *wanted, bool lazy, bool doClone ) child = child->next(); } - return 0; + return nullptr; } @@ -562,7 +562,7 @@ KDirTreeView::selectItem( TQListViewItem *listViewItem ) emit selectionChanged( _selection ); - emit selectionChanged( _selection ? _selection->orig() : (KFileInfo *) 0 ); + emit selectionChanged( _selection ? _selection->orig() : (KFileInfo *) nullptr ); } @@ -600,11 +600,11 @@ void KDirTreeView::clearSelection() { // kdDebug() << k_funcinfo << endl; - _selection = 0; + _selection = nullptr; TQListView::clearSelection(); - emit selectionChanged( (KDirTreeViewItem *) 0 ); - emit selectionChanged( (KFileInfo *) 0 ); + emit selectionChanged( (KDirTreeViewItem *) nullptr ); + emit selectionChanged( (KFileInfo *) nullptr ); } @@ -974,7 +974,7 @@ KDirTreeViewItem::KDirTreeViewItem( KDirTreeView * view, KFileInfo * orig ) : TQListViewItem( view ) { - init( view, 0, orig ); + init( view, nullptr, orig ); } @@ -997,7 +997,7 @@ KDirTreeViewItem::init( KDirTreeView * view, _parent = parent; _orig = orig; _percent = 0.0; - _pacMan = 0; + _pacMan = nullptr; _openCount = 0; // _view->incDebugCount(1); @@ -1248,7 +1248,7 @@ KDirTreeViewItem::locate( KFileInfo * wanted, */ // kdDebug() << "Too lazy to search for " << wanted << " from " << this << endl; - return 0; + return nullptr; } if ( _orig == wanted ) @@ -1283,7 +1283,7 @@ KDirTreeViewItem::locate( KFileInfo * wanted, } } - return 0; + return nullptr; } @@ -1400,7 +1400,7 @@ KDirTreeViewItem::cleanupDotEntries() * track down. */ delete dotEntry; - dotEntry = 0; + dotEntry = nullptr; } @@ -1427,7 +1427,7 @@ KDirTreeViewItem::findDotEntry() const child = child->next(); } - return 0; + return nullptr; } @@ -1609,7 +1609,7 @@ KDirTreeViewItem::paintCell( TQPainter * painter, if ( _pacMan ) { delete _pacMan; - _pacMan = 0; + _pacMan = nullptr; } int level = _orig->treeLevel(); diff --git a/kdirstat/kdirtreeview.h b/kdirstat/kdirtreeview.h index 98c45e9..8bb6556 100644 --- a/kdirstat/kdirtreeview.h +++ b/kdirstat/kdirtreeview.h @@ -71,7 +71,7 @@ namespace KDirStat /** * Default constructor. **/ - KDirTreeView( TQWidget * parent = 0 ); + KDirTreeView( TQWidget * parent = nullptr ); /** * Destructor. diff --git a/kdirstat/kpacman.h b/kdirstat/kpacman.h index 6294061..c3056e5 100644 --- a/kdirstat/kpacman.h +++ b/kdirstat/kpacman.h @@ -163,10 +163,10 @@ public: * @param pacManSize size of the PacMan sprite * @param randomStart random start position and direction if true **/ - KPacMan( TQWidget * parent = 0, + KPacMan( TQWidget * parent = nullptr, int pacManSize = 16, bool randomStart = false, - const char * widgetName = 0 ); + const char * widgetName = nullptr ); /** * Destructor. diff --git a/kdirstat/kstdcleanup.h b/kdirstat/kstdcleanup.h index a89cd9c..8a2ad92 100644 --- a/kdirstat/kstdcleanup.h +++ b/kdirstat/kstdcleanup.h @@ -42,13 +42,13 @@ namespace KDirStat class KStdCleanup { public: - static KCleanup *openInKonqueror ( TDEActionCollection *parent = 0 ); - static KCleanup *openInTerminal ( TDEActionCollection *parent = 0 ); - static KCleanup *compressSubtree ( TDEActionCollection *parent = 0 ); - static KCleanup *makeClean ( TDEActionCollection *parent = 0 ); - static KCleanup *deleteTrash ( TDEActionCollection *parent = 0 ); - static KCleanup *moveToTrashBin ( TDEActionCollection *parent = 0 ); - static KCleanup *hardDelete ( TDEActionCollection *parent = 0 ); + static KCleanup *openInKonqueror ( TDEActionCollection *parent = nullptr ); + static KCleanup *openInTerminal ( TDEActionCollection *parent = nullptr ); + static KCleanup *compressSubtree ( TDEActionCollection *parent = nullptr ); + static KCleanup *makeClean ( TDEActionCollection *parent = nullptr ); + static KCleanup *deleteTrash ( TDEActionCollection *parent = nullptr ); + static KCleanup *moveToTrashBin ( TDEActionCollection *parent = nullptr ); + static KCleanup *hardDelete ( TDEActionCollection *parent = nullptr ); private: /** diff --git a/kdirstat/ktreemapview.cpp b/kdirstat/ktreemapview.cpp index d905e6a..c43964d 100644 --- a/kdirstat/ktreemapview.cpp +++ b/kdirstat/ktreemapview.cpp @@ -32,9 +32,9 @@ using namespace KDirStat; KTreemapView::KTreemapView( KDirTree * tree, TQWidget * parent, const TQSize & initialSize ) : TQCanvasView( parent ) , _tree( tree ) - , _rootTile( 0 ) - , _selectedTile( 0 ) - , _selectionRect( 0 ) + , _rootTile( nullptr ) + , _selectedTile( nullptr ) + , _selectionRect( nullptr ) { // kdDebug() << k_funcinfo << endl; @@ -93,9 +93,9 @@ KTreemapView::clear() if ( canvas() ) deleteAllItems( canvas() ); - _selectedTile = 0; - _selectionRect = 0; - _rootTile = 0; + _selectedTile = nullptr; + _selectionRect = nullptr; + _rootTile = nullptr; } @@ -157,12 +157,12 @@ KTreemapView::readColorEntry( TDEConfig * config, const char * entryName, TQColo KTreemapTile * KTreemapView::tileAt( TQPoint pos ) { - KTreemapTile * tile = 0; + KTreemapTile * tile = nullptr; TQCanvasItemList coll = canvas()->collisions( pos ); TQCanvasItemList::Iterator it = coll.begin(); - while ( it != coll.end() && tile == 0 ) + while ( it != coll.end() && tile == nullptr ) { tile = dynamic_cast (*it); ++it; @@ -373,7 +373,7 @@ KTreemapView::canSelectParent() const void KTreemapView::rebuildTreemap() { - KFileInfo * root = 0; + KFileInfo * root = nullptr; if ( ! _savedRootUrl.isEmpty() ) { @@ -428,7 +428,7 @@ KTreemapView::rebuildTreemap( KFileInfo * newRoot, if ( newRoot ) { _rootTile = new KTreemapTile( this, // parentView - 0, // parentTile + nullptr, // parentTile newRoot, // orig TQRect( TQPoint( 0, 0), newSize ), KTreemapAuto ); @@ -544,7 +544,7 @@ KTreemapView::selectTile( KTreemapTile * tile ) if ( oldSelection != _selectedTile ) { - emit selectionChanged( _selectedTile ? _selectedTile->orig() : 0 ); + emit selectionChanged( _selectedTile ? _selectedTile->orig() : nullptr ); } } @@ -561,7 +561,7 @@ KTreemapTile * KTreemapView::findTile( KFileInfo * node ) { if ( ! node ) - return 0; + return nullptr; TQCanvasItemList itemList = canvas()->allItems(); TQCanvasItemList::Iterator it = itemList.begin(); @@ -576,7 +576,7 @@ KTreemapView::findTile( KFileInfo * node ) ++it; } - return 0; + return nullptr; } diff --git a/kdirstat/ktreemapview.h b/kdirstat/ktreemapview.h index b6cd5f9..ad6679f 100644 --- a/kdirstat/ktreemapview.h +++ b/kdirstat/ktreemapview.h @@ -51,7 +51,7 @@ namespace KDirStat * Constructor. **/ KTreemapView( KDirTree * tree, - TQWidget * parent = 0, + TQWidget * parent = nullptr, const TQSize & initialSize = TQSize() ); /** -- cgit v1.2.3