Commit 83a2de6d authored by Laurent Montel's avatar Laurent Montel 😁

Normalize signal/slot

parent b34d13cb
...@@ -93,7 +93,7 @@ void solidFreedesktopTest::testAcPluggedChanged() ...@@ -93,7 +93,7 @@ void solidFreedesktopTest::testAcPluggedChanged()
void solidFreedesktopTest::testAddInhibition() void solidFreedesktopTest::testAddInhibition()
{ {
QSignalSpy spy(m_fakeLogind, SIGNAL(newInhibition(QString, QString, QString, QString))); QSignalSpy spy(m_fakeLogind, SIGNAL(newInhibition(QString,QString,QString,QString)));
auto job = new InhibitionJob(this); auto job = new InhibitionJob(this);
job->setDescription(QStringLiteral("Foo! I am inhibing!")); job->setDescription(QStringLiteral("Foo! I am inhibing!"));
job->setInhibitions(Power::Shutdown | Power::Sleep); job->setInhibitions(Power::Shutdown | Power::Sleep);
......
...@@ -139,8 +139,8 @@ WinDeviceManager::WinDeviceManager(QObject *parent) ...@@ -139,8 +139,8 @@ WinDeviceManager::WinDeviceManager(QObject *parent)
: DeviceManager(parent) : DeviceManager(parent)
{ {
connect(solidWineventFilter, SIGNAL(deviceAdded(const QSet<QString> &)),this, SLOT(slotDeviceAdded(QSet<QString>))); connect(solidWineventFilter, SIGNAL(deviceAdded(QSet<QString>)),this, SLOT(slotDeviceAdded(QSet<QString>)));
connect(solidWineventFilter, SIGNAL(deviceRemoved(const QSet<QString> &)),this, SLOT(slotDeviceRemoved(QSet<QString>))); connect(solidWineventFilter, SIGNAL(deviceRemoved(QSet<QString>)),this, SLOT(slotDeviceRemoved(QSet<QString>)));
m_supportedInterfaces << Solid::DeviceInterface::GenericInterface m_supportedInterfaces << Solid::DeviceInterface::GenericInterface
// << Solid::DeviceInterface::Block // << Solid::DeviceInterface::Block
......
...@@ -32,7 +32,7 @@ Solid::FDPowerNotifier::FDPowerNotifier(QObject* parent): PowerNotifier(parent) ...@@ -32,7 +32,7 @@ Solid::FDPowerNotifier::FDPowerNotifier(QObject* parent): PowerNotifier(parent)
QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("org.freedesktop.DBus.Properties"),
QStringLiteral("PropertiesChanged"), QStringLiteral("PropertiesChanged"),
this, this,
SLOT(upowerPropertiesChanged(QString, QVariantMap, QStringList)) SLOT(upowerPropertiesChanged(QString,QVariantMap,QStringList))
); );
conn.connect(QStringLiteral("org.freedesktop.login1"), conn.connect(QStringLiteral("org.freedesktop.login1"),
......
...@@ -381,23 +381,23 @@ bool SolidHardware::hwVolumeCall(SolidHardware::VolumeCallType type, const QStri ...@@ -381,23 +381,23 @@ bool SolidHardware::hwVolumeCall(SolidHardware::VolumeCallType type, const QStri
{ {
case Mount: case Mount:
connect(device.as<Solid::StorageAccess>(), connect(device.as<Solid::StorageAccess>(),
SIGNAL(setupDone(Solid::ErrorType, QVariant, const QString &)), SIGNAL(setupDone(Solid::ErrorType,QVariant,QString)),
this, this,
SLOT(slotStorageResult(Solid::ErrorType, QVariant))); SLOT(slotStorageResult(Solid::ErrorType,QVariant)));
device.as<Solid::StorageAccess>()->setup(); device.as<Solid::StorageAccess>()->setup();
break; break;
case Unmount: case Unmount:
connect(device.as<Solid::StorageAccess>(), connect(device.as<Solid::StorageAccess>(),
SIGNAL(teardownDone(Solid::ErrorType, QVariant, const QString &)), SIGNAL(teardownDone(Solid::ErrorType,QVariant,QString)),
this, this,
SLOT(slotStorageResult(Solid::ErrorType, QVariant))); SLOT(slotStorageResult(Solid::ErrorType,QVariant)));
device.as<Solid::StorageAccess>()->teardown(); device.as<Solid::StorageAccess>()->teardown();
break; break;
case Eject: case Eject:
connect(device.as<Solid::OpticalDrive>(), connect(device.as<Solid::OpticalDrive>(),
SIGNAL(ejectDone(Solid::ErrorType, QVariant, const QString &)), SIGNAL(ejectDone(Solid::ErrorType,QVariant,QString)),
this, this,
SLOT(slotStorageResult(Solid::ErrorType, QVariant))); SLOT(slotStorageResult(Solid::ErrorType,QVariant)));
device.as<Solid::OpticalDrive>()->eject(); device.as<Solid::OpticalDrive>()->eject();
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment