From 3b10bb195d918cd280539312af17bd415155f78e Mon Sep 17 00:00:00 2001
From: Stephan Eicher <stephan.eicher@check24.de>
Date: Fri, 23 Jul 2021 16:36:08 +0200
Subject: [PATCH] Use npos instead of -1

---
 src/control/LatexController.cpp                    | 4 ++--
 src/control/ScrollHandler.cpp                      | 2 +-
 src/gui/PageView.cpp                               | 4 ++--
 src/gui/dialog/backgroundSelect/PdfPagesDialog.cpp | 2 +-
 src/model/Document.cpp                             | 2 +-
 src/undo/InsertDeletePageUndoAction.cpp            | 2 +-
 src/undo/PageBackgroundChangedUndoAction.cpp       | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/control/LatexController.cpp b/src/control/LatexController.cpp
index 006cae82..e86e31cc 100644
--- a/src/control/LatexController.cpp
+++ b/src/control/LatexController.cpp
@@ -71,8 +71,8 @@ auto LatexController::findTexDependencies() -> LatexController::FindDependencySt
  */
 void LatexController::findSelectedTexElement() {
     this->doc->lock();
-    int pageNr = this->control->getCurrentPageNo();
-    if (pageNr == -1) {
+    auto pageNr = this->control->getCurrentPageNo();
+    if (pageNr == npos) {
         this->doc->unlock();
         return;
     }
diff --git a/src/control/ScrollHandler.cpp b/src/control/ScrollHandler.cpp
index df133bcd..2c2b802b 100644
--- a/src/control/ScrollHandler.cpp
+++ b/src/control/ScrollHandler.cpp
@@ -41,7 +41,7 @@ void ScrollHandler::scrollToPage(const PageRef& page, double top) {
     auto p = doc->indexOf(page);
     doc->unlock();
 
-    if (p != -1) {
+    if (p != npos) {
         scrollToPage(p, top);
     }
 }
diff --git a/src/gui/PageView.cpp b/src/gui/PageView.cpp
index 69967e45..5a49698a 100644
--- a/src/gui/PageView.cpp
+++ b/src/gui/PageView.cpp
@@ -128,9 +128,9 @@ auto XojPageView::searchTextOnPage(string& text, int* occures, double* top) -> b
             return true;
         }
 
-        int pNr = this->page->getPdfPageNr();
+        auto pNr = this->page->getPdfPageNr();
         XojPdfPageSPtr pdf = nullptr;
-        if (pNr != -1) {
+        if (pNr != npos) {
             Document* doc = xournal->getControl()->getDocument();
 
             doc->lock();
diff --git a/src/gui/dialog/backgroundSelect/PdfPagesDialog.cpp b/src/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
index 16633a32..c4a5627c 100644
--- a/src/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
+++ b/src/gui/dialog/backgroundSelect/PdfPagesDialog.cpp
@@ -24,7 +24,7 @@ PdfPagesDialog::PdfPagesDialog(GladeSearchpath* gladeSearchPath, Document* doc,
 
         if (p->getBackgroundType().isPdfPage()) {
             auto pdfPage = p->getPdfPageNr();
-            if (pdfPage >= 0 && pdfPage < static_cast<int>(elements.size())) {
+            if (pdfPage >= 0 && pdfPage < elements.size()) {
                 (dynamic_cast<PdfElementView*>(elements[p->getPdfPageNr()]))->setUsed(true);
             }
         }
diff --git a/src/model/Document.cpp b/src/model/Document.cpp
index 4ad2a803..0d48627e 100644
--- a/src/model/Document.cpp
+++ b/src/model/Document.cpp
@@ -258,7 +258,7 @@ auto Document::fillPageLabels(GtkTreeModel* treeModel, GtkTreePath* path, GtkTre
     auto page = doc->findPdfPage(link->dest->getPdfPage());
 
     gchar* pageLabel = nullptr;
-    if (page != -1) {
+    if (page != npos) {
         pageLabel = g_strdup_printf("%lu", page + 1);
     }
     gtk_tree_store_set(GTK_TREE_STORE(treeModel), iter, DOCUMENT_LINKS_COLUMN_PAGE_NUMBER, pageLabel, -1);
diff --git a/src/undo/InsertDeletePageUndoAction.cpp b/src/undo/InsertDeletePageUndoAction.cpp
index e6b9ec9b..3594c53a 100644
--- a/src/undo/InsertDeletePageUndoAction.cpp
+++ b/src/undo/InsertDeletePageUndoAction.cpp
@@ -70,7 +70,7 @@ auto InsertDeletePageUndoAction::deletePage(Control* control) -> bool {
     // It's not great practise but it works.
     // doc->lock();
     auto pNr = doc->indexOf(page);
-    if (pNr == -1) {
+    if (pNr == npos) {
         //	doc->unlock();
         // this should not happen
         return false;
diff --git a/src/undo/PageBackgroundChangedUndoAction.cpp b/src/undo/PageBackgroundChangedUndoAction.cpp
index 524b0e5e..4f76c33e 100644
--- a/src/undo/PageBackgroundChangedUndoAction.cpp
+++ b/src/undo/PageBackgroundChangedUndoAction.cpp
@@ -31,7 +31,7 @@ auto PageBackgroundChangedUndoAction::undo(Control* control) -> bool {
 
     Document* doc = control->getDocument();
     auto pageNr = doc->indexOf(this->page);
-    if (pageNr == -1) {
+    if (pageNr == npos) {
         return false;
     }
 
@@ -57,7 +57,7 @@ auto PageBackgroundChangedUndoAction::redo(Control* control) -> bool {
 
     auto pageNr = doc->indexOf(this->page);
 
-    if (pageNr == -1) {
+    if (pageNr == npos) {
         return false;
     }