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 771 by s10k, Sun Mar 31 19:02:16 2013 UTC vs.
Revision 897 by s10k, Wed Jan 8 11:32:55 2014 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	>
7	>	#include "logger.h"
8
9		class Converter : public QThread
10		{
11		Q_OBJECT
12		public:
13	<	Converter(Logger *myLogger, QStringList *myData);
13	>	Converter(QString AppDir, Logger *myLogger, QStringList *myData);
14		private:
15	+	QString AppDir;
16		Logger *myLogger;
17		QStringList *myData;
18	+	QProcess *myProcess;
19	+	bool processHasKilled;
20
21		protected:
22		void run(); //for thread
23		private slots:
24	+	void terminateCurrProcess();
25		signals:
26		void setupPB(int numberTasks);
27		void taskDone();
28		void resultConversion(QString result, int numErrors);
29	+	void conversionAborted();
30		};
31
32

Diff Legend

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