summaryrefslogtreecommitdiffstats
path: root/src/sysinfo.h
diff options
context:
space:
mode:
authorNiklas Goby2011-04-18 09:43:34 +0200
committerNiklas Goby2011-04-18 09:43:34 +0200
commitd113dab715cea7e6f3da0a0a6e650298a6acc032 (patch)
tree65873adce9fa6401026b1b4c89f12a1e8868e3c2 /src/sysinfo.h
parentstarted to write a function for getting all available network (diff)
parentuniformed formatting... (diff)
downloadfbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.gz
fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.xz
fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts: src/sysinfo.h
Diffstat (limited to 'src/sysinfo.h')
-rw-r--r--src/sysinfo.h62
1 files changed, 30 insertions, 32 deletions
diff --git a/src/sysinfo.h b/src/sysinfo.h
index eac13fa..7b9cf17 100644
--- a/src/sysinfo.h
+++ b/src/sysinfo.h
@@ -1,19 +1,19 @@
/*
-# Copyright (c) 2010,2011 - RZ Uni Freiburg
-# Copyright (c) 2010,2011 - OpenSLX Project
-#
-# This program/file is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your feedback to feedback@openslx.org
-#
-# General information about OpenSLX can be found under http://openslx.org
-#
-#
-# Helper class to get system information.
-#
-*/
+ # Copyright (c) 2010,2011 - RZ Uni Freiburg
+ # Copyright (c) 2010,2011 - OpenSLX Project
+ #
+ # This program/file is free software distributed under the GPL version 2.
+ # See http://openslx.org/COPYING
+ #
+ # If you have any feedback please consult http://openslx.org/feedback and
+ # send your feedback to feedback@openslx.org
+ #
+ # General information about OpenSLX can be found under http://openslx.org
+ #
+ #
+ # Helper class to get system information.
+ #
+ */
#ifndef SYSINFO_H
#define SYSINFO_H
@@ -33,25 +33,23 @@ extern "C" {
class SysInfo {
public:
- SysInfo();
- ~SysInfo();
- // public access, valid infoName: "mac", "ip", ...
- const QString getInfo(const QString& infoName);
+ SysInfo();
+ ~SysInfo();
+ // public access, valid infoName: "mac", "ip", ...
+ const QString getInfo(const QString& infoName);
private:
- // private system information readers
- const QString getMACAddress();
- const QString getIPAddress();
- const QString getAllNetworkInterfaces()
- const QString getMainboardSerial();
- const QString getUsbVendorIdProductIdSerialNumber();
- QString getAllInfos();
- QString getScriptOutput(QString cmd);
-
-
- // JSon testing
- QJson::Serializer serializer;
- const QByteArray getNames();
+ // private system information readers
+ const QString getMACAddress();
+ const QString getIPAddress();
+ const QString getMainboardSerial();
+ const QString getUsbVendorIdProductIdSerialNumber();
+ QString getAllInfos();
+ QString getScriptOutput(QString cmd);
+
+ // JSon testing
+ QJson::Serializer serializer;
+ const QByteArray getNames();
};
#endif // SYSTINFO_H