summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-10 16:34:27 +0100
committerJonathan Bauer2011-03-10 16:34:27 +0100
commita43550c336b91eb1c8fa1733d4b89784aad42764 (patch)
tree12902b6918396b86d31a58b4f1440a4ed738a475
parentMerge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui (diff)
downloadfbgui-a43550c336b91eb1c8fa1733d4b89784aad42764.tar.gz
fbgui-a43550c336b91eb1c8fa1733d4b89784aad42764.tar.xz
fbgui-a43550c336b91eb1c8fa1733d4b89784aad42764.zip
successfull json test
-rw-r--r--src/sysInfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp
index 7e97560..ddd400a 100644
--- a/src/sysInfo.cpp
+++ b/src/sysInfo.cpp
@@ -23,6 +23,8 @@ QString sysInfo::getInfo(QString& infoName){
return getIPAddress();
else if (infoName == QString("all"))
return getAllInfos();
+ else if (infoName == QString("json"))
+ return getNames();
// still here?
return "info_error";
}
@@ -72,7 +74,6 @@ QByteArray sysInfo::getNames(){
qDebug() << json;
return json;
-}
}
// ------------------------------------------------------------------------------------------------