From b12c4ff365b8868fe9a85e87da92bc30d4f640ee Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 17 Jan 2024 21:25:19 +1100 Subject: Fix reference from ScintillaDocument to Document to match change in 5.4.1 using IDocumentEditable for SCI_GETDOCPOINTER and SCI_SETDOCPOINTER. --- qt/ScintillaEdit/ScintillaDocument.cpp | 2 +- qt/ScintillaEdit/ScintillaDocument.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'qt') diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 73fa67bb4..977edc45f 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -89,7 +89,7 @@ void WatcherHelper::NotifyErrorOccurred(Document *, void *, Status status) { } ScintillaDocument::ScintillaDocument(QObject *parent, void *pdoc_) : - QObject(parent), pdoc(pdoc_), docWatcher(nullptr) { + QObject(parent), pdoc(static_cast(pdoc_)), docWatcher(nullptr) { if (!pdoc) { pdoc = new Document(DocumentOption::Default); } diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index 579990781..8108fd2fa 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -23,11 +23,16 @@ class WatcherHelper; #endif #endif +// Forward declaration +namespace Scintilla { + class IDocumentEditable; +} + class EXPORT_IMPORT_API ScintillaDocument : public QObject { Q_OBJECT - void *pdoc; + Scintilla::IDocumentEditable *pdoc; WatcherHelper *docWatcher; public: -- cgit v1.2.3