diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-01-01 15:30:26 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-01-01 15:30:26 +0100 |
commit | cb0f7a06a1a7d56bb095692f327a359900dd8c31 (patch) | |
tree | d8c59ea490f678e2eacf6015dac66fd07356b2e6 /depends | |
parent | 396e63500ec189b003d36504bae91a2b6a78a69d (diff) | |
download | MultiMC-cb0f7a06a1a7d56bb095692f327a359900dd8c31.tar MultiMC-cb0f7a06a1a7d56bb095692f327a359900dd8c31.tar.gz MultiMC-cb0f7a06a1a7d56bb095692f327a359900dd8c31.tar.lz MultiMC-cb0f7a06a1a7d56bb095692f327a359900dd8c31.tar.xz MultiMC-cb0f7a06a1a7d56bb095692f327a359900dd8c31.zip |
Remove offending Settings constructor.
Was causing build problems on OSX.
Diffstat (limited to 'depends')
-rw-r--r-- | depends/settings/setting.cpp | 6 | ||||
-rw-r--r-- | depends/settings/setting.h | 27 |
2 files changed, 8 insertions, 25 deletions
diff --git a/depends/settings/setting.cpp b/depends/settings/setting.cpp index 1a0c6b6a..0d685771 100644 --- a/depends/settings/setting.cpp +++ b/depends/settings/setting.cpp @@ -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; diff --git a/depends/settings/setting.h b/depends/settings/setting.h index 179fa3bb..a73474d2 100644 --- a/depends/settings/setting.h +++ b/depends/settings/setting.h @@ -31,19 +31,18 @@ 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. * \warning Changing the ID while the setting is registered with a SettingsObject results in @@ -76,16 +75,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. */ |