ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/converter.h
(Generate patch)

Comparing:
Vago/trunk/Vago/converter.h (file contents), Revision 771 by s10k, Sun Mar 31 19:02:16 2013 UTC vs.
s10k/Vago/converter.h (file contents), Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC

# Line 1 | Line 1
1   #ifndef CONVERTER_H
2   #define CONVERTER_H
3   #include <QProcess>
4 – #include <logger.h>
4   #include <QProgressBar>
5   #include <QThread>
6 < #include <util.h>
7 < #include <QDebug>
6 > #ifdef Q_OS_WIN
7 > #include <QWinTaskbarProgress>
8 > #endif
9 >
10 > #include "utilvago.h"
11  
12   class Converter : public QThread
13   {
14       Q_OBJECT
15   public:
16 <    Converter(Logger *myLogger, QStringList *myData);
16 >    Converter(QString AppDir, Logger *myLogger, QStringList *myData);
17 >
18 >    #ifdef Q_OS_WIN
19 >    Converter(QString AppDir, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
20 >    #endif
21   private:
22 +    QString AppDir;
23      Logger *myLogger;
24      QStringList *myData;
25 +    QProcess *myProcess;
26 +    bool processHasKilled;
27 +    #ifdef Q_OS_WIN
28 +    QWinTaskbarProgress *win7TaskBarProgress = nullptr;
29 +    #endif
30  
31   protected:
32      void run(); //for thread
33   private slots:
34 +    void terminateCurrProcess();
35   signals:
36      void setupPB(int numberTasks);
37      void taskDone();
38      void resultConversion(QString result, int numErrors);
39 +    void conversionAborted();
40   };
41  
42  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)