diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-12-29 06:11:51 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-12-29 06:11:51 +0100 |
| commit | 7b4d9859006ac8de87d70edd18278b3b9dfa065a (patch) | |
| tree | e1f570c222b8c5f18e45324c8ece17839beb3758 | |
| parent | b8e7865a017363e9d3876539936a6f73310a99d9 (diff) | |
fix std::hash<QString>
Fixes #1015
| -rw-r--r-- | compat/qhash.hpp | 10 | ||||
| -rw-r--r-- | dinput/win32-joystick.hpp | 1 | ||||
| -rw-r--r-- | options/bundle.hpp | 2 | ||||
| -rw-r--r-- | options/connector.hpp | 3 | ||||
| -rw-r--r-- | options/group.hpp | 1 |
5 files changed, 2 insertions, 15 deletions
diff --git a/compat/qhash.hpp b/compat/qhash.hpp index c2be4fc5..e38ee056 100644 --- a/compat/qhash.hpp +++ b/compat/qhash.hpp @@ -1,14 +1,6 @@ #pragma once +#include <functional> #include <QString> #include <QHashFunctions> -namespace std { -template<> struct hash<QString> -{ - unsigned operator()(const QString& value) const - { - return qHash(value); - } -}; -} diff --git a/dinput/win32-joystick.hpp b/dinput/win32-joystick.hpp index 3aa6f315..82590db6 100644 --- a/dinput/win32-joystick.hpp +++ b/dinput/win32-joystick.hpp @@ -9,7 +9,6 @@ #include "dinput.hpp" #include "compat/timer.hpp" -#include "compat/qhash.hpp" #include "export.hpp" #include <memory> diff --git a/options/bundle.hpp b/options/bundle.hpp index d99ef06d..ce859bb1 100644 --- a/options/bundle.hpp +++ b/options/bundle.hpp @@ -24,8 +24,6 @@ #include <QDebug> -#include "compat/qhash.hpp" - #include "export.hpp" namespace options::detail { diff --git a/options/connector.hpp b/options/connector.hpp index e22cb20f..ffef2a3d 100644 --- a/options/connector.hpp +++ b/options/connector.hpp @@ -13,8 +13,7 @@ #include <QString> #include <QMutex> - -#include "compat/qhash.hpp" +#include <QHashFunctions> #include "export.hpp" diff --git a/options/group.hpp b/options/group.hpp index 93299b6e..751eee34 100644 --- a/options/group.hpp +++ b/options/group.hpp @@ -5,7 +5,6 @@ #include "compat/base-path.hpp" #include "compat/library-path.hpp" #include "compat/macros.hpp" -#include "compat/qhash.hpp" #include "export.hpp" #include <optional> |