summaryrefslogtreecommitdiffstats
path: root/src/sysinfo.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2011-04-24 21:36:26 +0200
committerJonathan Bauer2011-04-24 21:36:26 +0200
commit03ac351f38316d8f923f3797aa7dd0deade7ed5d (patch)
treec01e300c7a92ce728df907fd85e1a514876b6037 /src/sysinfo.cpp
parentmore old tests... (diff)
downloadfbgui-03ac351f38316d8f923f3797aa7dd0deade7ed5d.tar.gz
fbgui-03ac351f38316d8f923f3797aa7dd0deade7ed5d.tar.xz
fbgui-03ac351f38316d8f923f3797aa7dd0deade7ed5d.zip
url status handling, 5sec delay before closing gui when exiting with failure (not actually returning 1 atm), lots of formatting...
Diffstat (limited to 'src/sysinfo.cpp')
-rw-r--r--src/sysinfo.cpp30
1 files changed, 11 insertions, 19 deletions
diff --git a/src/sysinfo.cpp b/src/sysinfo.cpp
index 2de7b92..4797a86 100644
--- a/src/sysinfo.cpp
+++ b/src/sysinfo.cpp
@@ -69,11 +69,9 @@ const QString SysInfo::getInfo(const QString& infoName) {
*/
const QString SysInfo::getMACAddress() {
// Returns MAC address of eth0 for now
- QNetworkInterface qni =
- QNetworkInterface::interfaceFromName(QString("eth0"));
+ QNetworkInterface qni = QNetworkInterface::interfaceFromName(QString("eth0"));
if (!qni.isValid()) {
- qxtLog->debug()
- << "[sysinfo] MAC Address: No interface matching \"eth0\" found.";
+ qxtLog->debug() << "[sysinfo] MAC Address: No interface matching \"eth0\" found.";
return "no_eth0";
}
//eth0_index = qni.index();
@@ -96,17 +94,15 @@ const QString SysInfo::getMACAddress() {
const QString SysInfo::getIPAddress() {
// Again for eth0 only at the moment.
// TODO: this doesn't quite work yet...
- QNetworkInterface qni =
- QNetworkInterface::interfaceFromName(QString("eth0"));
+ QNetworkInterface qni = QNetworkInterface::interfaceFromName(QString("eth0"));
QList<QHostAddress> addrlist = qni.allAddresses();
// This is does not return the right IP atm...
foreach(QHostAddress addr, addrlist)
- {
- if (addr.protocol() == QAbstractSocket::IPv4Protocol && addr
- != QHostAddress::LocalHost) {
- return addr.toString();
+ {
+ if (addr.protocol() == QAbstractSocket::IPv4Protocol && addr != QHostAddress::LocalHost) {
+ return addr.toString();
+ }
}
- }
// still here?
qxtLog->debug() << "[sysinfo] IP Address: ip_error";
return "ip_error";
@@ -171,8 +167,7 @@ QString SysInfo::getAllInfos() {
*/
const QString SysInfo::getMainboardSerial() {
QString out = "";
- struct sysfs_class_device *class_device = sysfs_open_class_device("dmi",
- "id");
+ struct sysfs_class_device *class_device = sysfs_open_class_device("dmi", "id");
struct dlist *attrlist = sysfs_get_classdev_attributes(class_device);
struct sysfs_device *device = sysfs_get_classdev_device(class_device);
@@ -253,22 +248,19 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
qxtLog->debug() << tag + "failed to get handler / fail to open device";
return "error";
}
- re = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber,
- string, sizeof(string));
+ re = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, string, sizeof(string));
if (re < 0) {
qxtLog->debug() << tag + "failed to get SerialNumber";
return "error";
}
infos.insert("serialnumber", QString((const char *) string));
- re = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string,
- sizeof(string));
+ re = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string, sizeof(string));
if (re < 0) {
qxtLog->debug() << tag + "failed to get Product";
return "error";
}
infos.insert("product", QString((const char *) string));
- re = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer,
- string, sizeof(string));
+ re = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer, string, sizeof(string));
if (re < 0) {
qxtLog->debug() << tag + "failed to get Product";
return "error";