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

Comparing s10k/Vago/converter.h (file contents):
Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC vs.
Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

# Line 13 | Line 13 | 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, Logger *myLogger, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
19 >    Converter(QString AppDir, QStringList *myData, QWinTaskbarProgress *win7TaskBarProgress);
20      #endif
21   private:
22      QString AppDir;
23 –    Logger *myLogger;
23      QStringList *myData;
24 <    QProcess *myProcess;
26 <    bool processHasKilled;
24 >    std::unique_ptr<QProcess> myProcess;
25      #ifdef Q_OS_WIN
26      QWinTaskbarProgress *win7TaskBarProgress = nullptr;
27      #endif

Diff Legend

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