diff options
| author | Niklas Goby | 2011-03-10 01:19:46 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-10 01:19:46 +0100 |
| commit | cfeacf02d585f299cc404eb5aa5b2618ed6a45b8 (patch) | |
| tree | 0e607c91d840764dd363e18ce0f86a80effcf312 | |
| parent | untested (diff) | |
| download | fbgui-cfeacf02d585f299cc404eb5aa5b2618ed6a45b8.tar.gz fbgui-cfeacf02d585f299cc404eb5aa5b2618ed6a45b8.tar.xz fbgui-cfeacf02d585f299cc404eb5aa5b2618ed6a45b8.zip | |
added a test getSysInfo("all") function
| -rw-r--r-- | src/fbgui.conf | 2 | ||||
| -rw-r--r-- | src/sysInfo.cpp | 7 | ||||
| -rw-r--r-- | src/sysInfo.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/fbgui.conf b/src/fbgui.conf index 2319dbd..1718021 100644 --- a/src/fbgui.conf +++ b/src/fbgui.conf @@ -1,3 +1,3 @@ [default] -url=http://132.230.4.3/test.html +url=http://132.230.4.3/mockup/index.html downloadDirectory=/downloads diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp index 8da1c46..a3151b9 100644 --- a/src/sysInfo.cpp +++ b/src/sysInfo.cpp @@ -18,6 +18,8 @@ QString sysInfo::getInfo(QString& infoName){ return getMACAddress(); else if (infoName == QString("ip")) return getIPAddress(); + else if (infoName == QString("all")) + return getAllInfos(); // still here? return "info_error"; } @@ -47,3 +49,8 @@ QString sysInfo::getIPAddress(){ // still here? return "ip_error"; } +// ------------------------------------------------------------------------------------------------ +QString sysInfo::getAllInfos(){ + + return "test"; +} diff --git a/src/sysInfo.h b/src/sysInfo.h index 86443b8..e389500 100644 --- a/src/sysInfo.h +++ b/src/sysInfo.h @@ -12,6 +12,7 @@ class sysInfo { private: QString getMACAddress(); QString getIPAddress(); + QString getAllInfos(); }; #endif // SYSTEMINFO_H |