Fixed MSVC 2012 build.

master
Pepa Rokos 7 years ago
parent 0bca412d27
commit 1c22eb3c0a

@ -1,6 +1,7 @@
#include "helper.h" #include "helper.h"
#include "define.h" #include "define.h"
#ifndef _WIN32
const QMap<QString, QString> Helper::m_numMap{ const QMap<QString, QString> Helper::m_numMap{
{"+", "1"}, {"+", "1"},
{"ě", "2"}, {"ě", "2"},
@ -13,6 +14,7 @@ const QMap<QString, QString> Helper::m_numMap{
{"í", "9"}, {"í", "9"},
{"é", "0"} {"é", "0"}
}; };
#endif
Helper::Helper() Helper::Helper()
{ {
@ -22,6 +24,20 @@ QString Helper::replaceByNumbers(const QString &str)
{ {
QString ret; QString ret;
#ifdef _WIN32
QMap<QString, QString> m_numMap;
m_numMap["+"] = "1";
m_numMap["ě"] = "2";
m_numMap["š"] = "3";
m_numMap["č"] = "4";
m_numMap["ř"] = "5";
m_numMap["ž"] = "6";
m_numMap["ý"] = "7";
m_numMap["á"] = "8";
m_numMap["í"] = "9";
m_numMap["é"] = "0";
#endif
std::for_each(ALL(str), [&](QChar c){ std::for_each(ALL(str), [&](QChar c){
QString replaced = m_numMap[c]; QString replaced = m_numMap[c];

@ -4,7 +4,9 @@
#include <QString> #include <QString>
#include <QMap> #include <QMap>
class Helper #include "core_global.h"
class CORESHARED_EXPORT Helper
{ {
public: public:
Helper(); Helper();
@ -12,7 +14,9 @@ public:
static QString replaceByNumbers(const QString &str); static QString replaceByNumbers(const QString &str);
private: private:
#ifndef _WIN32
static const QMap<QString, QString> m_numMap; static const QMap<QString, QString> m_numMap;
#endif
}; };
#endif // HELPER_H #endif // HELPER_H

@ -1,7 +1,9 @@
#ifndef IDASHBOARDWIDGET_H #ifndef IDASHBOARDWIDGET_H
#define IDASHBOARDWIDGET_H #define IDASHBOARDWIDGET_H
class IDashboardWidget #include "core_global.h"
class CORESHARED_EXPORT IDashboardWidget
{ {
public: public:
virtual void refresh() = 0; virtual void refresh() = 0;

@ -10,6 +10,10 @@
#include <seasonservice.h> #include <seasonservice.h>
#include <math.h> #include <math.h>
#ifdef _WIN32
inline double round(double value) { return value < 0 ? -std::floor(0.5 - value) : std::floor(0.5 + value); }
#endif
ShopService::ShopService() ShopService::ShopService()
{ {
} }

Loading…
Cancel
Save