root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Fixed MSVC & Qt5 compile issues

Browse Source
This commit is contained in:
Martin Tůma 2015-11-24 10:05:28 +01:00
parent f93b54aab0
commit b0cafe69d0
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/downloader.cpp
View File

@ -6,11 +6,11 @@
#include <QDebug> #include <QDebug>
#ifdef Q_OS_LINUX #if defined(Q_OS_LINUX)
#define PLATFORM_STR "Linux" #define PLATFORM_STR "Linux"
#elif Q_OS_WIN32 #elif defined(Q_OS_WIN32)
#define PLATFORM_STR "Windows" #define PLATFORM_STR "Windows"
#elif Q_OS_MAC #elif defined(Q_OS_MAC)
#define PLATFORM_STR "OS X" #define PLATFORM_STR "OS X"
#else #else
#define PLATFORM_STR "Unknown" #define PLATFORM_STR "Unknown"

5
src/ll.cpp
View File

@ -1,9 +1,14 @@
#include <cmath> #include <cmath>
#include "ll.h" #include "ll.h"
// MSVC workarounds
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#endif // M_PI #endif // M_PI
#if defined(_MSC_VER) && (_MSC_VER < 1800)
#define log2(n) (log(n)/log(2.0))
#endif
#define WGS84_RADIUS 6378137.0 #define WGS84_RADIUS 6378137.0
#define deg2rad(d) (((d)*M_PI)/180.0) #define deg2rad(d) (((d)*M_PI)/180.0)

2
src/maplist.cpp
View File

@ -28,7 +28,7 @@ QList<Map*> MapList::load(const QString &fileName)
QByteArray ba2 = list[1].trimmed(); QByteArray ba2 = list[1].trimmed();
mapList.append(new Map(QString::fromUtf8(ba1.data(), ba1.size()), mapList.append(new Map(QString::fromUtf8(ba1.data(), ba1.size()),
QString::fromAscii(ba2.data(), ba2.size()))); QString::fromLatin1(ba2.data(), ba2.size())));
ln++; ln++;
} }