New upstream version 0.7.0

1 files changed, 18 insertions, 34 deletions

diff --git a/lib/networksettings.h b/lib/networksettings.h
index 83613060..44247e59 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -1,20 +1,5 @@
-/******************************************************************************
- * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
@@ -24,21 +9,20 @@
 
 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 Quotient {
+class QUOTIENT_API NetworkSettings : public SettingsGroup {
+    Q_OBJECT
+    QUO_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
+    QUO_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
+    QUO_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 Quotient