diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp index d93785aa6..3c8808513 100644 --- a/src/lib/base/String.cpp +++ b/src/lib/base/String.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include namespace deskflow::string { @@ -140,14 +139,6 @@ std::string sprintf(const char *fmt, ...) return result; } -size_t stringToSizeType(const std::string &string) -{ - std::istringstream iss(string); - size_t value; - iss >> value; - return value; -} - // // CaselessCmp // diff --git a/src/lib/base/String.h b/src/lib/base/String.h index d5a9af93f..ab1b20089 100644 --- a/src/lib/base/String.h +++ b/src/lib/base/String.h @@ -40,12 +40,6 @@ Equivalent to sprintf() except the result is returned as a String. */ std::string sprintf(const char *fmt, ...); -//! Convert a string to a size type -/*! -Convert an a \c string to an size type -*/ -size_t stringToSizeType(const std::string &string); - //! Case-insensitive comparisons /*! This class provides case-insensitve comparison functions. diff --git a/src/lib/deskflow/ClipboardChunk.cpp b/src/lib/deskflow/ClipboardChunk.cpp index 613fd2728..6e8fee23f 100644 --- a/src/lib/deskflow/ClipboardChunk.cpp +++ b/src/lib/deskflow/ClipboardChunk.cpp @@ -74,7 +74,7 @@ ClipboardChunk::assemble(deskflow::IStream *stream, std::string &dataCached, Cli } if (mark == ChunkType::DataStart) { - s_expectedSize = deskflow::string::stringToSizeType(data); + s_expectedSize = QString::fromStdString(data).size(); LOG_DEBUG("start receiving clipboard data"); dataCached.clear(); return Started; diff --git a/src/unittests/base/StringTests.cpp b/src/unittests/base/StringTests.cpp index 7273d8de1..93e0264f5 100644 --- a/src/unittests/base/StringTests.cpp +++ b/src/unittests/base/StringTests.cpp @@ -9,8 +9,6 @@ #include "base/String.h" -#include - void StringTests::formatWithArgs() { const char *format = "%%%{1}=%{2}"; @@ -33,11 +31,4 @@ void StringTests::formatedString() QCOMPARE("answer=42", result); } -void StringTests::stringToInt() -{ - std::string number = "123"; - size_t value = deskflow::string::stringToSizeType(number); - QCOMPARE(value, 123); -} - QTEST_MAIN(StringTests) diff --git a/src/unittests/base/StringTests.h b/src/unittests/base/StringTests.h index 7b37e6ceb..da8889947 100644 --- a/src/unittests/base/StringTests.h +++ b/src/unittests/base/StringTests.h @@ -12,5 +12,4 @@ class StringTests : public QObject private Q_SLOTS: void formatWithArgs(); void formatedString(); - void stringToInt(); };