0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove offending Settings constructor.

Browse Source 
Was causing build problems on OSX.
This commit is contained in:
Petr Mrázek 2014-01-01 15:30:26 +01:00
parent 396e63500e
commit cb0f7a06a1
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
depends/settings/setting.cpp
View File

@ -21,12 +21,6 @@ Setting::Setting(QStringList synonyms, QVariant defVal)
{
}
Setting::Setting(QString id, QVariant defVal)
: QObject(), m_synonyms({id}), m_defVal(defVal)
{
}
QVariant Setting::get() const
{
SettingsObject *sbase = m_storage;

27
depends/settings/setting.h
View File

@ -31,18 +31,17 @@ class LIBSETTINGS_EXPORT Setting : public QObject
{
Q_OBJECT
public:
/*!
* \brief Constructs a new Setting object with the given parent.
* \param parent The Setting's parent object.
/**
* Construct a Setting
*
* Synonyms are all the possible names used in the settings object, in order of preference.
* First synonym is the ID, which identifies the setting in MultiMC.
*
* defVal is the default value that will be returned when the settings object
* doesn't have any value for this setting.
*/
explicit Setting(QStringList synonyms, QVariant defVal = QVariant());
/*!
* \brief Constructs a new Setting object with the given parent.
* \param parent The Setting's parent object.
*/
explicit Setting(QString id, QVariant defVal = QVariant());
/*!
* \brief Gets this setting's ID.
* This is used to refer to the setting within the application.
@ -75,16 +74,6 @@ public:
*/
virtual QVariant get() const;
/*!
* \brief Gets this setting's actual value (I.E. not as a QVariant).
* This function is just shorthand for get().value<T>()
* \return The setting's actual value.
*/
template <typename T> inline T value() const
{
return get().value<T>();
}
/*!
* \brief Gets this setting's default value.
* \return The default value of this setting.