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,7 @@
#pragma once
// STL includes
#include <string>
#include <QString>
// Utils includes
#include <utils/RgbChannelAdjustment.h>
@@ -12,7 +12,7 @@ class ColorAdjustment
public:
/// Unique identifier for this color transform
std::string _id;
QString _id;
/// The BLACK (RGB-Channel) adjustment
RgbChannelAdjustment _rgbBlackAdjustment;

View File

@@ -2,7 +2,6 @@
#include <QObject>
#include <QTimer>
#include <string>
#include <QString>
#include <QStringList>

View File

@@ -128,7 +128,7 @@ public:
/// get filename of configfile
/// @return the current config filename
std::string getConfigFileName() { return _configFile.toStdString(); };
QString getConfigFileName() { return _configFile; };
/// register a input source to a priority channel
/// @param name uniq name of input source
@@ -210,13 +210,13 @@ public slots:
/// Returns the list with unique adjustment identifiers
/// @return The list with adjustment identifiers
///
const std::vector<std::string> & getAdjustmentIds() const;
const QStringList & getAdjustmentIds() const;
///
/// Returns the ColorAdjustment with the given identifier
/// @return The adjustment with the given identifier (or nullptr if the identifier does not exist)
///
ColorAdjustment * getAdjustment(const std::string& id);
ColorAdjustment * getAdjustment(const QString& id);
///
/// Returns MessageForwarder Object

View File

@@ -3,7 +3,6 @@
// STL includes
#include <ctime>
#include <string>
#include <vector>
// Local includes

View File

@@ -25,8 +25,8 @@ public:
MessageForwarder();
~MessageForwarder();
void addJsonSlave(std::string slave);
void addProtoSlave(std::string slave);
void addJsonSlave(QString slave);
void addProtoSlave(QString slave);
bool protoForwardingEnabled();
bool jsonForwardingEnabled();