Replace slots with Q_SLOTS

src/device/cddadevice.h

@@ -59,7 +59,7 @@ class CddaDevice : public ConnectedDevice {
  Q_SIGNALS:
   void SongsDiscovered(const SongList &songs);
 
- private slots:
+ private Q_SLOTS:
   void SongsLoaded(const SongList &songs);
 
  private:

src/device/cddasongloader.h

@@ -65,7 +65,7 @@ class CddaSongLoader : public QObject {
   void SongsDurationLoaded(const SongList &songs, const QString &error = QString());
   void SongsMetadataLoaded(const SongList &songs);
 
- private slots:
+ private Q_SLOTS:
 #ifdef HAVE_MUSICBRAINZ
   void AudioCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results);
 #endif

src/device/connecteddevice.h

@@ -73,7 +73,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public enab
   void Eject() override;
   virtual void Close();
 
- public slots:
+ public Q_SLOTS:
   void BackendCloseFinished();
 
  Q_SIGNALS:
@@ -100,7 +100,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public enab
 
   qint64 song_count_;
 
- private slots:
+ private Q_SLOTS:
   void BackendTotalSongCountUpdated(int count);
 };
 

src/device/devicedatabasebackend.h

@@ -68,7 +68,7 @@ class DeviceDatabaseBackend : public QObject {
 
   void SetDeviceOptions(const int id, const QString &friendly_name, const QString &icon_name, const MusicStorage::TranscodeMode mode, const Song::FileType format);
 
- private slots:
+ private Q_SLOTS:
   void Exit();
 
  Q_SIGNALS:

src/device/devicelister.h

@@ -74,7 +74,7 @@ class DeviceLister : public QObject {
 
   virtual bool CopyMusic() { return true; }
 
- public slots:
+ public Q_SLOTS:
   virtual void UpdateDeviceFreeSpace(const QString &id) = 0;
   virtual void ShutDown() {}
   virtual void MountDevice(const QString &id, const int request_id);
@@ -101,7 +101,7 @@ class DeviceLister : public QObject {
   QThread *original_thread_;
   int next_mount_request_id_;
 
- private slots:
+ private Q_SLOTS:
   void ThreadStarted();
 
  private:

src/device/devicemanager.h

@@ -115,7 +115,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
   // QAbstractItemModel
   QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
 
- public slots:
+ public Q_SLOTS:
   void Unmount(const QModelIndex &idx);
 
  Q_SIGNALS:
@@ -124,7 +124,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
   void DeviceDisconnected(const QModelIndex idx);
   void DeviceCreatedFromDB(DeviceInfo *info);
 
- private slots:
+ private Q_SLOTS:
   void PhysicalDeviceAdded(const QString &id);
   void PhysicalDeviceRemoved(const QString &id);
   void PhysicalDeviceChanged(const QString &id);

src/device/deviceproperties.h

@@ -51,7 +51,7 @@ class DeviceProperties : public QDialog {
   void SetDeviceManager(SharedPtr<DeviceManager> manager);
   void ShowDevice(const QModelIndex &idx);
 
- public slots:
+ public Q_SLOTS:
   void accept() override;
 
  private:
@@ -59,7 +59,7 @@ class DeviceProperties : public QDialog {
   void AddHardwareInfo(const int row, const QString &key, const QString &value);
   void UpdateFormats();
 
- private slots:
+ private Q_SLOTS:
   void ModelChanged();
   void OpenDevice();
   void UpdateFormatsFinished();

src/device/devicestatefiltermodel.h

@@ -47,7 +47,7 @@ class DeviceStateFilterModel : public QSortFilterProxyModel {
  protected:
   bool filterAcceptsRow(int row, const QModelIndex &parent) const override;
 
- private slots:
+ private Q_SLOTS:
   void ProxyReset();
   void ProxyRowCountChanged(const QModelIndex &idx, const int first, const int last);
 

src/device/deviceview.h

@@ -76,7 +76,7 @@ class DeviceView : public AutoExpandingTreeView {
   void contextMenuEvent(QContextMenuEvent*) override;
   void mouseDoubleClickEvent(QMouseEvent *e) override;
 
- private slots:
+ private Q_SLOTS:
   // Device menu actions
   void Connect();
   void Unmount();

src/device/filesystemdevice.h

@@ -54,7 +54,7 @@ class FilesystemDevice : public ConnectedDevice, public virtual FilesystemMusicS
 
   static QStringList url_schemes() { return QStringList() << QStringLiteral("file"); }
 
- private slots:
+ private Q_SLOTS:
   void Close() override;
   void ExitFinished();
 

src/device/giolister.h

@@ -67,7 +67,7 @@ class GioLister : public DeviceLister {
   QString MakeFriendlyName(const QString &id) override;
   QList<QUrl> MakeDeviceUrls(const QString &id) override;
 
- public slots:
+ public Q_SLOTS:
   void MountDevice(const QString &id, const int request_id) override;
   void UnmountDevice(const QString &id) override;
   void UpdateDeviceFreeSpace(const QString &id) override;

src/device/gpoddevice.h

@@ -71,7 +71,7 @@ class GPodDevice : public ConnectedDevice, public virtual MusicStorage {
   bool DeleteFromStorage(const DeleteJob &job) override;
   bool FinishDelete(bool success, QString &error_text) override;
 
- protected slots:
+ protected Q_SLOTS:
   void LoadFinished(Itdb_iTunesDB *db, const bool success);
   void LoaderError(const QString &message);
 

src/device/gpodloader.h

@@ -49,7 +49,7 @@ class GPodLoader : public QObject {
 
   void Abort() { abort_ = true; }
 
- public slots:
+ public Q_SLOTS:
   void LoadDatabase();
 
  Q_SIGNALS:

src/device/macosdevicelister.h

@@ -77,7 +77,7 @@ class MacOsDeviceLister : public DeviceLister {
 
   void ExitAsync();
 
- public slots:
+ public Q_SLOTS:
   void UnmountDevice(const QString &id);
   void ShutDown();
 

src/device/mtpdevice.h

@@ -70,7 +70,7 @@ class MtpDevice : public ConnectedDevice {
   bool DeleteFromStorage(const DeleteJob &job) override;
   bool FinishDelete(const bool success, QString &error_text) override;
 
- private slots:
+ private Q_SLOTS:
   void LoadFinished(bool success, MtpConnection *connection);
   void LoaderError(const QString &message);
 

src/device/mtploader.h

@@ -46,7 +46,7 @@ class MtpLoader : public QObject {
   bool Init();
   void Abort() { abort_ = true; }
 
- public slots:
+ public Q_SLOTS:
   void LoadDatabase();
 
  Q_SIGNALS:

src/device/udisks2lister.h

@@ -65,14 +65,14 @@ class Udisks2Lister : public DeviceLister {
   QString MakeFriendlyName(const QString &id) override;
   QList<QUrl> MakeDeviceUrls(const QString &id) override;
 
- public slots:
+ public Q_SLOTS:
   void UnmountDevice(const QString &id) override;
   void UpdateDeviceFreeSpace(const QString &id) override;
 
  protected:
   bool Init() override;
 
- private slots:
+ private Q_SLOTS:
   void DBusInterfaceAdded(const QDBusObjectPath &path, const InterfacesAndProperties &interfaces);
   void DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &interfaces);
   void JobCompleted(const bool success, const QString &message);