[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libkomparediff2] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2017-10-10 1:12:04
Message-ID: E1e1j5Y-0007xx-4J () code ! kde ! org
[Download RAW message or body]
Git commit 55f6b547a4d12ae1c9ebe6ac88e63598f611ae27 by Friedrich W. H. Kossebau.
Committed on 10/10/2017 at 00:13.
Pushed by kossebau into branch 'master'.
Use nullptr
M +5 -5 diffmodel.cpp
M +2 -2 kompare.h
M +23 -23 komparemodellist.cpp
M +1 -1 komparemodellist.h
M +2 -2 kompareprocess.cpp
M +6 -6 levenshteintable.h
M +1 -1 parser.cpp
M +1 -1 parser.h
M +9 -9 parserbase.cpp
M +1 -1 parserbase.h
M +6 -6 tests/interactivedifftest.cpp
https://commits.kde.org/libkomparediff2/55f6b547a4d12ae1c9ebe6ac88e63598f611ae27
diff --git a/diffmodel.cpp b/diffmodel.cpp
index 0db8793..7ecdbf9 100644
--- a/diffmodel.cpp
+++ b/diffmodel.cpp
@@ -47,7 +47,7 @@ DiffModel::DiffModel( const QString& source, const QString& \
destination ) : m_destinationRevision( "" ),
m_appliedCount( 0 ),
m_diffIndex( 0 ),
- m_selectedDifference( 0 ),
+ m_selectedDifference(nullptr),
m_blended( false )
{
splitSourceInPathAndFileName();
@@ -67,7 +67,7 @@ DiffModel::DiffModel() :
m_destinationRevision( "" ),
m_appliedCount( 0 ),
m_diffIndex( 0 ),
- m_selectedDifference( 0 ),
+ m_selectedDifference(nullptr),
m_blended( false )
{
}
@@ -75,7 +75,7 @@ DiffModel::DiffModel() :
/** */
DiffModel::~DiffModel()
{
- m_selectedDifference = 0;
+ m_selectedDifference = nullptr;
qDeleteAll( m_hunks );
qDeleteAll( m_differences );
@@ -216,7 +216,7 @@ Difference* DiffModel::prevDifference()
}
else
{
- m_selectedDifference = 0;
+ m_selectedDifference = nullptr;
m_diffIndex = 0;
qCDebug(LIBKOMPAREDIFF2) << "m_diffIndex = " << m_diffIndex;
}
@@ -234,7 +234,7 @@ Difference* DiffModel::nextDifference()
}
else
{
- m_selectedDifference = 0;
+ m_selectedDifference = nullptr;
m_diffIndex = 0; // just for safety...
qCDebug(LIBKOMPAREDIFF2) << "m_diffIndex = " << m_diffIndex;
}
diff --git a/kompare.h b/kompare.h
index 484c36b..e8aae26 100644
--- a/kompare.h
+++ b/kompare.h
@@ -91,8 +91,8 @@ namespace Kompare
QUrl _destination = QUrl(),
QString _localSource = QString(),
QString _localDestination = QString(),
- QTemporaryDir* _sourceQTempDir = 0,
- QTemporaryDir* _destinationQTempDir = 0,
+ QTemporaryDir* _sourceQTempDir = nullptr,
+ QTemporaryDir* _destinationQTempDir = nullptr,
uint _depth = 0,
bool _applied = true
);
diff --git a/komparemodellist.cpp b/komparemodellist.cpp
index 065d78b..f698b5b 100644
--- a/komparemodellist.cpp
+++ b/komparemodellist.cpp
@@ -56,14 +56,14 @@ using namespace Diff2;
KompareModelList::KompareModelList( DiffSettings* diffSettings, QWidget* \
widgetForKIO, QObject* parent, const char* name, bool isReadWrite) : QObject( parent \
),
- m_diffProcess( 0 ),
+ m_diffProcess(nullptr),
m_diffSettings( diffSettings ),
- m_models( 0 ),
- m_selectedModel( 0 ),
- m_selectedDifference( 0 ),
+ m_models(nullptr),
+ m_selectedModel(nullptr),
+ m_selectedDifference(nullptr),
m_modelIndex( 0 ),
- m_info( 0 ),
- m_textCodec( 0 ),
+ m_info(nullptr),
+ m_textCodec(nullptr),
m_widgetForKIO( widgetForKIO ),
m_isReadWrite( isReadWrite )
{
@@ -112,9 +112,9 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, \
QWidget* widgetF
KompareModelList::~KompareModelList()
{
- m_selectedModel = 0;
- m_selectedDifference = 0;
- m_info = 0;
+ m_selectedModel = nullptr;
+ m_selectedDifference = nullptr;
+ m_info = nullptr;
delete m_models;
}
@@ -521,7 +521,7 @@ void KompareModelList::slotDiffProcessFinished( bool success )
}
m_diffProcess->deleteLater();
- m_diffProcess = 0;
+ m_diffProcess = nullptr;
}
void KompareModelList::slotDirectoryChanged( const QString& /*dir*/ )
@@ -666,7 +666,7 @@ bool KompareModelList::saveDiff( const QString& url, QString \
directory, DiffSett emit error( i18n( "Could not open a temporary file." ) );
m_diffTemp->remove();
delete m_diffTemp;
- m_diffTemp = 0;
+ m_diffTemp = nullptr;
return false;
}
@@ -708,10 +708,10 @@ void KompareModelList::slotWriteDiffOutput( bool success )
m_diffTemp->remove();
delete m_diffTemp;
- m_diffTemp = 0;
+ m_diffTemp = nullptr;
delete m_diffProcess;
- m_diffProcess = 0;
+ m_diffProcess = nullptr;
}
void KompareModelList::slotSelectionChanged( const Diff2::DiffModel* model, const \
Diff2::Difference* diff ) @@ -772,7 +772,7 @@ void \
KompareModelList::slotSelectionChanged( const Diff2::Difference* diff )
void KompareModelList::slotPreviousModel()
{
- if ( ( m_selectedModel = prevModel() ) != 0 )
+ if ((m_selectedModel = prevModel()) != nullptr)
{
m_selectedDifference = m_selectedModel->firstDifference();
}
@@ -789,7 +789,7 @@ void KompareModelList::slotPreviousModel()
void KompareModelList::slotNextModel()
{
- if ( ( m_selectedModel = nextModel() ) != 0 )
+ if ((m_selectedModel = nextModel()) != nullptr)
{
m_selectedDifference = m_selectedModel->firstDifference();
}
@@ -836,7 +836,7 @@ DiffModel* KompareModelList::prevModel()
}
else
{
- m_selectedModel = 0;
+ m_selectedModel = nullptr;
m_modelIndex = 0;
qCDebug(LIBKOMPAREDIFF2) << "m_modelIndex = " << m_modelIndex;
}
@@ -854,7 +854,7 @@ DiffModel* KompareModelList::nextModel()
}
else
{
- m_selectedModel = 0;
+ m_selectedModel = nullptr;
m_modelIndex = 0;
qCDebug(LIBKOMPAREDIFF2) << "m_modelIndex = " << m_modelIndex;
}
@@ -870,7 +870,7 @@ KActionCollection* KompareModelList::actionCollection() const
void KompareModelList::slotPreviousDifference()
{
qCDebug(LIBKOMPAREDIFF2) << "slotPreviousDifference called";
- if ( ( m_selectedDifference = m_selectedModel->prevDifference() ) != 0 )
+ if ((m_selectedDifference = m_selectedModel->prevDifference()) != nullptr)
{
emit setSelection( m_selectedDifference );
emit setStatusBarModelInfo( findModel( m_selectedModel ), \
m_selectedModel->findDifference( m_selectedDifference ), modelCount(), \
differenceCount(), m_selectedModel->appliedCount() ); @@ -880,7 +880,7 @@ void \
KompareModelList::slotPreviousDifference()
qCDebug(LIBKOMPAREDIFF2) << "**** no previous difference... ok lets find the \
previous model...";
- if ( ( m_selectedModel = prevModel() ) != 0 )
+ if ((m_selectedModel = prevModel()) != nullptr)
{
m_selectedDifference = m_selectedModel->lastDifference();
@@ -905,7 +905,7 @@ void KompareModelList::slotPreviousDifference()
void KompareModelList::slotNextDifference()
{
qCDebug(LIBKOMPAREDIFF2) << "slotNextDifference called";
- if ( ( m_selectedDifference = m_selectedModel->nextDifference() ) != 0 )
+ if ((m_selectedDifference = m_selectedModel->nextDifference()) != nullptr)
{
emit setSelection( m_selectedDifference );
emit setStatusBarModelInfo( findModel( m_selectedModel ), \
m_selectedModel->findDifference( m_selectedDifference ), modelCount(), \
differenceCount(), m_selectedModel->appliedCount() ); @@ -915,7 +915,7 @@ void \
KompareModelList::slotNextDifference()
qCDebug(LIBKOMPAREDIFF2) << "**** no next difference... ok lets find the next \
model...";
- if ( ( m_selectedModel = nextModel() ) != 0 )
+ if ((m_selectedModel = nextModel()) != nullptr)
{
m_selectedDifference = m_selectedModel->firstDifference();
@@ -1065,8 +1065,8 @@ bool KompareModelList::blendFile( DiffModel* model, const \
QString& fileContents qCDebug(LIBKOMPAREDIFF2) << "Hunks in hunklist: " << \
hunks->count(); DiffHunkListIterator hunkIt = hunks->begin();
- DiffHunk* newHunk = 0;
- Difference* newDiff = 0;
+ DiffHunk* newHunk = nullptr;
+ Difference* newDiff = nullptr;
// FIXME: this approach is not very good, we should first check if the hunk applies \
cleanly // and without offset and if not use that new linenumber with offset to \
compare against
diff --git a/komparemodellist.h b/komparemodellist.h
index 3d997a1..26f0842 100644
--- a/komparemodellist.h
+++ b/komparemodellist.h
@@ -41,7 +41,7 @@ class DIFF2_EXPORT KompareModelList : public QObject
{
Q_OBJECT
public:
- KompareModelList( DiffSettings* diffSettings, QWidget* widgetForKIO, QObject* \
parent, const char* name = 0, bool isReadWrite = true); + KompareModelList( \
DiffSettings* diffSettings, QWidget* widgetForKIO, QObject* parent, const char* name \
= nullptr, bool isReadWrite = true); ~KompareModelList();
public:
diff --git a/kompareprocess.cpp b/kompareprocess.cpp
index 6955bdb..735d711 100644
--- a/kompareprocess.cpp
+++ b/kompareprocess.cpp
@@ -62,8 +62,8 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, \
Kompare::DiffMode di : KProcess(),
m_diffSettings( diffSettings ),
m_mode( diffMode ),
- m_customString(0),
- m_textDecoder( 0 )
+ m_customString(nullptr),
+ m_textDecoder(nullptr)
{
// connect the signal that indicates that the proces has exited
connect( this, SIGNAL( finished( int, QProcess::ExitStatus ) ),
diff --git a/levenshteintable.h b/levenshteintable.h
index d747d2f..948ef32 100644
--- a/levenshteintable.h
+++ b/levenshteintable.h
@@ -79,7 +79,7 @@ template<class SequencePair> \
LevenshteinTable<SequencePair>::LevenshteinTable() m_height( 256 ),
m_size( m_height * m_width ),
m_table( new unsigned int[ m_size ] ),
-m_sequences(0)
+m_sequences(nullptr)
{
}
@@ -228,7 +228,7 @@ template<class SequencePair> void \
LevenshteinTable<SequencePair>::createListsOfM return;
}
- Marker* c = 0;
+ Marker* c = nullptr;
int n, nw, w, direction, currentValue;
while ( x > 0 && y > 0 )
@@ -249,7 +249,7 @@ template<class SequencePair> void \
LevenshteinTable<SequencePair>::createListsOfM if ( \
!m_sequences->markerListSecond().isEmpty() ) c = \
m_sequences->markerListSecond().first(); else
- c = 0;
+ c = nullptr;
if ( c && c->type() == Marker::End )
{
@@ -277,7 +277,7 @@ template<class SequencePair> void \
LevenshteinTable<SequencePair>::createListsOfM if ( \
!m_sequences->markerListSecond().isEmpty() ) c = \
m_sequences->markerListSecond().first(); else
- c = 0;
+ c = nullptr;
if ( c && c->type() == Marker::End )
{
@@ -296,7 +296,7 @@ template<class SequencePair> void \
LevenshteinTable<SequencePair>::createListsOfM if ( \
!m_sequences->markerListFirst().isEmpty() ) c = \
m_sequences->markerListFirst().first(); else
- c = 0;
+ c = nullptr;
if ( c && c->type() == Marker::End )
{
@@ -322,7 +322,7 @@ template<class SequencePair> void \
LevenshteinTable<SequencePair>::createListsOfM if ( \
!m_sequences->markerListFirst().isEmpty() ) c = \
m_sequences->markerListFirst().first(); else
- c = 0;
+ c = nullptr;
if ( c && c->type() == Marker::End )
{
diff --git a/parser.cpp b/parser.cpp
index 2ce4642..0659b99 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -87,7 +87,7 @@ DiffModelList* Parser::parse( QStringList& diffLines, bool* \
malformed ) break;
default:
// Nothing to delete, just leave...
- return 0L;
+ return nullptr;
}
m_format = parser->format();
diff --git a/parser.h b/parser.h
index e6bec77..6eae3cc 100644
--- a/parser.h
+++ b/parser.h
@@ -33,7 +33,7 @@ public:
~Parser();
public:
- DiffModelList* parse( QStringList& diffLines, bool* malformed = 0 );
+ DiffModelList* parse(QStringList& diffLines, bool* malformed = nullptr);
enum Kompare::Generator generator() const { return m_generator; };
enum Kompare::Format format() const { return m_format; };
diff --git a/parserbase.cpp b/parserbase.cpp
index c8dcad2..4dcbf8e 100644
--- a/parserbase.cpp
+++ b/parserbase.cpp
@@ -67,8 +67,8 @@ QString ParserBase::escapePath( QString path )
ParserBase::ParserBase( const KompareModelList* list, const QStringList& diff ) :
m_diffLines( diff ),
- m_currentModel( 0 ),
- m_models( 0 ),
+ m_currentModel(nullptr),
+ m_models(nullptr),
m_diffIterator( m_diffLines.begin() ),
m_singleFileDiff( false ),
m_malformed( false ),
@@ -113,7 +113,7 @@ ParserBase::ParserBase( const KompareModelList* list, const \
QStringList& diff ) ParserBase::~ParserBase()
{
if ( m_models )
- m_models = 0; // do not delete this, i pass it around...
+ m_models = nullptr; // do not delete this, i pass it around...
}
enum Kompare::Format ParserBase::determineFormat()
@@ -143,7 +143,7 @@ DiffModelList* ParserBase::parse( bool* malformed )
result = parseUnified();
break;
default: // Unknown and SideBySide for now
- result = 0;
+ result = nullptr;
break;
}
@@ -701,7 +701,7 @@ DiffModelList* ParserBase::parseContext()
else
{
delete m_models;
- return 0L;
+ return nullptr;
}
}
@@ -724,7 +724,7 @@ DiffModelList* ParserBase::parseEd()
else
{
delete m_models;
- return 0L;
+ return nullptr;
}
}
@@ -758,7 +758,7 @@ DiffModelList* ParserBase::parseNormal()
else
{
delete m_models;
- return 0L;
+ return nullptr;
}
}
@@ -781,7 +781,7 @@ DiffModelList* ParserBase::parseRCS()
else
{
delete m_models;
- return 0L;
+ return nullptr;
}
}
@@ -807,7 +807,7 @@ DiffModelList* ParserBase::parseUnified()
else
{
delete m_models;
- return 0L;
+ return nullptr;
}
}
diff --git a/parserbase.h b/parserbase.h
index 9a4449b..f382663 100644
--- a/parserbase.h
+++ b/parserbase.h
@@ -42,7 +42,7 @@ public:
public:
enum Kompare::Format format() { return determineFormat(); };
- DiffModelList* parse( bool* malformed = 0 );
+ DiffModelList* parse(bool* malformed = nullptr);
protected:
virtual bool parseContextDiffHeader();
diff --git a/tests/interactivedifftest.cpp b/tests/interactivedifftest.cpp
index bb7312d..1948b70 100644
--- a/tests/interactivedifftest.cpp
+++ b/tests/interactivedifftest.cpp
@@ -83,7 +83,7 @@ void InteractiveDiffTest::testSameLine()
void InteractiveDiffTest::testDifferenceContents()
{
QFETCH(QStringList, patch);
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
@@ -498,7 +498,7 @@ void InteractiveDiffTest::testLineNumbers_data()
void InteractiveDiffTest::testLineNumbers()
{
QFETCH(QStringList, patch);
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
@@ -644,7 +644,7 @@ void InteractiveDiffTest::testApplyUnapply()
"-delete6\n" <<
"+insert6\n" <<
" line8\n";
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
@@ -774,7 +774,7 @@ contextDiff1()
" if( ( pos = m_source.lastIndexOf( \"/\" ) ) >= 0 )\n" <<
" m_sourceFile = m_source.mid( pos+1, m_source.length() - pos );\n" <<
" else\n";
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
@@ -807,7 +807,7 @@ contextDiff2()
" m_destinationFile( "" ),\n" <<
" m_sourceTimestamp( "" ),\n";
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
@@ -834,7 +834,7 @@ void InteractiveDiffTest::testNormalDiff()
"< a\n" <<
"---\n" <<
"> b\n";
- Parser parser(0);
+ Parser parser(nullptr);
bool malformed;
DiffModelList* models = parser.parse(patch, &malformed);
QVERIFY(!malformed);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic