diff options
author | Christian Klinger | 2016-09-12 13:09:15 +0200 |
---|---|---|
committer | Christian Klinger | 2016-09-12 13:09:15 +0200 |
commit | 211bed049d7073ea95789eeedc483541f8a85b2c (patch) | |
tree | 57068ba430f7c5f218777597192bc81fcbe06ea1 /src/server/main.cpp | |
parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
download | pvs2-211bed049d7073ea95789eeedc483541f8a85b2c.tar.gz pvs2-211bed049d7073ea95789eeedc483541f8a85b2c.tar.xz pvs2-211bed049d7073ea95789eeedc483541f8a85b2c.zip |
removed USER_SETTINGS etc.
(this also changes filename of the crt ans rsa files, but this shouldn't
be a problem. (formerly the name of those files depended on the name and
location of the ini-files)
Diffstat (limited to 'src/server/main.cpp')
-rw-r--r-- | src/server/main.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/server/main.cpp b/src/server/main.cpp index 71657d8..2e5a32b 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -36,26 +36,9 @@ int main(int argc, char** argv) // Set the global path of the settings QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/"); - - // Make sure settings directory exists - USER_SETTINGS(settings); - QFileInfo fi(settings.fileName()); - QDir path(fi.path()); - qDebug() << "User settings are in:" << settings.fileName(); - if (!path.exists()) - path.mkpath(path.absolutePath()); - // Now check if settings file exists. If not, copy system default (if available) - if (!fi.exists()) - { - SYSTEM_SETTINGS(sys); - qDebug() << "System settings are in:" << sys.fileName(); - QFileInfo sysfi(sys.fileName()); - if (sysfi.exists()) - { - if (!QFile::copy(sys.fileName(), settings.fileName())) - qDebug() << "Copying default settings from " << sys.fileName() << " to " << settings.fileName() << " failed."; - } - } + SETTINGS(sys); + qDebug() << "System settings are in:" << sys.fileName(); + QFileInfo sysfi(sys.fileName()); // use system locale as language to translate gui |