summaryrefslogtreecommitdiff
path: root/l10ntools/source/merge.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:18:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:30 +0100
commitaf9c3fa41ba16ae4dc5e7ccbf626c8701ae0aa19 (patch)
tree3da945e18a31540e01cb9242754204e8740125cd /l10ntools/source/merge.cxx
parent8980565881fcc484bb506b3135223b6a42aefbf0 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I87dbff06345f24064b87c375e5381cb27118e614
Diffstat (limited to 'l10ntools/source/merge.cxx')
-rw-r--r--l10ntools/source/merge.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index a8323be61884..e7b552222e6a 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -371,7 +371,7 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive
}
pResData->sGId = sOldG;
pResData->sId = sOldL;
- return NULL;
+ return nullptr;
}
MergeEntrys *MergeDataFile::GetMergeEntrys( ResData *pResData )
@@ -380,7 +380,7 @@ MergeEntrys *MergeDataFile::GetMergeEntrys( ResData *pResData )
MergeData *pData = GetMergeData( pResData );
if ( pData )
return pData->GetMergeEntries();
- return NULL;
+ return nullptr;
}
MergeEntrys *MergeDataFile::GetMergeEntrysCaseSensitive( ResData *pResData )
@@ -389,7 +389,7 @@ MergeEntrys *MergeDataFile::GetMergeEntrysCaseSensitive( ResData *pResData )
MergeData *pData = GetMergeData( pResData , true );
if ( pData )
return pData->GetMergeEntries();
- return NULL;
+ return nullptr;
}
void MergeDataFile::InsertEntry(
@@ -399,7 +399,7 @@ void MergeDataFile::InsertEntry(
const OString &rTITLE, const OString &rInFilename,
bool bFirstLang, bool bCaseSensitive )
{
- MergeData *pData = 0;
+ MergeData *pData = nullptr;
// search for MergeData
OString sKey = CreateKey(rTYP , rGID , rLID , rInFilename , bCaseSensitive);