aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-05-17 11:04:08 +1000
committerNeil <nyamatongwe@gmail.com>2018-05-17 11:04:08 +1000
commita3ac8760d2f9fd6aad9cee595df34a81909be0f0 (patch)
tree0b4fbab5616e4884b465acc9dfe43cc0649f74e2
parentda7a7a8065eca0f848434652530482bde6b2030e (diff)
downloadscintilla-mirror-a3ac8760d2f9fd6aad9cee595df34a81909be0f0.tar.gz
Backport: Use nullptr instead of 0 in headers as this diminishes the number of warnings.
Backport of changeset 6957:06ab85d42c89.
-rw-r--r--include/Platform.h4
-rw-r--r--lexlib/CharacterSet.h2
-rw-r--r--lexlib/StyleContext.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/include/Platform.h b/include/Platform.h
index d049ccc45..0cbca2f40 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -314,7 +314,7 @@ class Window {
protected:
WindowID wid;
public:
- Window() noexcept : wid(0), cursorLast(cursorInvalid) {
+ Window() noexcept : wid(nullptr), cursorLast(cursorInvalid) {
}
Window(const Window &source) = delete;
Window(Window &&) = delete;
@@ -327,7 +327,7 @@ public:
Window &operator=(Window &&) = delete;
virtual ~Window();
WindowID GetID() const noexcept { return wid; }
- bool Created() const noexcept { return wid != 0; }
+ bool Created() const noexcept { return wid != nullptr; }
void Destroy();
PRectangle GetPosition() const;
void SetPosition(PRectangle rc);
diff --git a/lexlib/CharacterSet.h b/lexlib/CharacterSet.h
index 5965f38ca..7c2a1fe48 100644
--- a/lexlib/CharacterSet.h
+++ b/lexlib/CharacterSet.h
@@ -59,7 +59,7 @@ public:
}
~CharacterSet() {
delete []bset;
- bset = 0;
+ bset = nullptr;
size = 0;
}
CharacterSet &operator=(const CharacterSet &other) {
diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h
index cdb3aa91f..6e457dd59 100644
--- a/lexlib/StyleContext.h
+++ b/lexlib/StyleContext.h
@@ -57,7 +57,7 @@ public:
StyleContext(Sci_PositionU startPos, Sci_PositionU length,
int initStyle, LexAccessor &styler_, char chMask='\377') :
styler(styler_),
- multiByteAccess(0),
+ multiByteAccess(nullptr),
endPos(startPos + length),
posRelative(0),
currentPosLastRelative(0x7FFFFFFF),
@@ -169,7 +169,7 @@ public:
}
Sci_Position diffRelative = n - offsetRelative;
Sci_Position posNew = multiByteAccess->GetRelativePosition(posRelative, diffRelative);
- const int chReturn = multiByteAccess->GetCharacterAndWidth(posNew, 0);
+ const int chReturn = multiByteAccess->GetCharacterAndWidth(posNew, nullptr);
posRelative = posNew;
currentPosLastRelative = currentPos;
offsetRelative = n;