Toolbox: Remove obsolete method stringOrNumberToQVariant()

tony-gm · Jun 6, 2019 · 7465840 · 7465840
1 parent 7c5a738
commit 7465840
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 43 deletions.
diff --git a/libs/librepcb/common/toolbox.cpp b/libs/librepcb/common/toolbox.cpp
@@ -143,15 +143,6 @@ QString Toolbox::incrementNumberInString(QString string) noexcept {
   return string % "1";
 }
 
-QVariant Toolbox::stringOrNumberToQVariant(const QString& string) noexcept {
-  bool isInt;
-  int  intval = string.toInt(&isInt, 10);
-  if (isInt) {
-    return QVariant(intval);
-  }
-  return QVariant(string);
-}
-
 QStringList Toolbox::expandRangesInString(const QString& string) noexcept {
   // Do NOT accept '+' and '-', they are considered as strings, not numbers!
   // For example in the range connector signals range "X-1..10" you expect

diff --git a/libs/librepcb/common/toolbox.h b/libs/librepcb/common/toolbox.h
@@ -138,15 +138,6 @@ class Toolbox final {
    */
   static QString incrementNumberInString(QString string) noexcept;
 
-  /**
-   * @brief Convert a numeric or non-numeric string to the corresponding
-   * QVariant
-   *
-   * @param string  The string to be converted
-   * @return A QVariant with either a QVariant::Int or a QVariant::String
-   */
-  static QVariant stringOrNumberToQVariant(const QString& string) noexcept;
-
   /**
    * @brief Expand ranges like "1..5" in a string to all its values
    *

diff --git a/tests/unittests/common/toolboxtest.cpp b/tests/unittests/common/toolboxtest.cpp
@@ -37,31 +37,6 @@ namespace tests {
 
 class ToolboxTest : public ::testing::Test {};
 
-/*******************************************************************************
- *  Test Methods
- ******************************************************************************/
-
-TEST(ToolboxTest, testStringOrNumberToQVariant_numeric) {
-  QString  string  = "1337";
-  QVariant variant = Toolbox::stringOrNumberToQVariant(string);
-  EXPECT_EQ(QVariant::Int, variant.type());
-  EXPECT_EQ(QVariant(1337), variant);
-}
-
-TEST(ToolboxTest, testStringOrNumberToQVariant_nonNumeric) {
-  QString  string  = "leet";
-  QVariant variant = Toolbox::stringOrNumberToQVariant(string);
-  EXPECT_EQ(QVariant::String, variant.type());
-  EXPECT_EQ(QVariant("leet"), variant);
-}
-
-TEST(ToolboxTest, testStringOrNumberToQVariant_mixed) {
-  QString  string  = "l33t";
-  QVariant variant = Toolbox::stringOrNumberToQVariant(string);
-  EXPECT_EQ(QVariant::String, variant.type());
-  EXPECT_EQ(QVariant("l33t"), variant);
-}
-
 /*******************************************************************************
  *  Parametrized incrementNumberInString() Tests
  ******************************************************************************/