Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Apr 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/locationsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
Expand Down
3 changes: 2 additions & 1 deletion src/locationsettings_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <QString>
#include <QStringList>
#include <QHash>
#include <QSharedPointer>

#include <nemo-dbus/interface.h>

Expand Down Expand Up @@ -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;

Expand Down