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,9 +1,5 @@
#pragma once
// stl includes
#include <string>
#include <list>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
@@ -48,7 +44,7 @@ public:
///
/// @return A list of error messages
///
const std::list<std::string> & getMessages() const;
const QStringList & getMessages() const;
private:
///
@@ -65,7 +61,7 @@ private:
///
/// @param[in] message The message to add to the queue
///
void setMessage(const std::string & message);
void setMessage(const QString & message);
private:
// attribute check functions
@@ -166,9 +162,9 @@ private:
/// ignore the required value in json schema
bool _ignoreRequired;
/// The current location into a json-configuration structure being checked
std::list<std::string> _currentPath;
QStringList _currentPath;
/// The result messages collected during the schema verification
std::list<std::string> _messages;
QStringList _messages;
/// Flag indicating an error occured during validation
bool _error;
};