From cb0f7a06a1a7d56bb095692f327a359900dd8c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 1 Jan 2014 15:30:26 +0100
Subject: Remove offending Settings constructor.

Was causing build problems on OSX.
---
 depends/settings/setting.cpp |  6 ------
 depends/settings/setting.h   | 27 ++++++++-------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'depends')

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,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.
-- 
cgit v1.2.3