From f9d165687aac7423c86554b7e73ade99f9e1f3ea Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Mon, 26 Sep 2016 11:45:35 +0200
Subject: added the --config=FILE parameter and got rid of the SETTINGS macro.

---
 src/server/mainwindow/mainwindow.cpp | 52 ++++++++++++++++++------------------
 src/server/mainwindow/mainwindow.h   |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/server/mainwindow')

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index bed07f6..ae83dfb 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -118,9 +118,9 @@ MainWindow::MainWindow(QWidget* parent) :
     connect(ui->action_DeleteClient, SIGNAL(triggered()), this, SLOT(onDeleteClient()));
 
     /* In exam-mode: disable most features */
-    SETTINGS(conf);
-    if (conf.contains("examMode")) {
-        Global::setExam(conf.value("examMode").toBool());
+	QSharedPointer<QSettings> conf = Global::getSettings();
+    if (conf->contains("examMode")) {
+        Global::setExam(conf->value("examMode").toBool());
     }
 
     if (Global::isExam()) {
@@ -338,11 +338,11 @@ ConnectionFrame* MainWindow::createFrame(QString computerId, QPoint pxCoord, QPo
  * @param y
  * @return If loadPosition was successfull.
  */
-bool MainWindow::loadPosition(QSettings& settings, const QString& id, int& x, int& y)
+bool MainWindow::loadPosition(QSharedPointer<QSettings> settings, const QString& id, int& x, int& y)
 {
-	settings.beginGroup("client_position");
-	const QVariant retval = (settings.value(id));
-	settings.endGroup();
+	settings->beginGroup("client_position");
+	const QVariant retval = (settings->value(id));
+	settings->endGroup();
 	if (retval.type() != QVariant::Point)
 		return false;
 	const QPoint point(retval.toPoint());
@@ -399,51 +399,51 @@ void MainWindow::tryToUseRoomTemplate()
 {
     qDebug() << "tryToUseRoomTemplate()";
 	QMap<QString, Room* > roomsList;
-	SETTINGS(conf);
+	QSharedPointer<QSettings> conf = Global::getSettings();
 
-	if (!conf.contains("rooms")) { qDebug() << "Invalid config file (no rooms are set)!"; return; }
-	QStringList rooms = conf.value("rooms").toStringList();
+	if (!conf->contains("rooms")) { qDebug() << "Invalid config file (no rooms are set)!"; return; }
+	QStringList rooms = conf->value("rooms").toStringList();
 	qDebug() << rooms;
 
     QString myRoom = "";
 
 	for (QString roomId : rooms)
 	{
-		conf.beginGroup(roomId);
-		QString roomName = conf.value("name").toString();
+		conf->beginGroup(roomId);
+		QString roomName = conf->value("name").toString();
 
 		/* fallback to the old format where the room id was actually just the name */
 		if (roomName == "") {
 			roomName = roomId;
 		}
-		if (!conf.contains("mgrIP")) {
+		if (!conf->contains("mgrIP")) {
 			qDebug() << "Invalid config file (room " << roomName << " needs a mgrIP)!";
 			return;
 		}
         QMap<QString, QPoint> clientPositions;
 		// First store all room configurations in _rooms.
-		int size = conf.beginReadArray("client");
+		int size = conf->beginReadArray("client");
 		for (int j = 0; j < size; j++) {
-			conf.setArrayIndex(j);
+			conf->setArrayIndex(j);
 			// qDebug() << "ip: " << conf.value("ip").toString() << " pos: " << conf.value("pos").toPoint();
 			// roomsList[i].insert(conf.value("ip").toString(), conf.value("pos").toPoint());
-            clientPositions.insert(conf.value("ip").toString(), conf.value("pos").toPoint());
+            clientPositions.insert(conf->value("ip").toString(), conf->value("pos").toPoint());
 		}
-		conf.endArray();
+		conf->endArray();
 
         /* read backgroundImage */
-        QString image   = conf.contains("backgroundImage") ? conf.value("backgroundImage").toString() : "";
-		QString mgrIP   = conf.value("mgrIP").toString();
-        QString tutorIP = conf.value("tutorIP").toString();
+        QString image   = conf->contains("backgroundImage") ? conf->value("backgroundImage").toString() : "";
+		QString mgrIP   = conf->value("mgrIP").toString();
+        QString tutorIP = conf->value("tutorIP").toString();
         
         QSize gridSize;
         QSize clientSize(1,1);
         /* read some other properties of the room */
-        if (conf.contains("gridSize")) {
-            gridSize = conf.value("gridSize").toSize();
+        if (conf->contains("gridSize")) {
+            gridSize = conf->value("gridSize").toSize();
         }
-        if (conf.contains("clientSize")) {
-            clientSize = conf.value("clientSize").toSize();
+        if (conf->contains("clientSize")) {
+            clientSize = conf->value("clientSize").toSize();
         }
 
 		foreach (const QHostAddress &address, QNetworkInterface::allAddresses()) {
@@ -452,7 +452,7 @@ void MainWindow::tryToUseRoomTemplate()
                 myRoom = roomName;
 			}
 		}
-		conf.endGroup();
+		conf->endGroup();
 
         if (!gridSize.isValid()) {
             /* ok, let's choose the minimum gridSize to fit all clients */
@@ -1280,7 +1280,7 @@ void MainWindow::onClientAuthenticated(Client* client)
 	int x, y;
 	bool ok;
 
-	SETTINGS(sys);
+	QSharedPointer<QSettings> sys = Global::getSettings();
 	ok = loadPosition(sys, client->ip(), x, y);
 
 	if (x >= _tilesX || y >= _tilesY)
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 98f5df4..b3b6f13 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -76,7 +76,7 @@ private:
 	void placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred = QPoint(0,0));
 	ConnectionFrame* createFrame();
 	ConnectionFrame* createFrame(QString computerId, QPoint position, QPoint gridPosition);
-	bool loadPosition(QSettings& settings, const QString& id, int& x, int& y);
+	bool loadPosition(QSharedPointer<QSettings> settings, const QString& id, int& x, int& y);
 	void savePosition(ConnectionFrame *cf);
 	void startVncServerIfNecessary(int from);
 	void tellClientCurrentSituation(Client* client);
-- 
cgit v1.2.3-55-g7522