Fix naming conflict(?) and minor issues in DlgTagFetcher

AppVeyor build on Windows with VS 2017 failed.

1 files changed, 18 insertions, 19 deletions

diff --git a/src/library/dlgtagfetcher.h b/src/library/dlgtagfetcher.h
index 714e7b6507..537a1bc4c6 100644
--- a/src/library/dlgtagfetcher.h
+++ b/src/library/dlgtagfetcher.h
@@ -1,7 +1,7 @@
-#ifndef DLGTAGFETCHER_H
-#define DLGTAGFETCHER_H
+#pragma once
 
 #include <QDialog>
+#include <QList>
 #include <QTreeWidget>
 
 #include "library/ui_dlgtagfetcher.h"
@@ -12,19 +12,13 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
   Q_OBJECT
 
   public:
-    DlgTagFetcher(QWidget *parent);
-    virtual ~DlgTagFetcher();
+    explicit DlgTagFetcher(QWidget *parent);
+    ~DlgTagFetcher() override = default;
 
     void init();
 
-    enum networkError {
-        NOERROR,
-        HTTPERROR,
-        FTWERROR
-    };
-
   public slots:
-    void loadTrack(const TrackPointer track);
+    void loadTrack(const TrackPointer& track);
     void updateTrackMetadata(Track* pTIO);
 
   signals:
@@ -35,7 +29,7 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
     void fetchTagFinished(const TrackPointer,const QList<TrackPointer>& tracks);
     void resultSelected();
     void fetchTagProgress(QString);
-    void slotNetworkError(int httpStatus, QString app, QString message, int code);
+    void slotNetworkResult(int httpStatus, QString app, QString message, int code);
     void apply();
     void quit();
 
@@ -44,6 +38,11 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
     void addDivider(const QString& text, QTreeWidget* parent) const;
     void addTrack(const TrackPointer track, int resultIndex,
                   QTreeWidget* parent) const;
+
+    TagFetcher m_tagFetcher;
+
+    TrackPointer m_track;
+
     struct Data {
         Data() : m_pending(true), m_selectedResult(-1) {}
 
@@ -51,12 +50,12 @@ class DlgTagFetcher : public QDialog,  public Ui::DlgTagFetcher {
         int m_selectedResult;
         QList<TrackPointer> m_results;
     };
-
-    TrackPointer m_track;
     Data m_data;
-    QString m_progress;
-    TagFetcher m_TagFetcher;
-    networkError m_networkError;
-};
 
-#endif // DLGTAGFETCHER_H
+    enum class NetworkResult {
+        Ok,
+        HttpError,
+        UnknownError,
+    };
+    NetworkResult m_networkResult;
+};