frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/utils/Process.cpp
View File

@@ -3,7 +3,6 @@
#include <QCoreApplication>
#include <QStringList>
#include <string>
#include <unistd.h>
#include <cstdio>
@@ -41,7 +40,7 @@ void restartHyperion(bool asNewProcess)
QByteArray command_exec(QString cmd, QByteArray data)
{
char buffer[128];
std::string result = "";
QString result = "";
std::shared_ptr<FILE> pipe(popen(cmd.toLocal8Bit().constData(), "r"), pclose);
if (pipe)
@@ -52,7 +51,7 @@ QByteArray command_exec(QString cmd, QByteArray data)
result += buffer;
}
}
return result.c_str();
return QSTRING_CSTR(result);
}
};