jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Servatrice: group all the use of QSettings in a single file

Browse source 
and add a method to guess the path of servatrice.ini
This commit is contained in:
Fabio Bas 2014-10-02 22:37:50 +02:00
parent 277aba79dc
commit a1b6600fe1
7 changed files with 113 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

17
servatrice/src/main.cpp
View file

@ -22,11 +22,11 @@
#include <QTextCodec>
#include <iostream>
#include <QMetaType>
#include <QSettings>
#include <QDateTime>
#include "passwordhasher.h"
#include "servatrice.h"
#include "server_logger.h"
#include "settingscache.h"
#include "rng_sfmt.h"
#include "version_string.h"
#include <google/protobuf/stubs/common.h>
@ -37,6 +37,7 @@
RNG_Abstract *rng;
ServerLogger *logger;
QThread *loggerThread;
SettingsCache *settingsCache;
/* Prototypes */
@ -150,6 +151,10 @@ int main(int argc, char *argv[])
bool testRandom = args.contains("--test-random");
bool testHashFunction = args.contains("--test-hash");
bool logToConsole = args.contains("--log-to-console");
QString configPath;
int hasConfigPath=args.indexOf("--config");
if(hasConfigPath > -1 && args.count() > hasConfigPath + 1)
configPath = args.at(hasConfigPath + 1);
qRegisterMetaType<QList<int> >("QList<int>");
@ -158,7 +163,9 @@ int main(int argc, char *argv[])
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
#endif
QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
configPath = SettingsCache::guessConfigurationPath(configPath);
std::cerr << "Using configuration file:" << configPath.toUtf8().data() << std::endl;
settingsCache = new SettingsCache();
loggerThread = new QThread;
loggerThread->setObjectName("logger");
@ -166,7 +173,7 @@ int main(int argc, char *argv[])
logger->moveToThread(loggerThread);
loggerThread->start();
QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settings->value("server/logfile").toString()));
QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settingsCache->value("server/logfile").toString()));
#if QT_VERSION < 0x050000
if (logToConsole)
@ -209,7 +216,7 @@ int main(int argc, char *argv[])
if (testHashFunction)
testHash();
Servatrice *server = new Servatrice(settings);
Servatrice *server = new Servatrice();
QObject::connect(server, SIGNAL(destroyed()), &app, SLOT(quit()), Qt::QueuedConnection);
int retval = 0;
if (server->initServer()) {
@ -228,7 +235,7 @@ int main(int argc, char *argv[])
}
delete rng;
delete settings;
delete settingsCache;
logger->deleteLater();
loggerThread->wait();