--- Vago/trunk/Vago/converter.h 2013/04/13 13:44:29 815 +++ Vago/trunk/Vago/converter.h 2014/01/08 11:32:55 897 @@ -5,8 +5,6 @@ #include #include "logger.h" -#include "util.h" -//#include class Converter : public QThread { @@ -17,14 +15,18 @@ 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(); };