Merge branch 'master' into dfaure/stricter-flags

1 files changed, 6 insertions, 17 deletions

diff --git a/lib/networkaccessmanager.cpp b/lib/networkaccessmanager.cpp
index b9037bcc..43a8287a 100644
--- a/lib/networkaccessmanager.cpp
+++ b/lib/networkaccessmanager.cpp
@@ -1,19 +1,7 @@
 /******************************************************************************
- * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+ * SPDX-FileCopyrightText: 2018 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-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "networkaccessmanager.h"
@@ -52,9 +40,10 @@ static NetworkAccessManager* createNam()
     auto nam = new NetworkAccessManager(QCoreApplication::instance());
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
     // See #109; in newer Qt, bearer management is deprecated altogether
-    nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged, [nam] {
-        nam->setNetworkAccessible(QNetworkAccessManager::Accessible);
-    });
+    NetworkAccessManager::connect(nam,
+        &QNetworkAccessManager::networkAccessibleChanged, [nam] {
+            nam->setNetworkAccessible(QNetworkAccessManager::Accessible);
+        });
 #endif
     return nam;
 }