From ad3942904e4e8dd997679cf7b47dcae0538b8a0a Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 8 Mar 2011 02:56:24 +0100
Subject: more

---
 src/fbgui.cpp   | 6 +++++-
 src/main.cpp    | 5 -----
 src/sysInfo.cpp | 4 ++--
 src/sysInfo.h   | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 821c05f..0524e5c 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -4,10 +4,14 @@
 
 #include <iostream>
 #include <QUrl>
-#include <QMap>
+#include <QDir>
 #include <QtWebKit>
 #include <QApplication>
 
+QUrl baseURL(DEFAULT_URL);
+QDir downloadDirectory("./downloads/");
+bool debug = false;
+
 fbgui::fbgui(QApplication *parent)
 {
 	/* Browser init. */
diff --git a/src/main.cpp b/src/main.cpp
index 4e6627b..2897403 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,11 +6,6 @@
 #include <iostream>
 #include "fbgui.h"
 
-
-QUrl baseURL(DEFAULT_URL);
-QDir downloadDirectory("./downloads/");
-bool debug = false;
-
 void printHelp()
 {
     // Prints usage information.
diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp
index 1866c27..c9dfa76 100644
--- a/src/sysInfo.cpp
+++ b/src/sysInfo.cpp
@@ -3,8 +3,6 @@
 #include <QTime>
 #include <QNetworkInterface>
 
-extern bool debug;
-
 sysInfo::sysInfo(){}
 sysInfo::~sysInfo(){}
 QString sysInfo::getInfo(QString& infoName){
@@ -13,6 +11,8 @@ QString sysInfo::getInfo(QString& infoName){
 		return getTime();
 	if (infoName == QString("MAC"))
 		return getMACAddress();
+	// still here? --> error
+	return "error";
 }
 QString sysInfo::getTime(){
 	return QTime::currentTime().toString("hh:mm:ss");
diff --git a/src/sysInfo.h b/src/sysInfo.h
index ced1d56..dc25a92 100644
--- a/src/sysInfo.h
+++ b/src/sysInfo.h
@@ -1,6 +1,6 @@
 #ifndef SYSINFO_H
 #define SYSINFO_H
-
+#include "fbgui.h"
 #include <QString>
 
 class sysInfo {
-- 
cgit v1.2.3-55-g7522