Move settings lib into the main code, fixing error logging in it.

This commit is contained in:
Petr Mrázek 2014-07-01 01:48:09 +02:00
parent 8b86306d48
commit 18a342ef14
33 changed files with 80 additions and 175 deletions

View file

@ -42,10 +42,10 @@
#include "pathutils.h"
#include "cmdutils.h"
#include <inisettingsobject.h>
#include <setting.h>
#include "logic/settings/INISettingsObject.h"
#include "logic/settings/Setting.h"
#include "logger/QsLog.h"
#include <logger/QsLogDest.h>
#include "logger/QsLogDest.h"
#ifdef Q_OS_WIN32
#include <windows.h>
@ -219,7 +219,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool root_override)
m_instances.reset(new InstanceList(InstDirSetting->get().toString(), this));
QLOG_INFO() << "Loading Instances...";
m_instances->loadList();
connect(InstDirSetting.get(), SIGNAL(settingChanged(const Setting &, QVariant)),
connect(InstDirSetting.get(), SIGNAL(SettingChanged(const Setting &, QVariant)),
m_instances.get(), SLOT(on_InstFolderChanged(const Setting &, QVariant)));
// and accounts