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

Fix parameter name mispatches

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-14 18:58:24 +02:00
parent 2fbdb29ebc
commit 082c9097e4
76 changed files with 145 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/devicelister.h
View File

@@ -74,7 +74,7 @@ class DeviceLister : public QObject {
public slots:
virtual void UpdateDeviceFreeSpace(const QString &id) = 0;
virtual void ShutDown() {}
virtual void MountDevice(const QString &id, const int ret);
virtual void MountDevice(const QString &id, const int request_id);
virtual void UnmountDevice(const QString &id) { Q_UNUSED(id); }
virtual void Exit();

2
src/device/devicemanager.cpp
View File

@@ -920,7 +920,7 @@ void DeviceManager::DeviceSongCountUpdated(int count) {
}
void DeviceManager::LazyPopulate(DeviceInfo *parent, bool signal) {
void DeviceManager::LazyPopulate(DeviceInfo *parent, const bool signal) {
Q_UNUSED(signal);
if (parent->lazy_loaded) return;

4
src/device/devicemanager.h
View File

@@ -113,7 +113,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
void SetDeviceOptions(QModelIndex idx, const QString &friendly_name, const QString &icon_name, MusicStorage::TranscodeMode mode, Song::FileType format);
// QAbstractItemModel
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const;
public slots:
void Unmount(QModelIndex idx);
@@ -141,7 +141,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
protected:
void LazyPopulate(DeviceInfo *item) { LazyPopulate(item, true); }
void LazyPopulate(DeviceInfo *item, bool signal);
void LazyPopulate(DeviceInfo *parent, const bool signal);
private:

4
src/device/deviceview.cpp
View File

@@ -456,7 +456,7 @@ void DeviceView::DeleteFinished(const SongList &songs_with_errors) {
}
bool DeviceView::CanRecursivelyExpand(const QModelIndex &index) const {
bool DeviceView::CanRecursivelyExpand(const QModelIndex &idx) const {
// Never expand devices
return index.parent().isValid();
return idx.parent().isValid();
}

4
src/device/udisks2lister.cpp
View File

@@ -245,8 +245,8 @@ void Udisks2Lister::DBusInterfaceAdded(const QDBusObjectPath &path, const Interf
}
}
void Udisks2Lister::DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &ifaces) {
Q_UNUSED(ifaces);
void Udisks2Lister::DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &interfaces) {
Q_UNUSED(interfaces);
if (!isPendingJob(path)) RemoveDevice(path);
}

4
src/device/udisks2lister.h
View File

@@ -71,8 +71,8 @@ class Udisks2Lister : public DeviceLister {
bool Init() override;
private slots:
void DBusInterfaceAdded(const QDBusObjectPath &path, const InterfacesAndProperties &ifaces);
void DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &ifaces);
void DBusInterfaceAdded(const QDBusObjectPath &path, const InterfacesAndProperties &interfaces);
void DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &interfaces);
void JobCompleted(bool success, const QString &message);
private: