[nemo-systemsettings] Use reference counter NetworkManager. JB#61563

sailfishos · Mar 27, 2024 · 09344b3 · 09344b3
1 parent 43a2148
commit 09344b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/locationsettings.cpp b/src/locationsettings.cpp
@@ -197,7 +197,6 @@ LocationSettingsPrivate::LocationSettingsPrivate(LocationSettings::Mode mode, Lo
     , m_locationMode(LocationSettings::CustomMode)
     , m_settingMultipleSettings(false)
     , m_allowedDataSources(static_cast<LocationSettings::DataSources>(std::numeric_limits<quint32>::max()))
-    , m_connMan(Q_NULLPTR)
     , m_gpsTech(Q_NULLPTR)
     , m_gpsTechInterface(mode == LocationSettings::AsynchronousMode
                          ? Q_NULLPTR
@@ -226,10 +225,10 @@ LocationSettingsPrivate::LocationSettingsPrivate(LocationSettings::Mode mode, Lo
                                              "PropertyChanged",
                                              this, SLOT(gpsTechPropertyChanged(QString, QDBusVariant)));
     } else {
-        m_connMan = NetworkManagerFactory::createInstance();
-        connect(m_connMan, &NetworkManager::technologiesChanged,
+        m_connMan = NetworkManager::sharedInstance();
+        connect(m_connMan.data(), &NetworkManager::technologiesChanged,
                 this, &LocationSettingsPrivate::findGpsTech);
-        connect(m_connMan, &NetworkManager::availabilityChanged,
+        connect(m_connMan.data(), &NetworkManager::availabilityChanged,
                 this, &LocationSettingsPrivate::findGpsTech);
         findGpsTech();
     }

diff --git a/src/locationsettings_p.h b/src/locationsettings_p.h
@@ -39,6 +39,7 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
+#include <QSharedPointer>
 
 #include <nemo-dbus/interface.h>
 
@@ -76,7 +77,7 @@ class LocationSettingsPrivate : public QObject
     bool m_settingMultipleSettings;
     QStringList m_pendingAgreements;
     LocationSettings::DataSources m_allowedDataSources;
-    NetworkManager *m_connMan;
+    QSharedPointer<NetworkManager> m_connMan;
     NetworkTechnology *m_gpsTech;
     NemoDBus::Interface *m_gpsTechInterface;