Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 18 insertions, 18 deletions

diff --git a/lib/networksettings.h b/lib/networksettings.h
index ca9c7dfc..0c21a9fe 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -24,22 +24,22 @@
 
 Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
 
-namespace QMatrixClient {
-    class NetworkSettings : public SettingsGroup
-    {
-        Q_OBJECT
-        QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
-        QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
-        QMC_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
-        Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
-        public:
-        template <typename... ArgTs>
-        explicit NetworkSettings(ArgTs... qsettingsArgs)
-            : SettingsGroup(QStringLiteral("Network"), qsettingsArgs...)
-        {
-        }
-        ~NetworkSettings() override = default;
+namespace QMatrixClient
+{
+class NetworkSettings : public SettingsGroup
+{
+    Q_OBJECT
+    QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
+    QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
+    QMC_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
+    Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
+public:
+    template <typename... ArgTs>
+    explicit NetworkSettings(ArgTs... qsettingsArgs)
+        : SettingsGroup(QStringLiteral("Network"), qsettingsArgs...)
+    {}
+    ~NetworkSettings() override = default;
 
-        Q_INVOKABLE void setupApplicationProxy() const;
-    };
-}
+    Q_INVOKABLE void setupApplicationProxy() const;
+};
+} // namespace QMatrixClient