From 724309463d63480ca755d5f309825a9dd078d012 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Wed, 22 Nov 2017 17:01:06 +0200
Subject: Fix compilation with namespaces

Task-number: QTBUG-64693
Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/networksettings/qnetworksettingsmanager.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/networksettings/qnetworksettingsmanager.cpp')

diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index caf6057..dafc0b1 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -33,6 +33,8 @@
 #include "qnetworksettingsmanager_p.h"
 #include <QStringListModel>
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
    QObject(parent)
    ,d_ptr(new QNetworkSettingsManagerPrivate(this))
@@ -42,20 +44,20 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
 QNetworkSettingsServiceFilter *QNetworkSettingsManager::services()
 {
     Q_D(QNetworkSettingsManager);
-    return d->m_serviceFilter;
+    return d->serviceFilter();
 }
 
 QNetworkSettingsInterfaceModel *QNetworkSettingsManager::interfaces()
 {
     Q_D(QNetworkSettingsManager);
-    return &d->m_interfaceModel;
+    return d->interfaceModel();
 }
 
 QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, const int type)
 {
     Q_D(QNetworkSettingsManager);
 
-    foreach (QNetworkSettingsService* service, d->m_serviceModel->getModel()) {
+    foreach (QNetworkSettingsService* service, d->serviceModel()->getModel()) {
         if (service->name() == name && service->type() == type) {
             return service;
         }
@@ -74,3 +76,5 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
     Q_D(QNetworkSettingsManager);
     return d->userAgent();
 }
+
+QT_END_NAMESPACE
-- 
cgit v1.2.3