--- Vago/trunk/Vago/converter.h	2013/04/13 12:15:20	811
+++ Vago/trunk/Vago/converter.h	2014/01/08 11:32:55	897
@@ -5,25 +5,28 @@
 #include <QThread>
 
 #include "logger.h"
-#include "util.h"
-//#include <QDebug>
 
 class Converter : public QThread
 {
      Q_OBJECT
 public:
-    Converter(Logger *myLogger, QStringList *myData);
+    Converter(QString AppDir, Logger *myLogger, QStringList *myData);
 private:
+    QString AppDir;
     Logger *myLogger;
     QStringList *myData;
+    QProcess *myProcess;
+    bool processHasKilled;
 
 protected:
     void run(); //for thread
 private slots:
+    void terminateCurrProcess();
 signals:
     void setupPB(int numberTasks);
     void taskDone();
     void resultConversion(QString result, int numErrors);
+    void conversionAborted();
 };