From 6e1c1991c2721c2741d06428db11f4880549ddd1 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 30 Jun 2023 01:37:09 +0300 Subject: [PATCH] solid-hardware: remove unused SolidHardware methods Signed-off-by: Ivailo Monev --- solid-hardware/solid-hardware.cpp | 39 ------------------------------- solid-hardware/solid-hardware.h | 8 +------ 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/solid-hardware/solid-hardware.cpp b/solid-hardware/solid-hardware.cpp index 08ce74b3..3ba4cc2e 100644 --- a/solid-hardware/solid-hardware.cpp +++ b/solid-hardware/solid-hardware.cpp @@ -19,17 +19,14 @@ #include "solid-hardware.h" - #include #include #include #include -#include #include #include #include -#include #include #include @@ -419,28 +416,6 @@ bool SolidHardware::listen() return true; } -void SolidHardware::connectJob(KJob *job) -{ - connect(job, SIGNAL(result(KJob *)), - this, SLOT(slotResult(KJob *))); - connect(job, SIGNAL(percent(KJob *, unsigned long)), - this, SLOT(slotPercent(KJob *, unsigned long))); - connect(job, SIGNAL(infoMessage(KJob *, const QString &, const QString &)), - this, SLOT(slotInfoMessage(KJob *, const QString &))); -} - -void SolidHardware::slotPercent(KJob *job, unsigned long percent) -{ - Q_UNUSED(job) - std::cout << i18n("Progress: %1%" , percent) << std::endl; -} - -void SolidHardware::slotInfoMessage(KJob *job, const QString &message) -{ - Q_UNUSED(job) - std::cout << i18n("Info: %1" , message) << std::endl; -} - void SolidHardware::deviceAdded(const QString &udi) { std::cout << "Device Added:" << std::endl; @@ -453,20 +428,6 @@ void SolidHardware::deviceRemoved(const QString &udi) std::cout << "udi = '" << udi << "'" << std::endl; } - -void SolidHardware::slotResult(KJob *job) -{ - m_error = 0; - - if (job->error()) - { - m_error = job->error(); - m_errorString = job->errorString(); - } - - m_loop.exit(); -} - void SolidHardware::slotStorageResult(Solid::ErrorType error, const QVariant &errorData) { if (error) { diff --git a/solid-hardware/solid-hardware.h b/solid-hardware/solid-hardware.h index 16ae0c50..4412883f 100644 --- a/solid-hardware/solid-hardware.h +++ b/solid-hardware/solid-hardware.h @@ -26,8 +26,6 @@ #include #include -class KJob; - namespace Solid { namespace Control { class Authentication; @@ -51,16 +49,12 @@ public: bool hwVolumeCall(VolumeCallType type, const QString &udi); private: - void connectJob(KJob *job); - QEventLoop m_loop; int m_error; QString m_errorString; + private slots: void slotStorageResult(Solid::ErrorType error, const QVariant &errorData); - void slotResult(KJob *job); - void slotPercent(KJob *job, unsigned long percent); - void slotInfoMessage(KJob *job, const QString &message); void deviceAdded(const QString &udi); void deviceRemoved(const QString &udi); };