Fixed a lot of MSVC problems

This commit is contained in:
Andrew
2013-02-25 14:44:36 -06:00
parent b56b819c35
commit 4ca35a760d
14 changed files with 651 additions and 599 deletions

View File

@ -19,6 +19,8 @@
#include <QObject>
#include <QDateTime>
#include <settingsobject.h>
#include "inifile.h"
#include "libinstance_config.h"
@ -280,6 +282,16 @@ public:
*/
virtual void updateCurrentVersion(bool keepCurrent = false) = 0;
//// Settings System ////
/*!
* \brief Gets this instance's settings object.
* This settings object stores instance-specific settings.
* \return A pointer to this instance's settings object.
*/
virtual SettingsObject &settings();
protected:
/*!
* \brief Gets the value of the given field in the instance's config file.

View File

@ -17,6 +17,8 @@
#include <QFileInfo>
#include "settingsobject.h"
#include "pathutils.h"
Instance::Instance(const QString &rootDir, QObject *parent) :
@ -104,3 +106,8 @@ void Instance::setField(const QString &name, QVariant val)
{
config.set(name, val);
}
SettingsObject &Instance::settings()
{
return *globalSettings;
}