Merge remote branch 'openslx/master' into mcastft

Conflicts:
	CMakeLists.txt
	pvsmgr.qrc
	src/gui/clientConfigDialog.cpp
	src/gui/mainWindow.cpp
	src/gui/ui/mainwindow.ui
	src/gui/ui/mainwindowtouch.ui
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/pvsgui.cpp

1 files changed, 0 insertions, 50 deletions

diff --git a/src/util/pvsSettingsManager.h b/src/util/pvsSettingsManager.h
deleted file mode 100644
index 78607eb..0000000
--- a/src/util/pvsSettingsManager.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/// documentation test 1
-/// line 2
-/// line 3
-#ifndef _PVSSETTINGSMANGER_H_
-#define _PVSSETTINGSMANGER_H_
-
-#include <list>
-#include <map>
-#include <src/util/util.h>
-#include <src/util/consoleLogger.h>
-#include <QSettings>
-
-
-/// documentation test 1.1
-/// line 2.1
-/// line 3.1
-
-typedef std::pair<QString, QString> SettingsEntry; ///< first = option name, second = option value
-typedef std::list<SettingsEntry> SettingsList;  ///< obvious
-typedef std::list<SettingsEntry>::iterator SettingsIter;
-
-
-class PVSSettingsManager;
-/// documentation test 1.2
-/// line 2.2
-/// line 3.2
-class PVSSettingsManager
-{
-public:
-    static PVSSettingsManager* getManager();
-    void setConfigFile(QString path);
-    bool hasEntry(QString name);
-    QString getEntryString(QString name);
-    void writeEntry(QString name, QString value);
-    void setConfigs();
-    void reWriteConfigs(QString set, QString val);
-    void readConfigs(QString sett, QString vall);
-private:
-    static PVSSettingsManager* myself;
-    PVSSettingsManager();
-    void _parseFile(QString path);
-    SettingsEntry _parseLine(QString line);
-    QString _path;
-    SettingsList settingsList;
-    QSettings _configs;
-
-};
-
-
-#endif