[LyX features/feature/docbook] Fix two warnings in BufferView.

Thibaut Cuvelier tcuvelier at lyx.org
Wed Sep 2 22:11:34 UTC 2020


The branch, feature/docbook, has been updated.

- Log -----------------------------------------------------------------

commit 5b499bc05bfd6b140194f0b5a749ed6d58a45bf6
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Thu Sep 3 00:37:52 2020 +0200

    Fix two warnings in BufferView.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9085355..07fdbc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,17 @@ set(GNUWIN32_DIR D:/LyX/lyx-unstable/lyx-windows-deps-msvc2017)
 set(LYX_USE_QT "QT5")
 set(LYX_REQUIRE_SPELLCHECK true)
 
+set(QT_DIR D:/Qt/5.15.0/msvc2019_64)
+set(QT5_DIR D:/Qt/5.15.0/msvc2019_64)
+set(QT_MKSPECS_DIR D:/Qt/5.15.0/msvc2019_64/mkspecs)
+set(Qt5Concurrent_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Concurrent)
+set(Qt5Core_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Core)
+set(Qt5Gui_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Gui)
+set(Qt5Svg_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Svg)
+set(Qt5Widgets_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5Widgets)
+set(Qt5WinExtras_DIR D:/Qt/5.15.0/msvc2019_64/lib/cmake/Qt5WinExtras)
+set(LYX_WALL 1)
+
 set(LYX_PROJECT LyX)
 
 # Instruct cmake to not use gnu extensions,
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 75d8a4e..e75bc5e 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -947,7 +947,7 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter)
 	TextMetrics & tm = d->text_metrics_[bot.text()];
 
 	pos_type const max_pit = pos_type(bot.text()->paragraphs().size() - 1);
-	int bot_pit = bot.pit();
+	pos_type bot_pit = bot.pit();
 	if (bot_pit > max_pit) {
 		// FIXME: Why does this happen?
 		LYXERR0("bottom pit is greater that max pit: "

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt     |   11 +++++++++++
 src/BufferView.cpp |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Repository for new features


More information about the lyx-cvs mailing list