4 files changed, 0 insertions, 177 deletions
diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp
deleted file mode 100644
index 97c0355..0000000
--- a/src/server/util/global.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * global.cpp
- *
- *  Created on: 29.01.2013
- *      Author: sr
- */
-
-#include "global.h"
-#include <QDebug>
-
-QString Global::_sessionName = QString();
-QByteArray Global::_sessionNameArray = QByteArray();
-QMap<QString, Room*> Global::_rooms = QMap<QString, Room*>();
-QString Global::_currentRoom = QString();
-
-void Global::setSessionName(const QString& name)
-{
-	Global::_sessionName = name;
-	Global::_sessionNameArray = name.toUtf8();
-}
-
-void Global::setSessionName()
-{
-	const QString name = QString::number(qrand() % 9000 + 1000);
-	Global::_sessionName = name;
-	Global::_sessionNameArray = name.toUtf8();
-}
-
-void Global::setRooms(const QMap<QString, Room*>& roomList)
-{
-	Global::_rooms = roomList;
-}
-
-void Global::setCurrentRoom(QString room)
-{
-	Global::_currentRoom = room;
-}
-
-const Room* Global::getCurrentRoom()
-{
-	if (_rooms.contains(_currentRoom)) {
-		return _rooms[_currentRoom];
-	} else {
-		static Room* defaultRoom = NULL;
-		if (defaultRoom == NULL) {
-			defaultRoom = new Room(QMap<QString, QPoint>(), QSize(8, 6), QSize(1, 1), "", "");
-		}
-		return defaultRoom;
-	}
-}
-bool Global::manager_only = false;
-bool Global::_isExam = false;
-
-QString Global::_iniPath = "";
-
-QSharedPointer<QSettings> Global::getSettings()
-{
-	QSharedPointer<QSettings> set;
-	if (_iniPath == "") {
-		/* default location (system scope) */
-		set = QSharedPointer<QSettings>(new QSettings(QSettings::IniFormat, QSettings::SystemScope, "openslx/pvs2", "pvs2"));
-	} else {
-		/* use _iniPath to find ini file */
-		set = QSharedPointer<QSettings>(new QSettings(Global::_iniPath, QSettings::IniFormat));
-	}
-	set->setIniCodec("UTF-8");
-	return set;
-}
diff --git a/src/server/util/global.h b/src/server/util/global.h
deleted file mode 100644
index ce1c2ab..0000000
--- a/src/server/util/global.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * global.h
- *
- *  Created on: 29.01.2013
- *      Author: sr
- */
-
-#ifndef GLOBAL_H_
-#define GLOBAL_H_
-
-#include <QString>
-#include <QByteArray>
-#include <QMap>
-#include <QPair>
-#include <QSettings>
-#include <QPoint>
-#include <QSize>
-#include <QList>
-#include <QSharedPointer>
-
-struct Room {
-	Room(QMap<QString, QPoint> cPos, QSize grid, QSize client, QString image, QString tutor) :
-		clientPositions(cPos),
-		gridSize(grid),
-		clientSize(client),
-		imagePath(image),
-		tutorIP(tutor) {};
-	QMap<QString, QPoint> clientPositions;
-	QSize gridSize;
-	QSize clientSize;
-	QString imagePath;
-	QString tutorIP;
-};
-
-class Global
-{
-private:
-	Global() {}
-	~Global() {}
-
-	static QString _sessionName;
-	static QByteArray _sessionNameArray;
-	static QMap<QString, Room*> _rooms;
-	static QString _currentRoom;
-
-	static bool _isExam;
-	static QString _iniPath;
-
-public:
-	static const QString& sessionName() { return Global::_sessionName; }
-	static const QByteArray& sessionNameArray() { return Global::_sessionNameArray; }
-	static void setSessionName(const QString& name);
-	static void setSessionName();
-
-	static bool manager_only;
-
-	static void setRooms(const QMap<QString, Room*> & roomList);
-	static const QMap<QString, Room*> & getRooms()
-	{
-		return _rooms;
-	}
-
-	static void setIniPath(QString s) {_iniPath = s;};
-	static QString getIniPath() { return _iniPath; };
-	static QSharedPointer<QSettings> getSettings();
-
-	static bool isExam() { return _isExam; }
-	static void setExam(bool b) { _isExam = b; }
-	static void setCurrentRoom(QString room);
-	static const QString& getCurrentRoomName() { return _currentRoom; }
-
-
-	/* returns a pointer to the current room or a pointer to the constant "defaultRoom".
-	 * (NEVER returns NULL or undefined) */
-	static const Room* getCurrentRoom();
-};
-
-
-#endif /* GLOBAL_H_ */
diff --git a/src/server/util/util.cpp b/src/server/util/util.cpp
deleted file mode 100644
index 7ff9404..0000000
--- a/src/server/util/util.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Util.cpp
- *
- *  Created on: 18.01.2013
- *      Author: sr
- */
-
-#include "util.h"
-
-namespace Util
-{
-
-}
-
diff --git a/src/server/util/util.h b/src/server/util/util.h
deleted file mode 100644
index e7a918b..0000000
--- a/src/server/util/util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef UTIL_H_
-#define UTIL_H_
-
-// Helper for getting a settings object in various places, so if you ever change the organization, location,
-// file format or anything, you won't have to edit in 100 places.
-// Use like this:
-// settings.value("somekey")
-
-#define CERTSTORAGE ".config/openslx/pvs2/"
-
-namespace Util
-{
-
-}
-
-#endif /* UTIL_H_ */