From c01bee70a8ec082067d11cbf5dc093a74c403c5c Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Tue, 26 Aug 2014 14:28:36 +0200
Subject: Changed .ini file in client and manager from pvs2client.ini and
 pvs2mgr.ini to pvs2.ini, for having just one file.

---
 src/client/toolbar/toolbar.cpp | 8 +++++---
 src/client/util/util.h         | 4 ++--
 src/server/util/util.h         | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 0f90492..1838166 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -39,14 +39,16 @@ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent)
  * Does exact the same as Toolbar::Toolbar(QWidget *parent) but additionally
  * instantly tries to connect to the pvsmgr in its room without sessionName.
  * @param autoConnect
- * @param parent
+ * @param parent If parent is 0, the new widget becomes a window. If parent is
+ * another widget, this widget becomes a child window inside parent. The new
+ * widget is deleted when its parent is deleted.
  */
 Toolbar::Toolbar(const bool autoConnect, QWidget *parent) : Toolbar(parent)
 {
 	qDebug() << "auto - constructor!";
 
 	if (autoConnect) {
-		// Getting manager ip.
+		// Try getting manager ip.
 		QString mgrIp = identifyMgrIP();
 		qDebug() << "mgrIP: " << mgrIp;
 		if (mgrIp != NULL) {
@@ -186,7 +188,7 @@ QString Toolbar::identifyMgrIP()
 	}
 
 	QStringList rooms = conf.value("rooms").toStringList();
-	qDebug() << rooms;
+	// qDebug() << rooms;
 
 	for (auto i : rooms)
 	{
diff --git a/src/client/util/util.h b/src/client/util/util.h
index 82248c0..662599f 100644
--- a/src/client/util/util.h
+++ b/src/client/util/util.h
@@ -6,8 +6,8 @@
 // Use like this:
 // USER_SETTINGS(settings)
 // settings.value("somekey")
-#define USER_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::UserScope, "openslx", "pvs2client")
-#define SYSTEM_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::SystemScope, "openslx", "pvs2client")
+#define USER_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::UserScope, "openslx", "pvs2")
+#define SYSTEM_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::SystemScope, "openslx", "pvs2")
 
 #include <QDir>
 
diff --git a/src/server/util/util.h b/src/server/util/util.h
index e2d6a62..d142bdd 100644
--- a/src/server/util/util.h
+++ b/src/server/util/util.h
@@ -6,8 +6,8 @@
 // Use like this:
 // USER_SETTINGS(settings)
 // settings.value("somekey")
-#define USER_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::UserScope, "openslx", "pvs2mgr")
-#define SYSTEM_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::SystemScope, "openslx", "pvs2mgr")
+#define USER_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::UserScope, "openslx", "pvs2")
+#define SYSTEM_SETTINGS(name) QSettings name (QSettings::IniFormat, QSettings::SystemScope, "openslx", "pvs2")
 
 namespace Util
 {
-- 
cgit v1.2.3-55-g7522