Allow FORMAT_STR to use signed integers

xournalpp · Nov 15, 2023 · de5ccba · de5ccba
1 parent 19b6ec8
commit de5ccba
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 61 deletions.
diff --git a/src/core/control/xojfile/LoadHandler.cpp b/src/core/control/xojfile/LoadHandler.cpp
@@ -1047,8 +1047,7 @@ void LoadHandler::parserText(GMarkupParseContext* context, const gchar* text, gs
             } else {
                 g_warning("%s", FC(_F("xoj-File: {1}") % handler->filepath.string().c_str()));
                 g_warning("%s", FC(_F("Wrong number of pressure values, got {1}, expected {2}") %
-                                   as_signed(handler->pressureBuffer.size()) %
-                                   (as_signed(handler->stroke->getPointCount()) - 1)));
+                                   handler->pressureBuffer.size() % (handler->stroke->getPointCount() - 1)));
             }
             handler->pressureBuffer.clear();
         }

diff --git a/src/core/gui/SearchBar.cpp b/src/core/gui/SearchBar.cpp
@@ -126,11 +126,10 @@ void SearchBar::search(Fun next) {
         if (found) {
             control->getScrollHandler()->scrollToPage(page, matchRect);
             control->getScrollHandler();
-            gtk_label_set_text(
-                    GTK_LABEL(lbSearchState),
-                    (occurrences == 1 ? FC(_F("Text found once on page {1}") % (as_signed(page) + 1)) :
-                                        FC(_F("Text found {1} times on page {2} ({3} of {1})") %
-                                           as_signed(occurrences) % (as_signed(page) + 1) % as_signed(indexInPage))));
+            gtk_label_set_text(GTK_LABEL(lbSearchState),
+                               (occurrences == 1 ? FC(_F("Text found once on page {1}") % (page + 1)) :
+                                                   FC(_F("Text found {1} times on page {2} ({3} of {1})") %
+                                                      occurrences % (page + 1) % indexInPage)));
             return;
         }
         if (page == originalPage) {

diff --git a/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp b/src/core/gui/menus/menubar/RecentDocumentsSubmenu.cpp
@@ -39,7 +39,7 @@ auto createRecentMenuItem(const GtkRecentInfo* info, size_t i) {
 
     // escape underscore
     StringUtils::replaceAllChars(display_name, {replace_pair('_', "__")});
-    std::string label = FS(FORMAT_STR("{1}. {2}") % (as_signed(i) + 1) % display_name);
+    std::string label = FS(FORMAT_STR("{1}. {2}") % (i + 1) % display_name);
 
     std::string action = G_ACTION_NAMESPACE;
     action += OPEN_ACTION_NAME;

diff --git a/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp b/src/core/gui/toolbarMenubar/ToolPageSpinner.cpp
@@ -9,7 +9,6 @@
 #include "util/Assert.h"                          // for xoj_assert
 #include "util/gtk4_helper.h"                     // for gtk_box_append
 #include "util/i18n.h"                            // for FS, _, _F, C_F
-#include "util/safe_casts.h"                      // for as_signed
 
 ToolPageSpinner::ToolPageSpinner(std::string id, IconNameHelper iconNameHelper):
         AbstractToolItem(std::move(id)),
@@ -29,12 +28,12 @@ void ToolPageSpinner::setPageInfo(const size_t pageCount, const size_t pdfPage)
 }
 
 void ToolPageSpinner::updateLabels() {
-    std::string ofString = FS(C_F("Page {pagenumber} \"of {pagecount}\"", " of {1}") % as_signed(this->pageCount));
+    std::string ofString = FS(C_F("Page {pagenumber} \"of {pagecount}\"", " of {1}") % this->pageCount);
     if (this->pdfPage > 0) {
         if (this->orientation == GTK_ORIENTATION_HORIZONTAL) {
-            ofString += std::string(", ") + FS(_F("PDF Page {1}") % as_signed(this->pdfPage));
+            ofString += std::string(", ") + FS(_F("PDF Page {1}") % this->pdfPage);
         } else {
-            ofString += std::string("\n") + FS(_F("PDF {1}") % as_signed(this->pdfPage));
+            ofString += std::string("\n") + FS(_F("PDF {1}") % this->pdfPage);
         }
         gtk_label_set_text(GTK_LABEL(lbPageNo.get()), ofString.c_str());
     }

diff --git a/src/util/PlaceholderString.cpp b/src/util/PlaceholderString.cpp
@@ -1,55 +1,17 @@
 #include "util/PlaceholderString.h"
 
-#include <cstddef>    // for size_t
 #include <exception>  // for exception
-#include <utility>    // for move
 
 #include <glib.h>  // for g_error
 
 #include "util/safe_casts.h"  // for as_unsigned
 
-/**
- * Format String
- */
-class PlaceholderElementString: public PlaceholderElement {
-public:
-    explicit PlaceholderElementString(std::string text): text(std::move(text)) {}
-
-    auto format(std::string format) const -> std::string override { return text; }
-
-private:
-    std::string text;
-};
-
-/**
- * Format int
- */
-class PlaceholderElementInt: public PlaceholderElement {
-public:
-    explicit PlaceholderElementInt(int64_t value): value(value) {}
-
-    auto format(std::string format) const -> std::string override { return std::to_string(value); }
-
-private:
-    int64_t value;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 PlaceholderString::PlaceholderString(std::string text): text(std::move(text)) {}
 
-auto PlaceholderString::operator%(int64_t value) -> PlaceholderString& {
-    data.emplace_back(std::make_unique<PlaceholderElementInt>(value));
-    return *this;
-}
-
-auto PlaceholderString::operator%(std::string value) -> PlaceholderString& {
-    data.emplace_back(std::make_unique<PlaceholderElementString>(std::move(value)));
-    return *this;
-}
-
 auto PlaceholderString::formatPart(std::string format) const -> std::string {
     std::string formatDef;
 

diff --git a/src/util/include/util/PlaceholderString.h b/src/util/include/util/PlaceholderString.h
@@ -14,11 +14,15 @@
 
 #pragma once
 
-#include <cstdint>    // for int64_t
-#include <memory>     // for unique_ptr
-#include <ostream>    // for ostream
-#include <string>     // for string
-#include <vector>     // for vector
+#include <cstddef>  // for size_t
+#include <cstdint>  // for int64_t
+#include <memory>   // for unique_ptr
+#include <ostream>  // for ostream
+#include <string>   // for string
+#include <utility>  // for move
+#include <vector>   // for vector
+
+#include <glib.h>  // for g_error
 
 /**
  * Base class for Formatting
@@ -34,6 +38,35 @@ class PlaceholderElement {
     virtual auto format(std::string format) const -> std::string = 0;
 };
 
+
+/**
+ * Format String
+ */
+class PlaceholderElementString: public PlaceholderElement {
+public:
+    explicit PlaceholderElementString(std::string text): text(std::move(text)) {}
+
+    auto format(std::string format) const -> std::string override { return text; }
+
+private:
+    std::string text;
+};
+
+/**
+ * Format int
+ */
+template <typename T>
+class PlaceholderElementInt: public PlaceholderElement {
+public:
+    explicit PlaceholderElementInt(T value): value(value) {}
+
+    auto format(std::string format) const -> std::string override { return std::to_string(value); }
+
+private:
+    T value;
+};
+
+
 /**
  * Placeholder String, used for formatting. Support Placeholder like
  * {1}, {2} etc. Use {{ for {
@@ -42,8 +75,15 @@ struct PlaceholderString {
     PlaceholderString(std::string text);
 
     // Placeholder methods
-    PlaceholderString& operator%(int64_t value);
-    PlaceholderString& operator%(std::string value);
+    template <typename T>
+    auto operator%(T value) -> PlaceholderString& {
+        if constexpr (std::is_integral_v<T>) {
+            data.emplace_back(std::make_unique<PlaceholderElementInt<T>>(value));
+        } else {
+            data.emplace_back(std::make_unique<PlaceholderElementString>(std::move(value)));
+        }
+        return *this;
+    }
 
     // Process Method
     std::string str() const;

diff --git a/src/util/serializing/ObjectInputStream.cpp b/src/util/serializing/ObjectInputStream.cpp
@@ -132,16 +132,16 @@ auto ObjectInputStream::readImage() -> std::string {
 
 void ObjectInputStream::checkType(char type) {
     if (istream.str().size() < 2) {
-        throw InputStreamException(FS(FORMAT_STR("End reached, but try to read {1}, index {2} of {3}") % getType(type) %
-                                      (uint32_t)pos() % (uint32_t)len),
-                                   __FILE__, __LINE__);
+        throw InputStreamException(
+                FS(FORMAT_STR("End reached, but try to read {1}, index {2} of {3}") % getType(type) % pos() % len),
+                __FILE__, __LINE__);
     }
     char t = 0, underscore = 0;
     istream >> underscore >> t;
 
     if (underscore != '_') {
         throw InputStreamException(FS(FORMAT_STR("Expected type signature of {1}, index {2} of {3}, but read '{4}'") %
-                                      getType(type) % ((uint32_t)pos() + 1) % (uint32_t)len % underscore),
+                                      getType(type) % (pos() + 1) % len % underscore),
                                    __FILE__, __LINE__);
     }
 

diff --git a/test/unit_tests/util/I18nTest.cpp b/test/unit_tests/util/I18nTest.cpp
@@ -64,3 +64,18 @@ TEST(UtilI18n, test3) {
     string msg = FS(FORMAT_STR(" of {1}{2}") % 5 % 6);
     EXPECT_EQ(std::string(" of 56"), msg);
 }
+
+TEST(UtilI18n, test16bit) {
+    string msg = FS(FORMAT_STR("{1} = {2} and {3}") % 60123 % 60123U % -65536);
+    EXPECT_EQ(std::string("60123 = 60123 and -65536"), msg);
+}
+
+TEST(UtilI18n, test32bit) {
+    string msg = FS(FORMAT_STR("{1} and {2}") % 4294967295U % -12345678);
+    EXPECT_EQ(std::string("4294967295 and -12345678"), msg);
+}
+
+TEST(UtilI18n, test64bit) {
+    string msg = FS(FORMAT_STR("{1} and {2}") % 1234567890123456789U % -1234567890123456789);
+    EXPECT_EQ(std::string("1234567890123456789 and -1234567890123456789"), msg);
+}