1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use global static non-POD variable for backend name

Browse Source 
Replace it with a static variable that is inside a static
function.

Found by an Axivion scan.

Task-number: QTBUG-125026
Pick-to: 6.7 6.5
Change-Id: Ic85b683fddb18a389f1d461e4f7ab6b08bf8c3ec
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 51dbdb6f9bf41fa2d7a30c598e9bdc61eaece281)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mate Barany 2024-07-19 14:28:22 +02:00 committed by Qt Cherry-pick Bot
parent 4ed494f4ad
commit 406ddb88f8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp
View File

@ -31,7 +31,11 @@ QNetworkInformation::Reachability reachabilityFromGNetworkConnectivity(GNetworkC
} }
} }
static QString backendName = QStringLiteral("glib"); static const QString &backendName()
{
static auto name = u"glib"_s;
return name;
}
class QGlibNetworkInformationBackend : public QNetworkInformationBackend class QGlibNetworkInformationBackend : public QNetworkInformationBackend
{ {
@ -40,7 +44,7 @@ public:
QGlibNetworkInformationBackend(); QGlibNetworkInformationBackend();
~QGlibNetworkInformationBackend(); ~QGlibNetworkInformationBackend();
QString name() const override { return backendName; } QString name() const override { return backendName(); }
QNetworkInformation::Features featuresSupported() const override QNetworkInformation::Features featuresSupported() const override
{ {
if (!isValid()) if (!isValid())
@ -76,7 +80,7 @@ class QGlibNetworkInformationBackendFactory : public QNetworkInformationBackendF
public: public:
QGlibNetworkInformationBackendFactory() = default; QGlibNetworkInformationBackendFactory() = default;
~QGlibNetworkInformationBackendFactory() = default; ~QGlibNetworkInformationBackendFactory() = default;
QString name() const override { return backendName; } QString name() const override { return backendName(); }
QNetworkInformation::Features featuresSupported() const override QNetworkInformation::Features featuresSupported() const override
{ {
return QGlibNetworkInformationBackend::featuresSupportedStatic(); return QGlibNetworkInformationBackend::featuresSupportedStatic();