--- Vago/trunk/Vago/converter.h	2013/03/31 19:02:16	771
+++ Vago/trunk/Vago/converter.h	2016/09/16 22:51:26	1047
@@ -1,28 +1,42 @@
 #ifndef CONVERTER_H
 #define CONVERTER_H
 #include <QProcess>
-#include <logger.h>
 #include <QProgressBar>
 #include <QThread>
-#include <util.h>
-#include <QDebug>
+#ifdef Q_OS_WIN
+#include <QWinTaskbarProgress>
+#endif
+
+#include "utilvago.h"
 
 class Converter : public QThread
 {
      Q_OBJECT
 public:
-    Converter(Logger *myLogger, QStringList *myData);
+    Converter(QString AppDir, Logger *myLogger, QStringList *myData);
+
+    #ifdef Q_OS_WIN
+    Converter(QString AppDir, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
+    #endif
 private:
+    QString AppDir;
     Logger *myLogger;
     QStringList *myData;
+    QProcess *myProcess;
+    bool processHasKilled;
+    #ifdef Q_OS_WIN
+    QWinTaskbarProgress *win7TaskBarProgress = nullptr;
+    #endif
 
 protected:
     void run(); //for thread
 private slots:
+    void terminateCurrProcess();
 signals:
     void setupPB(int numberTasks);
     void taskDone();
     void resultConversion(QString result, int numErrors);
+    void conversionAborted();
 };