From 268376e08b7d5be261a1b5c0dcfbe5532f19df93 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 5 Jul 2023 07:15:01 +0300 Subject: [PATCH] generic: adjust to solid changes Signed-off-by: Ivailo Monev --- dolphin/src/panels/places/placesitemmodel.cpp | 28 ++++++++++++---------- dolphin/src/panels/places/placesitemmodel.h | 8 +++---- knotify/ksolidnotify.cpp | 22 ++++++++--------- knotify/ksolidnotify.h | 8 +++---- plasma/applets/kickoff/core/urlitemlauncher.cpp | 6 ++--- plasma/applets/kickoff/core/urlitemlauncher.h | 2 +- .../dataengines/soliddevice/soliddeviceengine.cpp | 14 +++++------ plasma/dataengines/soliddevice/soliddeviceengine.h | 2 +- solid-hardware/solid-hardware.cpp | 17 ++++++------- solid-hardware/solid-hardware.h | 2 +- soliduiserver/deviceserviceaction.cpp | 8 +++---- 11 files changed, 61 insertions(+), 56 deletions(-) diff --git a/dolphin/src/panels/places/placesitemmodel.cpp b/dolphin/src/panels/places/placesitemmodel.cpp index 30e9b928..8fcba284 100644 --- a/dolphin/src/panels/places/placesitemmodel.cpp +++ b/dolphin/src/panels/places/placesitemmodel.cpp @@ -296,8 +296,8 @@ void PlacesItemModel::requestEject(int index) if (item) { Solid::OpticalDrive* drive = item->device().as(); if (drive) { - connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant))); + connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QString,QString)), + this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QString,QString))); drive->eject(); } else { const QString label = item->text(); @@ -313,8 +313,8 @@ void PlacesItemModel::requestTeardown(int index) if (item) { Solid::StorageAccess* access = item->device().as(); if (access) { - connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QVariant))); + connect(access, SIGNAL(teardownDone(Solid::ErrorType,QString,QString)), + this, SLOT(slotStorageTeardownDone(Solid::ErrorType,QString,QString))); access->teardown(); } } @@ -342,8 +342,8 @@ void PlacesItemModel::requestStorageSetup(int index) m_storageSetupInProgress[access] = index; - connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(slotStorageSetupDone(Solid::ErrorType,QVariant,QString))); + connect(access, SIGNAL(setupDone(Solid::ErrorType,QString,QString)), + this, SLOT(slotStorageSetupDone(Solid::ErrorType,QString,QString))); access->setup(); } @@ -568,15 +568,19 @@ void PlacesItemModel::slotContentChanged(const QString& udi, const bool hasconte } } -void PlacesItemModel::slotStorageTeardownDone(Solid::ErrorType error, const QVariant& errorData) +void PlacesItemModel::slotStorageTeardownDone(Solid::ErrorType error, + const QString& errorData, + const QString& udi) { - if (error && errorData.isValid()) { - emit errorMessage(errorData.toString()); + Q_UNUSED(udi); + + if (error && !errorData.isEmpty()) { + emit errorMessage(errorData); } } void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error, - const QVariant& errorData, + const QString& errorData, const QString& udi) { Q_UNUSED(udi); @@ -588,10 +592,10 @@ void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error, } if (error) { - if (errorData.isValid()) { + if (!errorData.isEmpty()) { emit errorMessage(i18nc("@info", "An error occurred while accessing '%1', the system responded: %2", item->text(), - errorData.toString())); + errorData)); } else { emit errorMessage(i18nc("@info", "An error occurred while accessing '%1'", item->text())); diff --git a/dolphin/src/panels/places/placesitemmodel.h b/dolphin/src/panels/places/placesitemmodel.h index eb951a64..c84f6761 100644 --- a/dolphin/src/panels/places/placesitemmodel.h +++ b/dolphin/src/panels/places/placesitemmodel.h @@ -26,14 +26,14 @@ #include #include #include +#include +#include #include #include class KBookmark; class KBookmarkManager; class PlacesItem; -#include -#include // #define PLACESITEMMODEL_DEBUG @@ -127,8 +127,8 @@ private slots: void slotDeviceAdded(const QString& udi); void slotDeviceRemoved(const QString& udi); void slotContentChanged(const QString& udi, const bool hascontent); - void slotStorageTeardownDone(Solid::ErrorType error, const QVariant& errorData); - void slotStorageSetupDone(Solid::ErrorType error, const QVariant& errorData, const QString& udi); + void slotStorageTeardownDone(Solid::ErrorType error, const QString& errorData, const QString& udi); + void slotStorageSetupDone(Solid::ErrorType error, const QString& errorData, const QString& udi); void hideItem(); /** diff --git a/knotify/ksolidnotify.cpp b/knotify/ksolidnotify.cpp index 0e5fca44..a4d19f9e 100644 --- a/knotify/ksolidnotify.cpp +++ b/knotify/ksolidnotify.cpp @@ -119,20 +119,20 @@ void KSolidNotify::connectSignals(Solid::Device* device) Solid::StorageAccess *access = device->as(); if (access) { - connect(access, SIGNAL(teardownDone(Solid::ErrorType, QVariant, const QString &)), - this, SLOT(storageTeardownDone(Solid::ErrorType, QVariant , const QString &))); - connect(access, SIGNAL(setupDone(Solid::ErrorType, QVariant, const QString &)), - this, SLOT(storageSetupDone(Solid::ErrorType, QVariant , const QString &))); + connect(access, SIGNAL(teardownDone(Solid::ErrorType, const QString&, const QString &)), + this, SLOT(storageTeardownDone(Solid::ErrorType, const QString& , const QString &))); + connect(access, SIGNAL(setupDone(Solid::ErrorType, const QString&, const QString &)), + this, SLOT(storageSetupDone(Solid::ErrorType, const QString& , const QString &))); } if (device->is()) { Solid::OpticalDrive *drive = device->as(); - connect(drive, SIGNAL(ejectDone(Solid::ErrorType, QVariant, const QString &)), - this, SLOT(storageEjectDone(Solid::ErrorType, QVariant , const QString &))); + connect(drive, SIGNAL(ejectDone(Solid::ErrorType, const QString&, const QString &)), + this, SLOT(storageEjectDone(Solid::ErrorType, const QString& , const QString &))); } } -void KSolidNotify::notifySolidEvent(QString event, Solid::ErrorType error, QVariant errorData, const QString & udi, const QString & errorMessage) +void KSolidNotify::notifySolidEvent(QString event, Solid::ErrorType error, const QString &errorData, const QString & udi, const QString & errorMessage) { ContextList context; if (m_dbusServiceExists) @@ -141,7 +141,7 @@ void KSolidNotify::notifySolidEvent(QString event, Solid::ErrorType error, QVari if (mountConfig.readEntry("Action").split('|').contains("Popup")) { QDBusMessage m = QDBusMessage::createMethodCall( dbusDeviceNotificationsName, dbusDeviceNotificationsPath, dbusDeviceNotificationsName, "notify" ); - m << error << errorMessage << errorData.toString().simplified() << udi; + m << error << errorMessage << errorData.simplified() << udi; QDBusConnection::sessionBus().call(m); } context << QPair("devnotifier", "present"); @@ -151,7 +151,7 @@ void KSolidNotify::notifySolidEvent(QString event, Solid::ErrorType error, QVari } -void KSolidNotify::storageSetupDone(Solid::ErrorType error, QVariant errorData, const QString &udi) +void KSolidNotify::storageSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi) { if (error) { @@ -161,7 +161,7 @@ void KSolidNotify::storageSetupDone(Solid::ErrorType error, QVariant errorData, } } -void KSolidNotify::storageTeardownDone(Solid::ErrorType error, QVariant errorData, const QString &udi) +void KSolidNotify::storageTeardownDone(Solid::ErrorType error, const QString &errorData, const QString &udi) { if (error) { @@ -175,7 +175,7 @@ void KSolidNotify::storageTeardownDone(Solid::ErrorType error, QVariant errorDat } } -void KSolidNotify::storageEjectDone(Solid::ErrorType error, QVariant errorData, const QString &udi) +void KSolidNotify::storageEjectDone(Solid::ErrorType error, const QString &errorData, const QString &udi) { if (error) { diff --git a/knotify/ksolidnotify.h b/knotify/ksolidnotify.h index 14a60334..38a8e169 100644 --- a/knotify/ksolidnotify.h +++ b/knotify/ksolidnotify.h @@ -52,16 +52,16 @@ class KSolidNotify : public QObject private slots: - void storageEjectDone(Solid::ErrorType error, QVariant errorData, const QString & udi); - void storageTeardownDone(Solid::ErrorType error, QVariant errorData, const QString & udi); - void storageSetupDone(Solid::ErrorType error, QVariant errorData, const QString & udi); + void storageEjectDone(Solid::ErrorType error, const QString &errorData, const QString &udi); + void storageTeardownDone(Solid::ErrorType error, const QString &errorData, const QString &udi); + void storageSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi); void slotServiceOwnerChanged(const QString &, const QString &, const QString &); private: void connectSignals(Solid::Device* device); bool isSafelyRemovable(const QString &udi); - void notifySolidEvent(QString event, Solid::ErrorType error, QVariant errorData, const QString & udi, const QString & errorMessage); + void notifySolidEvent(QString event, Solid::ErrorType error, const QString &errorData, const QString & udi, const QString & errorMessage); KNotify* m_kNotify; QHash m_devices; diff --git a/plasma/applets/kickoff/core/urlitemlauncher.cpp b/plasma/applets/kickoff/core/urlitemlauncher.cpp index 91c9deb7..cf8cbbbe 100644 --- a/plasma/applets/kickoff/core/urlitemlauncher.cpp +++ b/plasma/applets/kickoff/core/urlitemlauncher.cpp @@ -114,8 +114,8 @@ bool UrlItemLauncher::openItem(const QModelIndex& index) Solid::StorageAccess *access = device.as(); if (access && !access->isAccessible()) { - connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(onSetupDone(Solid::ErrorType,QVariant,QString))); + connect(access, SIGNAL(setupDone(Solid::ErrorType,QString,QString)), + this, SLOT(onSetupDone(Solid::ErrorType,QString,QString))); access->setup(); return true; } @@ -133,7 +133,7 @@ bool UrlItemLauncher::openUrl(const QString& url) return Private::openUrl(url); } -void UrlItemLauncher::onSetupDone(Solid::ErrorType error, QVariant errorData, const QString &udi) +void UrlItemLauncher::onSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi) { Q_UNUSED(errorData); diff --git a/plasma/applets/kickoff/core/urlitemlauncher.h b/plasma/applets/kickoff/core/urlitemlauncher.h index 4e2a186f..cdd23626 100644 --- a/plasma/applets/kickoff/core/urlitemlauncher.h +++ b/plasma/applets/kickoff/core/urlitemlauncher.h @@ -77,7 +77,7 @@ public Q_SLOTS: bool openUrl(const QString& url); private Q_SLOTS: - void onSetupDone(Solid::ErrorType error, QVariant errorData, const QString &udi); + void onSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi); private: class Private; diff --git a/plasma/dataengines/soliddevice/soliddeviceengine.cpp b/plasma/dataengines/soliddevice/soliddeviceengine.cpp index 8be28253..85cf8d0a 100644 --- a/plasma/dataengines/soliddevice/soliddeviceengine.cpp +++ b/plasma/dataengines/soliddevice/soliddeviceengine.cpp @@ -545,20 +545,20 @@ void SolidDeviceEngine::deviceAdded(const QString& udi) if (drive) { connect(drive, SIGNAL(ejectRequested(QString)), this, SLOT(setUnmountingState(QString))); - connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(setIdleState(Solid::ErrorType,QVariant,QString))); + connect(drive, SIGNAL(ejectDone(Solid::ErrorType,QString,QString)), + this, SLOT(setIdleState(Solid::ErrorType,QString,QString))); } } else if (device.is()) { Solid::StorageAccess *access = device.as(); if (access) { connect(access, SIGNAL(setupRequested(QString)), this, SLOT(setMountingState(QString))); - connect(access, SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(setIdleState(Solid::ErrorType,QVariant,QString))); + connect(access, SIGNAL(setupDone(Solid::ErrorType,QString,QString)), + this, SLOT(setIdleState(Solid::ErrorType,QString,QString))); connect(access, SIGNAL(teardownRequested(QString)), this, SLOT(setUnmountingState(QString))); - connect(access, SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)), - this, SLOT(setIdleState(Solid::ErrorType,QVariant,QString))); + connect(access, SIGNAL(teardownDone(Solid::ErrorType,QString,QString)), + this, SLOT(setIdleState(Solid::ErrorType,QString,QString))); } } } @@ -575,7 +575,7 @@ void SolidDeviceEngine::setUnmountingState(const QString &udi) setData(udi, I18N_NOOP("Operation result"), Working); } -void SolidDeviceEngine::setIdleState(Solid::ErrorType error, QVariant errorData, const QString &udi) +void SolidDeviceEngine::setIdleState(Solid::ErrorType error, const QString &errorData, const QString &udi) { Q_UNUSED(errorData) diff --git a/plasma/dataengines/soliddevice/soliddeviceengine.h b/plasma/dataengines/soliddevice/soliddeviceengine.h index 5115b91a..04e91f2a 100644 --- a/plasma/dataengines/soliddevice/soliddeviceengine.h +++ b/plasma/dataengines/soliddevice/soliddeviceengine.h @@ -90,7 +90,7 @@ private Q_SLOTS: void sourceWasRemoved(const QString &source); void setMountingState(const QString &udi); void setUnmountingState(const QString &udi); - void setIdleState(Solid::ErrorType error, QVariant errorData, const QString &udi); + void setIdleState(Solid::ErrorType error, const QString &errorData, const QString &udi); void deviceContentChanged(const QString &udi, const bool hascontent); }; diff --git a/solid-hardware/solid-hardware.cpp b/solid-hardware/solid-hardware.cpp index 3ba4cc2e..bada70d9 100644 --- a/solid-hardware/solid-hardware.cpp +++ b/solid-hardware/solid-hardware.cpp @@ -369,23 +369,23 @@ bool SolidHardware::hwVolumeCall(SolidHardware::VolumeCallType type, const QStri { case Mount: connect(device.as(), - SIGNAL(setupDone(Solid::ErrorType, QVariant, const QString &)), + SIGNAL(setupDone(Solid::ErrorType, const QString &, const QString &)), this, - SLOT(slotStorageResult(Solid::ErrorType, QVariant))); + SLOT(slotStorageResult(Solid::ErrorType, const QString &, const QString &))); device.as()->setup(); break; case Unmount: connect(device.as(), - SIGNAL(teardownDone(Solid::ErrorType, QVariant, const QString &)), + SIGNAL(teardownDone(Solid::ErrorType, const QString &, const QString &)), this, - SLOT(slotStorageResult(Solid::ErrorType, QVariant))); + SLOT(slotStorageResult(Solid::ErrorType, const QString &, const QString &))); device.as()->teardown(); break; case Eject: connect(device.as(), - SIGNAL(ejectDone(Solid::ErrorType, QVariant, const QString &)), + SIGNAL(ejectDone(Solid::ErrorType, const QString &, const QString &)), this, - SLOT(slotStorageResult(Solid::ErrorType, QVariant))); + SLOT(slotStorageResult(Solid::ErrorType, const QString &, const QString &))); device.as()->eject(); break; } @@ -428,11 +428,12 @@ void SolidHardware::deviceRemoved(const QString &udi) std::cout << "udi = '" << udi << "'" << std::endl; } -void SolidHardware::slotStorageResult(Solid::ErrorType error, const QVariant &errorData) +void SolidHardware::slotStorageResult(Solid::ErrorType error, const QString &errorData, const QString &udi) { + Q_UNUSED(udi); if (error) { m_error = 1; - m_errorString = errorData.toString(); + m_errorString = errorData; } m_loop.exit(); } diff --git a/solid-hardware/solid-hardware.h b/solid-hardware/solid-hardware.h index 97c4167d..6d40f183 100644 --- a/solid-hardware/solid-hardware.h +++ b/solid-hardware/solid-hardware.h @@ -48,7 +48,7 @@ private: QString m_errorString; private slots: - void slotStorageResult(Solid::ErrorType error, const QVariant &errorData); + void slotStorageResult(Solid::ErrorType error, const QString &errorData, const QString &udi); void deviceAdded(const QString &udi); void deviceRemoved(const QString &udi); }; diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp index 3f65d217..eb73a730 100644 --- a/soliduiserver/deviceserviceaction.cpp +++ b/soliduiserver/deviceserviceaction.cpp @@ -48,7 +48,7 @@ public: DelayedExecutor(const KServiceAction &service, Solid::Device &device); private slots: - void _k_storageSetupDone(Solid::ErrorType error, QVariant errorData, const QString &udi); + void _k_storageSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi); private: void delayedExecute(const QString &udi); @@ -77,7 +77,7 @@ void DeviceServiceAction::execute(Solid::Device &device) new DelayedExecutor(m_service, device); } -void DelayedExecutor::_k_storageSetupDone(Solid::ErrorType error, QVariant errorData, +void DelayedExecutor::_k_storageSetupDone(Solid::ErrorType error, const QString &errorData, const QString &udi) { Q_UNUSED(errorData); @@ -144,8 +144,8 @@ DelayedExecutor::DelayedExecutor(const KServiceAction &service, Solid::Device &d && !device.as()->isAccessible()) { Solid::StorageAccess *access = device.as(); - connect(access, SIGNAL(setupDone(Solid::ErrorType, QVariant, const QString &)), - this, SLOT(_k_storageSetupDone(Solid::ErrorType, QVariant, const QString &))); + connect(access, SIGNAL(setupDone(Solid::ErrorType, const QString &, const QString &)), + this, SLOT(_k_storageSetupDone(Solid::ErrorType, const QString &, const QString &))); access->setup(); -- 2.11.0