migrate std::string to qstring + add sysinfo via json (#412)

* std::string -> qstring part 1

* more string migration

* more string migration ...

* ...

* more qstring mogrations
add sysinfo via json

* remove unneccessary includes

* integrate sysinfo into webui
This commit is contained in:
redPanther
2017-03-04 22:17:42 +01:00
committed by GitHub
parent 19f8928869
commit bfb9a08c80
90 changed files with 539 additions and 529 deletions

View File

@@ -1,7 +1,6 @@
#pragma once
#include <string>
#include <algorithm>
#include <QString>
/**
* Enumeration of the possible modes in which video can be playing (2D, 3D)
@@ -13,10 +12,10 @@ enum VideoMode
VIDEO_3DTAB
};
inline VideoMode parse3DMode(std::string videoMode)
inline VideoMode parse3DMode(QString videoMode)
{
// convert to lower case
std::transform(videoMode.begin(), videoMode.end(), videoMode.begin(), ::tolower);
videoMode = videoMode.toLower();
if (videoMode == "3DTAB")
{