diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-17 02:16:02 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-17 02:16:02 +0100 |
| commit | ba46d4526a6cb17242bc82ddaf88fca112f28742 (patch) | |
| tree | a3f61d9ce9406a4cbbe872e65104adaa260ec355 | |
| parent | 13d201581a10be0ca2a0523248a7348c712e0ad9 (diff) | |
compat: get rid of string literal operator
| -rw-r--r-- | compat/string-literal-operator.hpp | 9 | ||||
| -rw-r--r-- | compat/util.hpp | 1 | ||||
| -rw-r--r-- | ext-falcon-bms-linear-acc/falcon-bms-metadata.cpp | 2 | ||||
| -rw-r--r-- | logic/shortcuts.cpp | 3 | ||||
| -rw-r--r-- | migration/20180102_00-process-detector-separator.cpp | 2 |
5 files changed, 3 insertions, 14 deletions
diff --git a/compat/string-literal-operator.hpp b/compat/string-literal-operator.hpp deleted file mode 100644 index e957803c..00000000 --- a/compat/string-literal-operator.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include <QLatin1String> -#include <cstddef> - -static inline constexpr auto operator"" _qstr(const char* str, std::size_t N) -{ - return QLatin1String(str, int(N)); -} diff --git a/compat/util.hpp b/compat/util.hpp index f679afcf..a1976e35 100644 --- a/compat/util.hpp +++ b/compat/util.hpp @@ -3,7 +3,6 @@ #include "opentrack-library-path.h" #include "ndebug-guard.hpp" #include "run-in-thread.hpp" -#include "string-literal-operator.hpp" #include "meta.hpp" #include "functional.hpp" #include "macros.hpp" diff --git a/ext-falcon-bms-linear-acc/falcon-bms-metadata.cpp b/ext-falcon-bms-linear-acc/falcon-bms-metadata.cpp index 0ab80109..fa95447c 100644 --- a/ext-falcon-bms-linear-acc/falcon-bms-metadata.cpp +++ b/ext-falcon-bms-linear-acc/falcon-bms-metadata.cpp @@ -2,7 +2,7 @@ QString falcon_bms_acceleration_metadata::name() { - return "Falcon BMS linaer acceleration display"_qstr; + return "Falcon BMS linear acceleration display"; } QIcon falcon_bms_acceleration_metadata::icon() diff --git a/logic/shortcuts.cpp b/logic/shortcuts.cpp index be9ae87b..5ddefc1f 100644 --- a/logic/shortcuts.cpp +++ b/logic/shortcuts.cpp @@ -8,7 +8,6 @@ #include "shortcuts.h" #include "win32-shortcuts.h" -#include "compat/string-literal-operator.hpp" #include <QString> @@ -73,7 +72,7 @@ void Shortcuts::bind_shortcut(K &key, const key_opts& k, bool held) if (code != Qt::Key_unknown) win_key::from_qt(code, idx, mods); - key.guid = ""_qstr; + key.guid = ""; key.keycode = idx; key.held = held; key.ctrl = !!(mods & Qt::ControlModifier); diff --git a/migration/20180102_00-process-detector-separator.cpp b/migration/20180102_00-process-detector-separator.cpp index c1864adf..ddb01cb4 100644 --- a/migration/20180102_00-process-detector-separator.cpp +++ b/migration/20180102_00-process-detector-separator.cpp @@ -10,7 +10,7 @@ static constexpr auto OLD_UNIT_SEPARATOR = QChar(':'); static constexpr auto NEW_RECORD_SEPARATOR = QChar(0x1e); static constexpr auto NEW_UNIT_SEPARATOR = QChar(0x1f); -static constexpr QLatin1String KEY_NAME = "executable-list"_qstr; +static const QString KEY_NAME = "executable-list"; struct process_detector_record_separator : migration { |