--- Vago/trunk/Vago/converter.h 2014/01/08 11:32:55 897 +++ s10k/Vago/converter.h 2017/12/30 13:43:28 1092 @@ -3,20 +3,30 @@ #include #include #include +#ifdef Q_OS_WIN +#include +#endif -#include "logger.h" +#include "utilvago.h" class Converter : public QThread { Q_OBJECT public: 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