dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing names for parameter variables

Browse Source
This commit is contained in:
Jonas Kvinge
2024-09-28 12:32:12 +02:00
parent f2e28d18bc
commit 3cb0f60900
73 changed files with 365 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/device/cddalister.cpp
View File

@@ -39,10 +39,14 @@
QStringList CddaLister::DeviceUniqueIDs() { return devices_list_; }
QVariantList CddaLister::DeviceIcons(const QString &) {
QVariantList CddaLister::DeviceIcons(const QString &id) {
Q_UNUSED(id)
QVariantList icons;
icons << QStringLiteral("media-optical");
return icons;
}
QString CddaLister::DeviceManufacturer(const QString &id) {
@@ -71,11 +75,24 @@ QString CddaLister::DeviceModel(const QString &id) {
}
quint64 CddaLister::DeviceCapacity(const QString&) { return 0; }
quint64 CddaLister::DeviceCapacity(const QString &id) {
quint64 CddaLister::DeviceFreeSpace(const QString&) { return 0; }
Q_UNUSED(id)
QVariantMap CddaLister::DeviceHardwareInfo(const QString&) {
return 0;
}
quint64 CddaLister::DeviceFreeSpace(const QString &id) {
Q_UNUSED(id)
return 0;
}
QVariantMap CddaLister::DeviceHardwareInfo(const QString &id) {
Q_UNUSED(id)
return QVariantMap();
}
@@ -100,7 +117,9 @@ void CddaLister::UnmountDevice(const QString &id) {
cdio_eject_media_drive(id.toLocal8Bit().constData());
}
void CddaLister::UpdateDeviceFreeSpace(const QString&) {}
void CddaLister::UpdateDeviceFreeSpace(const QString &id) {
Q_UNUSED(id)
}
bool CddaLister::Init() {

10
src/device/connecteddevice.cpp
View File

@@ -132,12 +132,18 @@ void ConnectedDevice::Eject() {
}
bool ConnectedDevice::FinishCopy(bool success, QString&) {
bool ConnectedDevice::FinishCopy(bool success, QString &error_text) {
Q_UNUSED(error_text)
lister_->UpdateDeviceFreeSpace(unique_id_);
return success;
}
bool ConnectedDevice::FinishDelete(bool success, QString&) {
bool ConnectedDevice::FinishDelete(bool success, QString &error_text) {
Q_UNUSED(error_text)
lister_->UpdateDeviceFreeSpace(unique_id_);
return success;
}

7
src/device/devicestatefiltermodel.cpp
View File

@@ -38,11 +38,14 @@ DeviceStateFilterModel::DeviceStateFilterModel(QObject *parent, DeviceManager::S
}
bool DeviceStateFilterModel::filterAcceptsRow(int row, const QModelIndex&) const {
bool DeviceStateFilterModel::filterAcceptsRow(const int row, const QModelIndex &parent) const {
Q_UNUSED(parent)
return sourceModel()->index(row, 0).data(DeviceManager::Role_State).toInt() != state_ && sourceModel()->index(row, 0).data(DeviceManager::Role_CopyMusic).toBool();
}
void DeviceStateFilterModel::ProxyRowCountChanged(const QModelIndex&, const int, const int) {
void DeviceStateFilterModel::ProxyRowCountChanged(const QModelIndex &idx, const int, const int) {
Q_UNUSED(idx)
Q_EMIT IsEmptyChanged(rowCount() == 0);

2
src/device/devicestatefiltermodel.h
View File

@@ -45,7 +45,7 @@ class DeviceStateFilterModel : public QSortFilterProxyModel {
void IsEmptyChanged(const bool is_empty);
protected:
bool filterAcceptsRow(int row, const QModelIndex &parent) const override;
bool filterAcceptsRow(const int row, const QModelIndex &parent) const override;
private Q_SLOTS:
void ProxyReset();

34
src/device/giolister.cpp
View File

@@ -90,7 +90,8 @@ void OperationFinished(F f, GObject *object, GAsyncResult *result) {
}
void GioLister::VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer) {
void GioLister::VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer instance) {
Q_UNUSED(instance)
OperationFinished<GVolume>(std::bind(g_volume_mount_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), object, result);
}
@@ -271,24 +272,29 @@ QList<QUrl> GioLister::MakeDeviceUrls(const QString &id) {
}
void GioLister::VolumeAddedCallback(GVolumeMonitor*, GVolume *v, gpointer d) {
static_cast<GioLister*>(d)->VolumeAdded(v);
void GioLister::VolumeAddedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance) {
Q_UNUSED(volume_monitor)
static_cast<GioLister*>(instance)->VolumeAdded(volume);
}
void GioLister::VolumeRemovedCallback(GVolumeMonitor*, GVolume *v, gpointer d) {
static_cast<GioLister*>(d)->VolumeRemoved(v);
void GioLister::VolumeRemovedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance) {
Q_UNUSED(volume_monitor)
static_cast<GioLister*>(instance)->VolumeRemoved(volume);
}
void GioLister::MountAddedCallback(GVolumeMonitor*, GMount *m, gpointer d) {
static_cast<GioLister*>(d)->MountAdded(m);
void GioLister::MountAddedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance) {
Q_UNUSED(volume_monitor)
static_cast<GioLister*>(instance)->MountAdded(mount);
}
void GioLister::MountChangedCallback(GVolumeMonitor*, GMount *m, gpointer d) {
static_cast<GioLister*>(d)->MountChanged(m);
void GioLister::MountChangedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance) {
Q_UNUSED(volume_monitor)
static_cast<GioLister*>(instance)->MountChanged(mount);
}
void GioLister::MountRemovedCallback(GVolumeMonitor*, GMount *m, gpointer d) {
static_cast<GioLister*>(d)->MountRemoved(m);
void GioLister::MountRemovedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance) {
Q_UNUSED(volume_monitor)
static_cast<GioLister*>(instance)->MountRemoved(mount);
}
void GioLister::VolumeAdded(GVolume *volume) {
@@ -570,11 +576,13 @@ void GioLister::VolumeEjectFinished(GObject *object, GAsyncResult *result, gpoin
OperationFinished<GVolume>(std::bind(g_volume_eject_with_operation_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), object, result);
}
void GioLister::MountEjectFinished(GObject *object, GAsyncResult *result, gpointer) {
void GioLister::MountEjectFinished(GObject *object, GAsyncResult *result, gpointer instance) {
Q_UNUSED(instance)
OperationFinished<GMount>(std::bind(g_mount_eject_with_operation_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), object, result);
}
void GioLister::MountUnmountFinished(GObject *object, GAsyncResult *result, gpointer) {
void GioLister::MountUnmountFinished(GObject *object, GAsyncResult *result, gpointer instance) {
Q_UNUSED(instance)
OperationFinished<GMount>(std::bind(g_mount_unmount_with_operation_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), object, result);
}

18
src/device/giolister.h
View File

@@ -116,17 +116,17 @@ class GioLister : public DeviceLister {
void MountChanged(GMount *mount);
void MountRemoved(GMount *mount);
static void VolumeAddedCallback(GVolumeMonitor*, GVolume*, gpointer);
static void VolumeRemovedCallback(GVolumeMonitor*, GVolume*, gpointer);
static void VolumeAddedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance);
static void VolumeRemovedCallback(GVolumeMonitor *volume_monitor, GVolume *volume, gpointer instance);
static void MountAddedCallback(GVolumeMonitor*, GMount*, gpointer);
static void MountChangedCallback(GVolumeMonitor*, GMount*, gpointer);
static void MountRemovedCallback(GVolumeMonitor*, GMount*, gpointer);
static void MountAddedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance);
static void MountChangedCallback(GVolumeMonitor *volume_monitor, GMount*, gpointer instance);
static void MountRemovedCallback(GVolumeMonitor *volume_monitor, GMount *mount, gpointer instance);
static void VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer);
static void VolumeEjectFinished(GObject *object, GAsyncResult *result, gpointer);
static void MountEjectFinished(GObject *object, GAsyncResult *result, gpointer);
static void MountUnmountFinished(GObject *object, GAsyncResult *result, gpointer);
static void VolumeMountFinished(GObject *object, GAsyncResult *result, gpointer instance);
static void VolumeEjectFinished(GObject *object, GAsyncResult *result, gpointer instance);
static void MountEjectFinished(GObject *object, GAsyncResult *result, gpointer instance);
static void MountUnmountFinished(GObject *object, GAsyncResult *result, gpointer instance);
// You MUST hold the mutex while calling this function
QString FindUniqueIdByMount(GMount *mount) const;