Whitespace cleanup core/settings

We can argue about any of the changes here, but they are the result of our
whitespace.pl script - so if any of this is offensive to you, part of the
resolution will be fixing the script...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

core/settings/qPref.cpp

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "qPrefPrivate.h"
 #include "qPref.h"
+#include "qPrefPrivate.h"
 #include "ssrf-version.h"
 
-qPref::qPref(QObject *parent) : 
+qPref::qPref(QObject *parent) : QObject(parent)
-	QObject(parent)
 {
 }
 qPref *qPref::instance()

core/settings/qPref.h

@@ -2,8 +2,8 @@
 #ifndef QPREF_H
 #define QPREF_H
 
-#include <QObject>
 #include "core/pref.h"
+#include <QObject>
 
 #include "qPrefAnimations.h"
 #include "qPrefCloudStorage.h"

core/settings/qPrefCloudStorage.cpp

@@ -7,6 +7,7 @@ static const QString group = QStringLiteral("CloudStorage");
 qPrefCloudStorage::qPrefCloudStorage(QObject *parent) : QObject(parent)
 {
 }
+
 qPrefCloudStorage *qPrefCloudStorage::instance()
 {
 	static qPrefCloudStorage *self = new qPrefCloudStorage;
@@ -45,7 +46,8 @@ void qPrefCloudStorage::set_cloud_base_url(const QString& value)
 		emit cloud_git_url_changed(valueGit);
 	}
 }
-DISK_LOADSYNC_TXT(CloudStorage, "/cloud_base_url", cloud_base_url)
+
+DISK_LOADSYNC_TXT(CloudStorage, "/cloud_base_url", cloud_base_url);
 
 void qPrefCloudStorage::set_cloud_git_url(const QString &value)
 {
@@ -58,7 +60,8 @@ void qPrefCloudStorage::set_cloud_git_url(const QString& value)
 		emit cloud_git_url_changed(value);
 	}
 }
-DISK_LOADSYNC_TXT(CloudStorage, "/cloud_git_url", cloud_git_url)
+
+DISK_LOADSYNC_TXT(CloudStorage, "/cloud_git_url", cloud_git_url);
 
 HANDLE_PREFERENCE_TXT(CloudStorage, "/email", cloud_storage_email);
 

core/settings/qPrefDisplay.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
+#include "core/subsurface-string.h"
 #include "qPref.h"
 #include "qPrefPrivate.h"
-#include "core/subsurface-string.h"
 
 #include <QApplication>
 #include <QFont>

core/settings/qPrefPrivate.cpp

@@ -15,4 +15,3 @@ void qPrefPrivate::copy_txt(const char **name, const QString& string)
 	free((void *)*name);
 	*name = copy_qstring(string);
 }
-

core/settings/qPrefPrivate.h

@@ -3,11 +3,11 @@
 #define QPREFPRIVATE_H
 
 // Header used by all qPref<class> implementations to avoid duplicating code
+#include "core/qthelper.h"
 #include "qPref.h"
+#include <QObject>
 #include <QSettings>
 #include <QVariant>
-#include <QObject>
-#include "core/qthelper.h"
 
 // implementation class of the interface classes
 class qPrefPrivate : public QObject {
@@ -31,7 +31,6 @@ private:
 };
 
 
-
 //******* Macros to generate disk function
 #define DISK_LOADSYNC_BOOL_EXT(usegroup, name, field, usestruct)                                                                               \
 	void qPref##usegroup::disk_##field(bool doSync)                                                                                        \
@@ -110,7 +109,7 @@ void qPref ## usegroup::set_ ## field (bool value) \
 		}                                           \
 	}
 #define SET_PREFERENCE_BOOL(usegroup, field) \
-SET_PREFERENCE_BOOL_EXT(usegroup, field, ) \
+	SET_PREFERENCE_BOOL_EXT(usegroup, field, )
 
 #define SET_PREFERENCE_DOUBLE_EXT(usegroup, field, usestruct) \
 	void qPref##usegroup::set_##field(double value)       \
@@ -122,7 +121,7 @@ void qPref ## usegroup::set_ ## field (double value) \
 		}                                             \
 	}
 #define SET_PREFERENCE_DOUBLE(usegroup, field) \
-SET_PREFERENCE_DOUBLE_EXT(usegroup, field, ) \
+	SET_PREFERENCE_DOUBLE_EXT(usegroup, field, )
 
 #define SET_PREFERENCE_ENUM_EXT(usegroup, type, field, usestruct) \
 	void qPref##usegroup::set_##field(type value)             \
@@ -146,7 +145,7 @@ void qPref ## usegroup::set_ ## field (int value) \
 		}                                          \
 	}
 #define SET_PREFERENCE_INT(usegroup, field) \
-SET_PREFERENCE_INT_EXT(usegroup, field, ) \
+	SET_PREFERENCE_INT_EXT(usegroup, field, )
 
 #define SET_PREFERENCE_TXT_EXT(usegroup, field, usestruct)                                 \
 	void qPref##usegroup::set_##field(const QString &value)                            \
@@ -158,7 +157,7 @@ void qPref ## usegroup::set_ ## field (const QString& value) \
 		}                                                                          \
 	}
 #define SET_PREFERENCE_TXT(usegroup, field) \
-SET_PREFERENCE_TXT_EXT(usegroup, field, ) \
+	SET_PREFERENCE_TXT_EXT(usegroup, field, )
 
 //******* Macros to generate set/set/loadsync combined
 #define HANDLE_PREFERENCE_BOOL_EXT(usegroup, name, field, usestruct) \