diff --git a/lib/appbase/main.pro b/lib/appbase/main.pro index d590517e..0a37e1f0 100644 --- a/lib/appbase/main.pro +++ b/lib/appbase/main.pro @@ -34,14 +34,7 @@ macx { } } -include(../warnings.pri) -include(../lib/winsdk.pri) -include(../lib/fmt.pri) -include(../lib/boost.pri) -include(../lib/rapidjson.pri) -include(../lib/serialize.pri) -include(../lib/signals.pri) -include(../lib/settings.pri) +include($$PWD/appbase/warnings.pri) debug { DEFINES += QT_DEBUG @@ -66,6 +59,7 @@ SOURCES += \ $$PWD/singletons/Fonts.cpp \ $$PWD/util/FunctionEventFilter.cpp \ $$PWD/util/FuzzyConvert.cpp \ + $$PWD/util/Helpers.cpp \ $$PWD/util/WindowsHelper.cpp \ $$PWD/widgets/BaseWidget.cpp \ $$PWD/widgets/BaseWindow.cpp \ diff --git a/lib/appbase/util/Helpers.cpp b/lib/appbase/util/Helpers.cpp new file mode 100644 index 00000000..2c05778a --- /dev/null +++ b/lib/appbase/util/Helpers.cpp @@ -0,0 +1,38 @@ +#include "Helpers.hpp" + +#include + +namespace AB_NAMESPACE { + +QString CreateUUID() +{ + auto uuid = QUuid::createUuid(); + return uuid.toString(); +} + +QString createLink(const QString &url, bool file) +{ + return QString("" + + url + ""; +} + +QString createNamedLink(const QString &url, const QString &name, bool file) +{ + return QString("" + + name + ""; +} + +QString shortenString(const QString &str, unsigned maxWidth) +{ + auto shortened = QString(str); + + if (str.size() > int(maxWidth)) + { + shortened.resize(int(maxWidth)); + shortened += "..."; + } + + return shortened; +} + +} // namespace AB_NAMESPACE diff --git a/lib/appbase/util/Helpers.hpp b/lib/appbase/util/Helpers.hpp index 4106880c..a1038f78 100644 --- a/lib/appbase/util/Helpers.hpp +++ b/lib/appbase/util/Helpers.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace AB_NAMESPACE { @@ -11,37 +11,14 @@ auto fS(Args &&... args) return fmt::format(std::forward(args)...); } -static QString CreateUUID() -{ - auto uuid = QUuid::createUuid(); - return uuid.toString(); -} +QString CreateUUID(); -static QString createLink(const QString &url, bool file = false) -{ - return QString("" + - url + ""; -} +QString createLink(const QString &url, bool file = false); -static QString createNamedLink(const QString &url, const QString &name, - bool file = false) -{ - return QString("" + - name + ""; -} +QString createNamedLink(const QString &url, const QString &name, + bool file = false); -static QString shortenString(const QString &str, unsigned maxWidth = 50) -{ - auto shortened = QString(str); - - if (str.size() > int(maxWidth)) - { - shortened.resize(int(maxWidth)); - shortened += "..."; - } - - return shortened; -} +QString shortenString(const QString &str, unsigned maxWidth = 50); } // namespace AB_NAMESPACE