diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-03-27 08:34:16 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-03-27 08:34:16 +1100 |
| commit | 39bd936c4ba5ee3ff5a0b82a86b87c2ca0aa2763 (patch) | |
| tree | cc33480d9fa92b3681b8e414b7422d03bd736c3e /gtk/ScintillaGTK.h | |
| parent | b67d2d947839355521a8fe044efef6d10f31e70d (diff) | |
| download | scintilla-mirror-39bd936c4ba5ee3ff5a0b82a86b87c2ca0aa2763.tar.gz | |
Backport: Replace NULL/0 with nullptr. Mark noexcept where simple.
Move some static functions into anonymous namespace.
Backport of changeset 7338:1238cda7364d.
Diffstat (limited to 'gtk/ScintillaGTK.h')
| -rw-r--r-- | gtk/ScintillaGTK.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h index 7cff34ff3..ab485ee96 100644 --- a/gtk/ScintillaGTK.h +++ b/gtk/ScintillaGTK.h @@ -99,7 +99,7 @@ private: TickReason reason; ScintillaGTK *scintilla; guint timer; - TimeThunk() : reason(tickCaret), scintilla(NULL), timer(0) {} + TimeThunk() : reason(tickCaret), scintilla(nullptr), timer(0) {} }; TimeThunk timers[tickDwell+1]; bool FineTickerRunning(TickReason reason) override; @@ -256,7 +256,7 @@ class GObjectWatcher { PLATFORM_ASSERT(obj == weakRef); Destroyed(); - weakRef = 0; + weakRef = nullptr; } static void WeakNotify(gpointer data, GObject *obj) { @@ -278,7 +278,7 @@ public: virtual void Destroyed() {} bool IsDestroyed() const { - return weakRef != 0; + return weakRef != nullptr; } }; |