diff options
| author | Jonathan Bauer | 2011-03-10 16:10:42 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-10 16:10:42 +0100 |
| commit | 550a86ff4852d247d07c35c4a3d6730b6ffa52e7 (patch) | |
| tree | 4735a792e713b877ffac528f91805d6c129c8d7d /src/sysInfo.cpp | |
| parent | test function that returns a json, use: fbgui.getNames() (diff) | |
| parent | now the getAllInfo() method works. We just return a String (diff) | |
| download | fbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.tar.gz fbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.tar.xz fbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
src/sysInfo.cpp
Diffstat (limited to 'src/sysInfo.cpp')
| -rw-r--r-- | src/sysInfo.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp index 19117a5..4cf7d0e 100644 --- a/src/sysInfo.cpp +++ b/src/sysInfo.cpp @@ -21,6 +21,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"; } @@ -43,11 +45,13 @@ QString sysInfo::getIPAddress(){ QList<QHostAddress> addrlist = qni.allAddresses(); // This is does not return the right IP atm... foreach(QHostAddress addr, addrlist){ - if (addr.protocol() == QAbstractSocket::IPv4Protocol) + if (addr.protocol() == QAbstractSocket::IPv4Protocol && addr != QHostAddress::LocalHost){ qDebug() << "eth0: IPv4 Address: " << addr.toString(); return addr.toString(); + } } // still here? + qDebug() << "ip_error"; return "ip_error"; } QByteArray sysInfo::getNames(){ @@ -69,4 +73,10 @@ QByteArray sysInfo::getNames(){ qDebug() << json; return json; + +// ------------------------------------------------------------------------------------------------ +QString sysInfo::getAllInfos(){ + QString tmp = "\"mac\":\"" + getMACAddress() + "\", \"ip\":\"" + getIPAddress() +"\""; + + return tmp; } |