From bb7e8985f6d189de0acac6a1c3033cb16378c1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 4 Nov 2013 02:53:05 +0100
Subject: Reformat and (slightly) decruft all the things.

---
 depends/settings/src/settingsobject.cpp | 66 +++++++++++++++------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

(limited to 'depends/settings/src/settingsobject.cpp')

diff --git a/depends/settings/src/settingsobject.cpp b/depends/settings/src/settingsobject.cpp
index 2ca544ad..32a63b8d 100644
--- a/depends/settings/src/settingsobject.cpp
+++ b/depends/settings/src/settingsobject.cpp
@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ -18,10 +18,8 @@
 
 #include <QVariant>
 
-SettingsObject::SettingsObject(QObject *parent) :
-	QObject(parent)
+SettingsObject::SettingsObject(QObject *parent) : QObject(parent)
 {
-	
 }
 
 bool SettingsObject::registerSetting(Setting *setting)
@@ -29,24 +27,26 @@ bool SettingsObject::registerSetting(Setting *setting)
 	// Check if setting is null or we already have a setting with the same ID.
 	if (!setting)
 	{
-		qDebug(QString("Failed to register setting. Setting is null.").
-			   arg(setting->id()).toUtf8());
+		qDebug(QString("Failed to register setting. Setting is null.")
+				   .arg(setting->id())
+				   .toUtf8());
 		return false; // Fail
 	}
-	
+
 	if (contains(setting->id()))
 	{
-		qDebug(QString("Failed to register setting %1. ID already exists.").
-			   arg(setting->id()).toUtf8());
+		qDebug(QString("Failed to register setting %1. ID already exists.")
+				   .arg(setting->id())
+				   .toUtf8());
 		return false; // Fail
 	}
-	
+
 	m_settings.insert(setting->id(), setting);
 	setting->setParent(this); // Take ownership.
-	
+
 	// Connect signals.
 	connectSignals(*setting);
-	
+
 	// qDebug(QString("Registered setting %1.").arg(setting->id()).toUtf8());
 	return true;
 }
@@ -55,22 +55,21 @@ void SettingsObject::unregisterSetting(Setting *setting)
 {
 	if (!setting || !m_settings.contains(setting->id()))
 		return; // We can't unregister something that's not registered.
-	
+
 	m_settings.remove(setting->id());
-	
+
 	// Disconnect signals.
 	disconnectSignals(*setting);
-	
+
 	setting->setParent(NULL); // Drop ownership.
 }
 
-
 Setting *SettingsObject::getSetting(const QString &id) const
 {
 	// Make sure there is a setting with the given ID.
 	if (!m_settings.contains(id))
 		return NULL;
-	
+
 	return m_settings[id];
 }
 
@@ -85,8 +84,7 @@ bool SettingsObject::set(const QString &id, QVariant value)
 	Setting *setting = getSetting(id);
 	if (!setting)
 	{
-		qDebug(QString("Error changing setting %1. Setting doesn't exist.").
-			   arg(id).toUtf8());
+		qDebug(QString("Error changing setting %1. Setting doesn't exist.").arg(id).toUtf8());
 		return false;
 	}
 	else
@@ -99,11 +97,10 @@ bool SettingsObject::set(const QString &id, QVariant value)
 void SettingsObject::reset(const QString &id) const
 {
 	Setting *setting = getSetting(id);
-	if(setting)
+	if (setting)
 		setting->reset();
 }
 
-
 QList<Setting *> SettingsObject::getSettings()
 {
 	return m_settings.values();
@@ -114,29 +111,26 @@ bool SettingsObject::contains(const QString &id)
 	return m_settings.contains(id);
 }
 
-
 void SettingsObject::connectSignals(const Setting &setting)
 {
 	connect(&setting, SIGNAL(settingChanged(const Setting &, QVariant)),
 			SLOT(changeSetting(const Setting &, QVariant)));
 	connect(&setting, SIGNAL(settingChanged(const Setting &, QVariant)),
 			SIGNAL(settingChanged(const Setting &, QVariant)));
-	
-	connect(&setting, SIGNAL(settingReset(Setting)),
-			SLOT(resetSetting(const Setting &)));
-	connect(&setting, SIGNAL(settingReset(Setting)),
-			SIGNAL(settingReset(const Setting &)));
+
+	connect(&setting, SIGNAL(settingReset(Setting)), SLOT(resetSetting(const Setting &)));
+	connect(&setting, SIGNAL(settingReset(Setting)), SIGNAL(settingReset(const Setting &)));
 }
 
 void SettingsObject::disconnectSignals(const Setting &setting)
 {
-	setting.disconnect(SIGNAL(settingChanged(const Setting &, QVariant)),
-					   this, SLOT(changeSetting(const Setting &, QVariant)));
-	setting.disconnect(SIGNAL(settingChanged(const Setting &, QVariant)),
-					   this, SIGNAL(settingChanged(const Setting &, QVariant)));
-	
-	setting.disconnect(SIGNAL(settingReset(const Setting &, QVariant)),
-					   this, SLOT(resetSetting(const Setting &, QVariant)));
-	setting.disconnect(SIGNAL(settingReset(const Setting &, QVariant)),
-					   this, SIGNAL(settingReset(const Setting &, QVariant)));
+	setting.disconnect(SIGNAL(settingChanged(const Setting &, QVariant)), this,
+					   SLOT(changeSetting(const Setting &, QVariant)));
+	setting.disconnect(SIGNAL(settingChanged(const Setting &, QVariant)), this,
+					   SIGNAL(settingChanged(const Setting &, QVariant)));
+
+	setting.disconnect(SIGNAL(settingReset(const Setting &, QVariant)), this,
+					   SLOT(resetSetting(const Setting &, QVariant)));
+	setting.disconnect(SIGNAL(settingReset(const Setting &, QVariant)), this,
+					   SIGNAL(settingReset(const Setting &, QVariant)));
 }
-- 
cgit v1.2.3