aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt
diff options
context:
space:
mode:
Diffstat (limited to 'qt')
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp4
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp8
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index 86f50db9d..5a6ef200c 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -45,7 +45,7 @@ public:
void NotifySavePoint(Document *doc, void *userData, bool atSavePoint);
void NotifyModified(Document *doc, DocModification mh, void *userData);
void NotifyDeleted(Document *doc, void *userData);
- void NotifyStyleNeeded(Document *doc, void *userData, int endPos);
+ void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos);
void NotifyLexerChanged(Document *doc, void *userData);
void NotifyErrorOccurred(Document *doc, void *userData, int status);
};
@@ -76,7 +76,7 @@ void WatcherHelper::NotifyModified(Document *, DocModification mh, void *) {
void WatcherHelper::NotifyDeleted(Document *, void *) {
}
-void WatcherHelper::NotifyStyleNeeded(Document *, void *, int endPos) {
+void WatcherHelper::NotifyStyleNeeded(Document *, void *, Sci::Position endPos) {
owner->emit_style_needed(endPos);
}
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 3b7db8002..fc1d40c74 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -239,7 +239,7 @@ bool ScintillaQt::ValidCodePage(int codePage) const
}
-void ScintillaQt::ScrollText(int linesToMove)
+void ScintillaQt::ScrollText(Sci::Line linesToMove)
{
int dy = vs.lineHeight * (linesToMove);
scrollArea->viewport()->scroll(0, dy);
@@ -257,7 +257,7 @@ void ScintillaQt::SetHorizontalScrollPos()
emit horizontalScrolled(xOffset);
}
-bool ScintillaQt::ModifyScrollBars(int nMax, int nPage)
+bool ScintillaQt::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage)
{
bool modified = false;
@@ -613,7 +613,7 @@ void ScintillaQt::StartDrag()
}
}
inDragDrop = ddNone;
- SetDragPosition(SelectionPosition(invalidPosition));
+ SetDragPosition(SelectionPosition(Sci::invalidPosition));
}
void ScintillaQt::CreateCallTipWindow(PRectangle rc)
@@ -740,7 +740,7 @@ void ScintillaQt::DragMove(const Point &point)
void ScintillaQt::DragLeave()
{
- SetDragPosition(SelectionPosition(invalidPosition));
+ SetDragPosition(SelectionPosition(Sci::invalidPosition));
}
void ScintillaQt::Drop(const Point &point, const QMimeData *data, bool move)
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index 0f8da8b1f..74d5eb770 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -107,7 +107,7 @@ private:
virtual void ScrollText(int linesToMove);
virtual void SetVerticalScrollPos();
virtual void SetHorizontalScrollPos();
- virtual bool ModifyScrollBars(int nMax, int nPage);
+ virtual bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage);
virtual void ReconfigureScrollBars();
void CopyToModeClipboard(const SelectionText &selectedText, QClipboard::Mode clipboardMode_);
virtual void Copy();