blob: 61fce0b40bef341f999aa42748d58166ff03fb04 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
commit 641da6a21ced8b1c1373aa1eb17a5667cdadbd58
Author: Daniel Maslowski <info@orangecms.org>
Date: Sun Oct 25 21:31:24 2020 +0100
remove redefinition of QString
This has been added in Qt 5.14. See also
https://github.com/linuxdeepin/deepin-system-monitor/issues/34#issuecomment-578397562
diff --git a/src/csv_parser.cpp b/src/csv_parser.cpp
index 154db8d..3421f9c 100644
--- a/src/csv_parser.cpp
+++ b/src/csv_parser.cpp
@@ -3,18 +3,6 @@
#include "csv_parser.h"
-namespace std
-{
- template <>
- struct hash<QString>
- {
- size_t operator()(const QString& s) const
- {
- return qHash(s);
- }
- };
-}
-
std::unordered_map<QString, const CSVParser::ParseTypes &> CSVParser::parse_types;
static QVariant convert_type(std::pair<std::string, QVariant::Type> type, QString value)
diff --git a/src/pony.h b/src/pony.h
index e6d4d92..ba35b40 100644
--- a/src/pony.h
+++ b/src/pony.h
@@ -38,18 +38,6 @@
class ConfigWindow;
-namespace std
-{
- template <>
- struct hash<QString>
- {
- size_t operator()(const QString& s) const
- {
- return qHash(s);
- }
- };
-}
-
class Pony : public QMainWindow, public std::enable_shared_from_this<Pony>
{
Q_OBJECT
|