aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-05-31 11:18:20 +1000
committerNeil <nyamatongwe@gmail.com>2021-05-31 11:18:20 +1000
commitdd2e63b2de6e62634baf18e8c7b960941378954b (patch)
treed931e1ca52ce426e79c8c8aad23c13a982e97732
parent3c758435df823721b64fc9470e4f1d4ea0e2832c (diff)
downloadscintilla-mirror-dd2e63b2de6e62634baf18e8c7b960941378954b.tar.gz
Use Scintilla::Position type which widens to 64-bit on 64-bit systems to allow
documents larger than 2GB.
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp2
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.h22
2 files changed, 12 insertions, 12 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 68f808260..509f76d79 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -348,7 +348,7 @@ void ScintillaEditBase::mouseReleaseEvent(QMouseEvent *event)
sqt->ButtonUpWithModifiers(point, time.elapsed(), ModifiersOfKeyboard());
int pos = send(SCI_POSITIONFROMPOINT, point.x, point.y);
- int line = send(SCI_LINEFROMPOSITION, pos);
+ sptr_t line = send(SCI_LINEFROMPOSITION, pos);
int modifiers = QApplication::keyboardModifiers();
emit textAreaClicked(line, modifiers);
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index 8273ca497..9acc9c379 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -84,36 +84,36 @@ signals:
void horizontalRangeChanged(int max, int page);
void verticalRangeChanged(int max, int page);
void notifyChange();
- void linesAdded(int linesAdded);
+ void linesAdded(Scintilla::Position linesAdded);
// Clients can use this hook to add additional
// formats (e.g. rich text) to the MIME data.
void aboutToCopy(QMimeData *data);
// Scintilla Notifications
- void styleNeeded(int position);
+ void styleNeeded(Scintilla::Position position);
void charAdded(int ch);
void savePointChanged(bool dirty);
void modifyAttemptReadOnly();
void key(int key);
- void doubleClick(int position, int line);
+ void doubleClick(Scintilla::Position position, Scintilla::Position line);
void updateUi(Scintilla::Update updated);
- void modified(Scintilla::ModificationFlags type, int position, int length, int linesAdded,
- const QByteArray &text, int line, Scintilla::FoldLevel foldNow, Scintilla::FoldLevel foldPrev);
+ void modified(Scintilla::ModificationFlags type, Scintilla::Position position, Scintilla::Position length, Scintilla::Position linesAdded,
+ const QByteArray &text, Scintilla::Position line, Scintilla::FoldLevel foldNow, Scintilla::FoldLevel foldPrev);
void macroRecord(Scintilla::Message message, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
- void marginClicked(int position, Scintilla::KeyMod modifiers, int margin);
- void textAreaClicked(int line, int modifiers);
- void needShown(int position, int length);
+ void marginClicked(Scintilla::Position position, Scintilla::KeyMod modifiers, int margin);
+ void textAreaClicked(Scintilla::Position line, int modifiers);
+ void needShown(Scintilla::Position position, Scintilla::Position length);
void painted();
void userListSelection(); // Wants some args.
void uriDropped(const QString &uri);
void dwellStart(int x, int y);
void dwellEnd(int x, int y);
void zoom(int zoom);
- void hotSpotClick(int position, Scintilla::KeyMod modifiers);
- void hotSpotDoubleClick(int position, Scintilla::KeyMod modifiers);
+ void hotSpotClick(Scintilla::Position position, Scintilla::KeyMod modifiers);
+ void hotSpotDoubleClick(Scintilla::Position position, Scintilla::KeyMod modifiers);
void callTipClick();
- void autoCompleteSelection(int position, const QString &text);
+ void autoCompleteSelection(Scintilla::Position position, const QString &text);
void autoCompleteCancelled();
void focusChanged(bool focused);