From 813f1df1b7b9d54c21f6471370d94930c2f88810 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sun, 11 Oct 2026 06:50:15 -0300 Subject: Apply MicheleC nullptr review corrections --- src/directorymergewindow.cpp | 30 +++++++++++++++--------------- src/kdiff3.cpp | 14 +++++++------- src/merger.cpp | 8 ++++---- src/mergeresultwindow.cpp | 20 ++++++++++---------- src/pdiff.cpp | 14 +++++++------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index dddb59f..50bc0ea 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -808,12 +808,12 @@ void DirectoryMergeWindow::keyPressEvent( TQKeyEvent* e ) bool bThreeDirs = m_dirC.isValid(); TQListViewItem* lvi = currentItem(); - DirMergeItem* pDMI = lvi==nullptr ? nullptr : static_cast(lvi); - MergeFileInfos* pMFI = pDMI==nullptr ? nullptr : pDMI->m_pMFI; + DirMergeItem* pDMI = lvi ? static_cast(lvi) : nullptr; + MergeFileInfos* pMFI = pDMI ? pDMI->m_pMFI : nullptr; if ( !pMFI ) return; bool bMergeMode = bThreeDirs || !m_bSyncMode; - bool bFTConflict = pMFI==nullptr ? false : conflictingFileTypes(*pMFI); + bool bFTConflict = pMFI ? conflictingFileTypes(*pMFI) : false; if ( bMergeMode ) { @@ -1297,7 +1297,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) { // Remove all equals. (Search tree depth first) TQListViewItem* p = firstChild(); - while( p!=0 && firstChild() != 0 ) + while( p && firstChild() ) { TQListViewItem* pParent = p->parent(); TQListViewItem* pNextSibling = p->nextSibling(); @@ -1305,20 +1305,20 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) DirMergeItem* pDMI = static_cast(p); bool bDirEqual = bCheckC ? pDMI->m_pMFI->m_bEqualAB && pDMI->m_pMFI->m_bEqualAC : pDMI->m_pMFI->m_bEqualAB; - if ( pDMI!=0 && pDMI->m_pMFI->m_bDirA && bDirEqual ) + if ( pDMI && pDMI->m_pMFI->m_bDirA && bDirEqual ) { delete p; p=0; } - if ( p!=0 && p->firstChild() != 0 ) p = p->firstChild(); - else if ( pNextSibling!=0 ) p = pNextSibling; + if ( p && p->firstChild() ) p = p->firstChild(); + else if ( pNextSibling ) p = pNextSibling; else { p=pParent; - while ( p!=0 ) + while ( p ) { - if( p->nextSibling()!=0 ) { p = p->nextSibling(); break; } + if( p->nextSibling() ) { p = p->nextSibling(); break; } else { p = p->parent(); } } } @@ -2991,12 +2991,12 @@ void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWin bool bThreeDirs = m_dirC.isValid(); TQListViewItem* lvi = currentItem(); - DirMergeItem* pDMI = lvi==nullptr ? nullptr : static_cast(lvi); - MergeFileInfos* pMFI = pDMI==nullptr ? nullptr : pDMI->m_pMFI; + DirMergeItem* pDMI = lvi ? static_cast(lvi) : nullptr; + MergeFileInfos* pMFI = pDMI ? pDMI->m_pMFI : nullptr; - bool bItemActive = bDirCompare && isVisible() && pMFI!=nullptr;// && hasFocus(); + bool bItemActive = bDirCompare && isVisible() && pMFI;// && hasFocus(); bool bMergeMode = bThreeDirs || !m_bSyncMode; - bool bFTConflict = pMFI==nullptr ? false : conflictingFileTypes(*pMFI); + bool bFTConflict = pMFI ? conflictingFileTypes(*pMFI) : false; bool bDirWindowHasFocus = isVisible() && hasFocus(); @@ -3006,8 +3006,8 @@ void DirectoryMergeWindow::updateAvailabilities( bool bDirCompare, bool bDiffWin m_pDirShowFilesOnlyInB->setEnabled( bDirCompare && isVisible() ); m_pDirShowFilesOnlyInC->setEnabled( bDirCompare && isVisible() && bThreeDirs ); - m_pDirCompareExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=nullptr ); - m_pDirMergeExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item!=nullptr ); + m_pDirCompareExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item ); + m_pDirMergeExplicit->setEnabled( bDirCompare && isVisible() && m_pSelection2Item ); m_pDirCurrentDoNothing->setEnabled( bItemActive && bMergeMode ); m_pDirCurrentChooseA->setEnabled( bItemActive && bMergeMode && pMFI->m_bExistsInA ); diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index b074382..4fc2ffd 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -83,7 +83,7 @@ TDEToolBar* KDiff3App::toolBar(const char* toolBarId ) bool KDiff3App::isPart() { - return m_pKDiff3Shell==nullptr; + return !m_pKDiff3Shell; } bool KDiff3App::isFileSaved() @@ -127,7 +127,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par } // All default values must be set before calling readOptions(). - m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=nullptr, this ); + m_pOptionDialog = new OptionDialog( m_pKDiff3Shell, this ); connect( m_pOptionDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotRefresh()) ); m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : tdeApp->config() ); @@ -183,7 +183,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par m_outputFilename = args->getOption("out"); } - m_bAutoFlag = args!=nullptr && args->isSet("auto"); + m_bAutoFlag = args && args->isSet("auto"); m_bAutoMode = m_bAutoFlag || m_pOptionDialog->m_bAutoSaveAndQuitOnMergeWithoutConflicts; if ( m_bAutoMode && m_outputFilename.isEmpty() ) { @@ -204,7 +204,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par else m_bDefaultFilename = false; - g_bAutoSolve = args!=nullptr && !args->isSet("qall"); // Note that this is effective only once. + g_bAutoSolve = args && !args->isSet("qall"); // Note that this is effective only once. if ( args ) { @@ -257,7 +257,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par viewStatusBar->setChecked( m_pOptionDialog->m_bShowStatusBar ); slotViewToolBar(); slotViewStatusBar(); - if( toolBar("mainToolBar")!=nullptr ) + if( toolBar("mainToolBar") ) toolBar("mainToolBar")->setBarPos( (TDEToolBar::BarPosition) m_pOptionDialog->m_toolBarPos ); /* TQSize size = m_pOptionDialog->m_geometry; TQPoint pos = m_pOptionDialog->m_position; @@ -580,7 +580,7 @@ void KDiff3App::saveOptions( TDEConfig* config ) m_pOptionDialog->m_geometry = m_pKDiff3Shell->size(); m_pOptionDialog->m_position = m_pKDiff3Shell->pos(); } - if ( toolBar("mainToolBar")!=nullptr ) + if ( toolBar("mainToolBar") ) m_pOptionDialog->m_toolBarPos = (int) toolBar("mainToolBar")->barPos(); } @@ -938,7 +938,7 @@ void KDiff3App::slotViewToolBar() m_pOptionDialog->m_bShowToolBar = viewToolBar->isChecked(); /////////////////////////////////////////////////////////////////// // turn Toolbar on or off - if ( toolBar("mainToolBar") !=nullptr ) + if ( toolBar("mainToolBar") ) { if(!m_pOptionDialog->m_bShowToolBar) { diff --git a/src/merger.cpp b/src/merger.cpp index d3b11cd..92f9528 100644 --- a/src/merger.cpp +++ b/src/merger.cpp @@ -40,14 +40,14 @@ Merger::MergeData::MergeData( const DiffList* p, int i ) bool Merger::MergeData::eq() { - return pDiffList==nullptr || d.nofEquals > 0; + return !pDiffList || d.nofEquals > 0; } bool Merger::MergeData::isEnd() { - return ( pDiffList==nullptr || ( it==pDiffList->end() && d.nofEquals==0 && + return !pDiffList || ( it==pDiffList->end() && d.nofEquals==0 && ( idx == 0 ? d.diff1==0 : d.diff2==0 ) - ) ); + ); } void Merger::MergeData::update() @@ -60,7 +60,7 @@ void Merger::MergeData::update() --d.diff2; while( d.nofEquals == 0 && (idx==0 && d.diff1 == 0 || idx==1 && d.diff2 == 0) - && pDiffList!=nullptr && it != pDiffList->end() ) + && pDiffList && it != pDiffList->end() ) { d = *it; ++it; diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 7ca176d..0d1d89e 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -299,12 +299,12 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli MergeLine ml; bool bLineRemoved; - mergeOneLine( d, ml.mergeDetails, ml.bConflict, bLineRemoved, ml.srcSelect, m_pldC==nullptr ); + mergeOneLine( d, ml.mergeDetails, ml.bConflict, bLineRemoved, ml.srcSelect, !m_pldC ); // Automatic solving for only whitespace changes. if ( ml.bConflict && - ( m_pldC==nullptr && (d.bAEqB || d.bWhiteLineA && d.bWhiteLineB) || - m_pldC!=nullptr && (d.bAEqB && d.bAEqC || d.bWhiteLineA && d.bWhiteLineB && d.bWhiteLineC ) ) ) + ( !m_pldC && (d.bAEqB || d.bWhiteLineA && d.bWhiteLineB) || + m_pldC && (d.bAEqB && d.bAEqC || d.bWhiteLineA && d.bWhiteLineB && d.bWhiteLineC ) ) ) { ml.bWhiteSpaceConflict = true; } @@ -316,7 +316,7 @@ void MergeResultWindow::merge(bool bAutoSolve, int defaultSelector, bool bConfli MergeLine* back = m_mergeLineList.empty() ? nullptr : &m_mergeLineList.back(); - bool bSame = back!=nullptr && sameKindCheck( ml, *back ); + bool bSame = back && sameKindCheck( ml, *back ); if( bSame ) { ++back->srcRangeLength; @@ -1258,7 +1258,7 @@ void MergeResultWindow::slotMergeHistory() int d3lHistoryEndLineIdx = -1; // Search for history start, history end in the diff3LineList - findHistoryRange( m_pOptionDialog->m_historyStartRegExp, m_pldC!=nullptr, m_pDiff3LineList, iD3LHistoryBegin, iD3LHistoryEnd, d3lHistoryBeginLineIdx, d3lHistoryEndLineIdx ); + findHistoryRange( m_pOptionDialog->m_historyStartRegExp, m_pldC, m_pDiff3LineList, iD3LHistoryBegin, iD3LHistoryEnd, d3lHistoryBeginLineIdx, d3lHistoryEndLineIdx ); if ( iD3LHistoryBegin != m_pDiff3LineList->end() ) { @@ -1346,7 +1346,7 @@ void MergeResultWindow::slotMergeHistory() break; ++historyCount; HistoryMapEntry& hme = hmit->second; - MergeEditLineList& mell = hme.choice(m_pldC!=nullptr); + MergeEditLineList& mell = hme.choice(m_pldC); if (!mell.empty()) iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() ); } @@ -1361,7 +1361,7 @@ void MergeResultWindow::slotMergeHistory() break; ++historyCount; HistoryMapEntry& hme = (*hlit)->second; - MergeEditLineList& mell = hme.choice(m_pldC!=nullptr); + MergeEditLineList& mell = hme.choice(m_pldC); if (!mell.empty()) iMLLStart->mergeEditLineList.splice( iMLLStart->mergeEditLineList.end(), mell, mell.begin(), mell.end() ); } @@ -1385,10 +1385,10 @@ void MergeResultWindow::slotRegExpAutoMerge() Diff3LineList::const_iterator id3l = i->id3l; if ( vcsKeywords.exactMatch( id3l->getString(A) ) && vcsKeywords.exactMatch( id3l->getString(B) ) && - (m_pldC==nullptr || vcsKeywords.exactMatch( id3l->getString(C) ))) + (!m_pldC || vcsKeywords.exactMatch( id3l->getString(C) ))) { MergeEditLine& mel = *i->mergeEditLineList.begin(); - mel.setSource( m_pldC==nullptr ? B : C, false ); + mel.setSource( !m_pldC ? B : C, false ); splitAtDiff3LineIdx( i->d3lLineIdx+1 ); } } @@ -1873,7 +1873,7 @@ void MergeResultWindow::updateSourceMask() } else { - enabledMask = m_pldC==nullptr ? 3 : 7; + enabledMask = !m_pldC ? 3 : 7; MergeLine& ml = *m_currentMergeLineIt; srcMask = 0; diff --git a/src/pdiff.cpp b/src/pdiff.cpp index b766778..ee9d5ae 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -240,7 +240,7 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF ProgressProxy pp; // When doing a full analysis in the directory-comparison, then the statistics-results // will be stored in the given TotalDiffStatus. Otherwise it will be 0. - bool bGUI = pTotalDiffStatus == nullptr; + bool bGUI = !pTotalDiffStatus; if (!pTotalDiffStatus) pTotalDiffStatus = &m_totalDiffStatus; @@ -2197,16 +2197,16 @@ void KDiff3App::slotUpdateAvailabilities() } - bool bDiffWindowVisible = m_pMainWidget != nullptr && m_pMainWidget->isVisible(); - bool bMergeEditorVisible = m_pMergeWindowFrame !=nullptr && m_pMergeWindowFrame->isVisible(); + bool bDiffWindowVisible = m_pMainWidget && m_pMainWidget->isVisible(); + bool bMergeEditorVisible = m_pMergeWindowFrame && m_pMergeWindowFrame->isVisible(); m_pDirectoryMergeWindow->updateAvailabilities( m_bDirCompare, bDiffWindowVisible, chooseA, chooseB, chooseC ); dirShowBoth->setEnabled( m_bDirCompare ); dirViewToggle->setEnabled( m_bDirCompare && - (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=nullptr && m_pMainWidget->isVisible() || - m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget!=nullptr && !m_pMainWidget->isVisible() && bTextDataAvailable ) + (!m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget && m_pMainWidget->isVisible() || + m_pDirectoryMergeSplitter->isVisible() && m_pMainWidget && !m_pMainWidget->isVisible() && bTextDataAvailable ) ); bool bDirWindowHasFocus = m_pDirectoryMergeSplitter->isVisible() && m_pDirectoryMergeWindow->hasFocus(); @@ -2258,11 +2258,11 @@ void KDiff3App::slotUpdateAvailabilities() overviewModeAB->setEnabled( m_bTripleDiff && bDiffWindowVisible ); overviewModeAC->setEnabled( m_bTripleDiff && bDiffWindowVisible ); overviewModeBC->setEnabled( m_bTripleDiff && bDiffWindowVisible ); - Overview::e_OverviewMode overviewMode = m_pOverview==nullptr ? Overview::eOMNormal : m_pOverview->getOverviewMode(); + Overview::e_OverviewMode overviewMode = !m_pOverview ? Overview::eOMNormal : m_pOverview->getOverviewMode(); overviewModeNormal->setChecked( overviewMode == Overview::eOMNormal ); overviewModeAB->setChecked( overviewMode == Overview::eOMAvsB ); overviewModeAC->setChecked( overviewMode == Overview::eOMAvsC ); overviewModeBC->setChecked( overviewMode == Overview::eOMBvsC ); - winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter!=nullptr ); + winToggleSplitOrientation->setEnabled( bDiffWindowVisible && m_pDiffWindowSplitter ); } -- cgit v1.2.3