Backport: Specify that NotifyStyleNeeded is an override. Replace 0/NULL with nullptr.

Backport of changeset 8149:080d259e014a.

1 files changed, 5 insertions, 5 deletions

diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index 1dc7c3040..036d819d4 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -45,7 +45,7 @@ public:
     void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) override;
     void NotifyModified(Document *doc, DocModification mh, void *userData) override;
     void NotifyDeleted(Document *doc, void *userData) noexcept override;
-    void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos);
+    void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) override;
     void NotifyLexerChanged(Document *doc, void *userData) override;
     void NotifyErrorOccurred(Document *doc, void *userData, int status) override;
 };
@@ -89,7 +89,7 @@ void WatcherHelper::NotifyErrorOccurred(Document *, void *, int status) {
 }
 
 ScintillaDocument::ScintillaDocument(QObject *parent, void *pdoc_) :
-    QObject(parent), pdoc(pdoc_), docWatcher(0) {
+    QObject(parent), pdoc(pdoc_), docWatcher(nullptr) {
     if (!pdoc) {
         pdoc = new Document(SC_DOCUMENTOPTION_DEFAULT);
     }
@@ -104,9 +104,9 @@ ScintillaDocument::~ScintillaDocument() {
         doc->RemoveWatcher(docWatcher, doc);
         doc->Release();
     }
-    pdoc = NULL;
+    pdoc = nullptr;
     delete docWatcher;
-    docWatcher = NULL;
+    docWatcher = nullptr;
 }
 
 void *ScintillaDocument::pointer() {
@@ -273,5 +273,5 @@ int ScintillaDocument::move_position_outside_char(int pos, int move_dir, bool ch
 }
 
 int ScintillaDocument::get_character(int pos) {
-    return (static_cast<Document *>(pdoc))->GetCharacterAndWidth(pos, NULL);
+    return (static_cast<Document *>(pdoc))->GetCharacterAndWidth(pos, nullptr);
 }