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 897 by s10k, Wed Jan 8 11:32:55 2014 UTC vs.
s10k/Vago/converter.h (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

# Line 3 | Line 3
3   #include <QProcess>
4   #include <QProgressBar>
5   #include <QThread>
6 + #ifdef Q_OS_WIN
7 + #include <QWinTaskbarProgress>
8 + #endif
9  
10 < #include "logger.h"
10 > #include "utilvago.h"
11  
12   class Converter : public QThread
13   {
14       Q_OBJECT
15   public:
16 <    Converter(QString AppDir, Logger *myLogger, QStringList *myData);
16 >    Converter(QString AppDir, QStringList *myData);
17 >
18 >    #ifdef Q_OS_WIN
19 >    Converter(QString AppDir, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
20 >    #endif
21   private:
22      QString AppDir;
16 –    Logger *myLogger;
23      QStringList *myData;
24 <    QProcess *myProcess;
25 <    bool processHasKilled;
24 >    std::unique_ptr<QProcess> myProcess;
25 >    #ifdef Q_OS_WIN
26 >    QWinTaskbarProgress *win7TaskBarProgress = nullptr;
27 >    #endif
28  
29   protected:
30      void run(); //for thread

Diff Legend

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