diff --git a/src/solid/devices/backends/fstab/fstabdevice.h b/src/solid/devices/backends/fstab/fstabdevice.h --- a/src/solid/devices/backends/fstab/fstabdevice.h +++ b/src/solid/devices/backends/fstab/fstabdevice.h @@ -51,7 +51,7 @@ Q_SIGNALS: void mtabChanged(const QString &device); -private Q_SLOTS: +public Q_SLOTS: void onMtabChanged(const QString &device); private: diff --git a/src/solid/devices/backends/fstab/fstabmanager.cpp b/src/solid/devices/backends/fstab/fstabmanager.cpp --- a/src/solid/devices/backends/fstab/fstabmanager.cpp +++ b/src/solid/devices/backends/fstab/fstabmanager.cpp @@ -22,8 +22,8 @@ m_deviceList = FstabHandling::deviceList(); - connect(FstabWatcher::instance(), SIGNAL(fstabChanged()), this, SLOT(onFstabChanged())); - connect(FstabWatcher::instance(), SIGNAL(mtabChanged()), this, SLOT(onMtabChanged())); + connect(FstabWatcher::instance(), &FstabWatcher::fstabChanged, this, &FstabManager::onFstabChanged); + connect(FstabWatcher::instance(), &FstabWatcher::mtabChanged, this, &FstabManager::onMtabChanged); } QString FstabManager::udiPrefix() const @@ -92,8 +92,8 @@ return nullptr; } - QObject *device = new FstabDevice(udi); - connect(this, SIGNAL(mtabChanged(QString)), device, SLOT(onMtabChanged(QString))); + FstabDevice *device = new FstabDevice(udi); + connect(this, &FstabManager::mtabChanged, device, &FstabDevice::onMtabChanged); return device; } diff --git a/src/solid/devices/backends/fstab/fstabwatcher.cpp b/src/solid/devices/backends/fstab/fstabwatcher.cpp --- a/src/solid/devices/backends/fstab/fstabwatcher.cpp +++ b/src/solid/devices/backends/fstab/fstabwatcher.cpp @@ -28,23 +28,24 @@ , m_fileSystemWatcher(new QFileSystemWatcher(this)) { if (qApp) { - connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(orphanFileSystemWatcher())); + connect(qApp, &QCoreApplication::aboutToQuit, this, &FstabWatcher::orphanFileSystemWatcher); } m_mtabFile = new QFile(s_mtabFile, this); if (m_mtabFile && m_mtabFile->symLinkTarget().startsWith("/proc/") && m_mtabFile->open(QIODevice::ReadOnly)) { m_mtabSocketNotifier = new QSocketNotifier(m_mtabFile->handle(), QSocketNotifier::Exception, this); - connect(m_mtabSocketNotifier, - SIGNAL(activated(int)), this, SIGNAL(mtabChanged())); + connect(m_mtabSocketNotifier, &QSocketNotifier::activated, + this, &FstabWatcher::mtabChanged); } else { m_fileSystemWatcher->addPath(s_mtabFile); } m_fileSystemWatcher->addPath(s_fstabFile); - connect(m_fileSystemWatcher, SIGNAL(fileChanged(QString)), this, SLOT(onFileChanged(QString))); + connect(m_fileSystemWatcher, &QFileSystemWatcher::fileChanged, + this, &FstabWatcher::onFileChanged); } FstabWatcher::~FstabWatcher()