aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ScintillaBase.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-10-11 16:38:05 +1100
committerNeil <nyamatongwe@gmail.com>2018-10-11 16:38:05 +1100
commitc804e5578b41b3523e5cb933fd40d08ba132b347 (patch)
tree44689f9ac11b536da1ecab469bea920ae8e0895b /src/ScintillaBase.cxx
parentc5dedff99f306588a7217d40a4281db7d1baffaa (diff)
downloadscintilla-mirror-c804e5578b41b3523e5cb933fd40d08ba132b347.tar.gz
Replace NULL and 0 with nullptr in clear cases of pure C++ code.
Diffstat (limited to 'src/ScintillaBase.cxx')
-rw-r--r--src/ScintillaBase.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 824bcdfeb..68cdd7f2b 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -443,12 +443,12 @@ int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) const {
const int item = ac.GetSelection();
if (item != -1) {
const std::string selected = ac.GetValue(item);
- if (buffer != NULL)
+ if (buffer)
memcpy(buffer, selected.c_str(), selected.length()+1);
return static_cast<int>(selected.length());
}
}
- if (buffer != NULL)
+ if (buffer)
*buffer = '\0';
return 0;
}
@@ -593,7 +593,7 @@ public:
}
LexState::LexState(Document *pdoc_) : LexInterface(pdoc_) {
- lexCurrent = 0;
+ lexCurrent = nullptr;
performingStyle = false;
interfaceVersion = lvRelease4;
lexLanguage = SCLEX_CONTAINER;
@@ -602,7 +602,7 @@ LexState::LexState(Document *pdoc_) : LexInterface(pdoc_) {
LexState::~LexState() {
if (instance) {
instance->Release();
- instance = 0;
+ instance = nullptr;
}
}
@@ -617,7 +617,7 @@ void LexState::SetLexerModule(const LexerModule *lex) {
if (lex != lexCurrent) {
if (instance) {
instance->Release();
- instance = 0;
+ instance = nullptr;
}
interfaceVersion = lvRelease4;
lexCurrent = lex;
@@ -632,7 +632,7 @@ void LexState::SetLexerModule(const LexerModule *lex) {
void LexState::SetLexer(uptr_t wParam) {
lexLanguage = static_cast<int>(wParam);
if (lexLanguage == SCLEX_CONTAINER) {
- SetLexerModule(0);
+ SetLexerModule(nullptr);
} else {
const LexerModule *lex = Catalogue::Find(lexLanguage);
if (!lex)
@@ -654,7 +654,7 @@ const char *LexState::DescribeWordListSets() {
if (instance) {
return instance->DescribeWordListSets();
} else {
- return 0;
+ return nullptr;
}
}
@@ -675,7 +675,7 @@ void *LexState::PrivateCall(int operation, void *pointer) {
if (pdoc && instance) {
return instance->PrivateCall(operation, pointer);
} else {
- return 0;
+ return nullptr;
}
}
@@ -683,7 +683,7 @@ const char *LexState::PropertyNames() {
if (instance) {
return instance->PropertyNames();
} else {
- return 0;
+ return nullptr;
}
}
@@ -699,7 +699,7 @@ const char *LexState::DescribeProperty(const char *name) {
if (instance) {
return instance->DescribeProperty(name);
} else {
- return 0;
+ return nullptr;
}
}
@@ -806,7 +806,7 @@ const char *LexState::NameOfStyle(int style) {
if (instance) {
return instance->NameOfStyle(style);
} else {
- return 0;
+ return nullptr;
}
}
@@ -814,7 +814,7 @@ const char *LexState::TagsOfStyle(int style) {
if (instance) {
return instance->TagsOfStyle(style);
} else {
- return 0;
+ return nullptr;
}
}
@@ -822,7 +822,7 @@ const char *LexState::DescriptionOfStyle(int style) {
if (instance) {
return instance->DescriptionOfStyle(style);
} else {
- return 0;
+ return nullptr;
}
}