aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2020-04-16 20:05:50 +1000
committerNeil <nyamatongwe@gmail.com>2020-04-16 20:05:50 +1000
commit300fadb03ce9a47e3b88233545b1a8cf6ff9cdb1 (patch)
tree1c5eccc915d555c171e0b7cb070a4a12b6a0b854
parent7ed3da415ec61719f9d1acdcc3359108688fed1b (diff)
downloadscintilla-mirror-300fadb03ce9a47e3b88233545b1a8cf6ff9cdb1.tar.gz
Specify that NotifyStyleNeeded is an override. Replace 0/NULL with nullptr.
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index b02c6ff78..9c87224ff 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -46,7 +46,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;
};
@@ -90,7 +90,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);
}
@@ -105,9 +105,9 @@ ScintillaDocument::~ScintillaDocument() {
doc->RemoveWatcher(docWatcher, doc);
doc->Release();
}
- pdoc = NULL;
+ pdoc = nullptr;
delete docWatcher;
- docWatcher = NULL;
+ docWatcher = nullptr;
}
void *ScintillaDocument::pointer() {
@@ -274,5 +274,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);
}