diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:48:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:48:09 +0200 |
| commit | 18a342ef1446997427de45095109f24c9352296d (patch) | |
| tree | 73f4dd5a79e3df896f10b36dec4496afa8517907 /MultiMC.cpp | |
| parent | 8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (diff) | |
| download | MultiMC-18a342ef1446997427de45095109f24c9352296d.tar MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.gz MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.lz MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.xz MultiMC-18a342ef1446997427de45095109f24c9352296d.zip | |
Move settings lib into the main code, fixing error logging in it.
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index bd72c139..7e7c6c88 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -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 |