Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui

Conflicts:
	src/fbgui.cpp

1 files changed, 43 insertions, 0 deletions

diff --git a/src/sysinfo.h b/src/sysinfo.h
new file mode 100644
index 0000000..cbb002e
--- /dev/null
+++ b/src/sysinfo.h
@@ -0,0 +1,43 @@
+/*
+# 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
+
+#include "fbgui.h"
+#include <qjson/serializer.h>
+
+class SysInfo {
+public:
+	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();
+	QString getAllInfos();
+	QString getScriptOutput(QString cmd);
+
+	// JSon testing
+	QJson::Serializer serializer;
+	const QByteArray getNames();
+};
+
+#endif // SYSTINFO_H