diff options
author | Christian Klinger | 2016-09-29 15:40:18 +0200 |
---|---|---|
committer | Christian Klinger | 2016-09-29 15:40:18 +0200 |
commit | 3d82bfc698165bb20f3c38d42f2b77ab855c1edf (patch) | |
tree | 2c170bcdd5c89259bb0b530fa11fdfe701c99850 /src/server/util/global.cpp | |
parent | added an information dialog that displays ip and hostname. (diff) | |
download | pvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.tar.gz pvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.tar.xz pvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.zip |
astyle.
Diffstat (limited to 'src/server/util/global.cpp')
-rw-r--r-- | src/server/util/global.cpp | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp index 990eee1..97c0355 100644 --- a/src/server/util/global.cpp +++ b/src/server/util/global.cpp @@ -36,31 +36,33 @@ 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; - } +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::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; +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; } |