diff options
Diffstat (limited to 'src/network/kernel/qnetworkinformation_p.h')
-rw-r--r-- | src/network/kernel/qnetworkinformation_p.h | 77 |
1 files changed, 35 insertions, 42 deletions
diff --git a/src/network/kernel/qnetworkinformation_p.h b/src/network/kernel/qnetworkinformation_p.h index 36084b8e44..504955a6e1 100644 --- a/src/network/kernel/qnetworkinformation_p.h +++ b/src/network/kernel/qnetworkinformation_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QNETWORKINFORMATION_P_H #define QNETWORKINFORMATION_P_H @@ -56,6 +20,7 @@ #include <QtNetwork/qnetworkinformation.h> #include <QtCore/qloggingcategory.h> +#include <QtCore/qreadwritelock.h> QT_BEGIN_NAMESPACE @@ -84,10 +49,29 @@ public: virtual QString name() const = 0; virtual QNetworkInformation::Features featuresSupported() const = 0; - Reachability reachability() const { return m_reachability; } - bool behindCaptivePortal() const { return m_behindCaptivePortal; } - TransportMedium transportMedium() const { return m_transportMedium; } - bool isMetered() const { return m_metered; } + Reachability reachability() const + { + QReadLocker locker(&m_lock); + return m_reachability; + } + + bool behindCaptivePortal() const + { + QReadLocker locker(&m_lock); + return m_behindCaptivePortal; + } + + TransportMedium transportMedium() const + { + QReadLocker locker(&m_lock); + return m_transportMedium; + } + + bool isMetered() const + { + QReadLocker locker(&m_lock); + return m_metered; + } Q_SIGNALS: void reachabilityChanged(Reachability reachability); @@ -98,37 +82,46 @@ Q_SIGNALS: protected: void setReachability(QNetworkInformation::Reachability reachability) { + QWriteLocker locker(&m_lock); if (m_reachability != reachability) { m_reachability = reachability; + locker.unlock(); emit reachabilityChanged(reachability); } } void setBehindCaptivePortal(bool behindPortal) { + QWriteLocker locker(&m_lock); if (m_behindCaptivePortal != behindPortal) { m_behindCaptivePortal = behindPortal; + locker.unlock(); emit behindCaptivePortalChanged(behindPortal); } } void setTransportMedium(TransportMedium medium) { + QWriteLocker locker(&m_lock); if (m_transportMedium != medium) { m_transportMedium = medium; + locker.unlock(); emit transportMediumChanged(medium); } } void setMetered(bool isMetered) { + QWriteLocker locker(&m_lock); if (m_metered != isMetered) { m_metered = isMetered; + locker.unlock(); emit isMeteredChanged(isMetered); } } private: + mutable QReadWriteLock m_lock; Reachability m_reachability = Reachability::Unknown; TransportMedium m_transportMedium = TransportMedium::Unknown; bool m_behindCaptivePortal = false; |