ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/converter.h

Comparing Vago/trunk/Vago/converter.h (file contents):
Revision 815 by s10k, Sat Apr 13 13:44:29 2013 UTC vs.
Revision 1047 by s10k, Fri Sep 16 22:51:26 2016 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"
8	<	#include "util.h"
9	<	//#include <QDebug>
10	>	#include "utilvago.h"
11
12		class Converter : public QThread
13		{
14		Q_OBJECT
15		public:
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)