1 files changed, 9 insertions, 20 deletions

diff --git a/indexerwidget.h b/indexerwidget.h
index 0f43266..d8e70bb 100644
--- a/indexerwidget.h
+++ b/indexerwidget.h
@@ -8,12 +8,10 @@
 
 #include "taglib/fileref.h"
 
-class QMenu;
-class QAction;
-
 class QTextEdit;
+class QProgressBar;
+class QLabel;
 class BeetReader;
-struct BeetObject;
 
 class IndexerWidget : public QWidget {
     Q_OBJECT
@@ -23,15 +21,15 @@ class IndexerWidget : public QWidget {
     public slots:
         void startIndexing();
         void stopIndexing();
-        void addToLog(QString msg);
         void addToError(QString msg);
+        void setupProgress(int max);
+        void progress(int cur);
 
     private:
-        QTextEdit *mLog;
         QTextEdit *mError;
-        QVector<QMenu*> mMenus;
-        QAction *mStartIndexingA;
-        QAction *mStopIndexingA;
+        QProgressBar *mProgress;
+        QLabel *mProgressCount;
+        int mMax;
         BeetReader *mReader;
 };
 
@@ -43,8 +41,9 @@ class BeetReader : public QThread {
         void cancel();
 
     signals:
-        void message(const QString &msg);
         void errorMsg(const QString &msg);
+        void totalCount(int count);
+        void progress(int cur);
         void cleared();
 
     private:
@@ -70,14 +69,4 @@ class BeetReader : public QThread {
         QSqlQuery *mInsertSongQ;
 };
 
-struct BeetObject {
-    QString artist;
-    QString album;
-    quint16 year;
-    QString genre;
-    quint16 pos;
-    QString title;
-    QString fullpath;
-};
-
 #endif // INDEXERWIDGET_H