From 17fa98fe4e90de445af406e962d1b49ce8865265 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 3 Aug 2017 22:20:32 -0700
Subject: [PATCH] Qt: ConfigController::getOption now has a default argument

---
 src/platform/qt/ConfigController.cpp | 12 ++++++++----
 src/platform/qt/ConfigController.h   |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 9136f1679..3b3074aa7 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -158,12 +158,16 @@ void ConfigController::updateOption(const char* key) {
 	m_optionSet[optionName]->setValue(mCoreConfigGetValue(&m_config, key));
 }
 
-QString ConfigController::getOption(const char* key) const {
-	return QString(mCoreConfigGetValue(&m_config, key));
+QString ConfigController::getOption(const char* key, const QVariant& defaultVal) const {
+	const char* val = mCoreConfigGetValue(&m_config, key);
+	if (val) {
+		return QString(val);
+	}
+	return defaultVal.toString();
 }
 
-QString ConfigController::getOption(const QString& key) const {
-	return getOption(key.toUtf8().constData());
+QString ConfigController::getOption(const QString& key, const QVariant& defaultVal) const {
+	return getOption(key.toUtf8().constData(), defaultVal);
 }
 
 QVariant ConfigController::getQtOption(const QString& key, const QString& group) const {
diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h
index 3c3a9bca3..17079ea4c 100644
--- a/src/platform/qt/ConfigController.h
+++ b/src/platform/qt/ConfigController.h
@@ -70,8 +70,8 @@ public:
 	ConfigOption* addOption(const char* key);
 	void updateOption(const char* key);
 
-	QString getOption(const char* key) const;
-	QString getOption(const QString& key) const;
+	QString getOption(const char* key, const QVariant& defaultVal = QVariant()) const;
+	QString getOption(const QString& key, const QVariant& defaultVal = QVariant()) const;
 
 	QVariant getQtOption(const QString& key, const QString& group = QString()) const;