ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/xmlprocessor.cpp

Comparing:
Vago/trunk/Vago/xmlprocessor.cpp (file contents), Revision 815 by s10k, Sat Apr 13 13:44:29 2013 UTC vs.
s10k/Vago/xmlprocessor.cpp (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

#	Line 1 | Line 1
1		#include "xmlprocessor.h"
2
3	<	XmlProcessor::XmlProcessor(QString AppDir, Logger *myLogger, QStringList *commands)
3	>	XmlProcessor::XmlProcessor(QString AppDir, QStringList *commands)
4		{
5		this->AppDir=AppDir;
6	–	this->myLogger=myLogger;
6		this->commands=commands;
7		}
8
9		void XmlProcessor::run()
10		{
11	<	QProcess *myProcess = new QProcess();
11	>	QProcess myProcess;
12		QString result = QString();
13		QString errorMessage = "";
14		int numErrors=0;
15
16	<	myProcess->setWorkingDirectory(this->AppDir);
16	>	myProcess.setWorkingDirectory(this->AppDir);
17
18		for(int i=0; i<this->commands->size(); i++){
19
20	<	myProcess->start(GlobalVars::XmlToolsExeName+" "+this->commands->at(i));
21	<	myProcess->waitForFinished(-1);
22	<	result=myProcess->readAllStandardError();
20	>	myProcess.start(UtilVago::getXmlToolsExecutable() +" "+this->commands->at(i));
21	>	myProcess.waitForFinished(-1);
22	>	result=myProcess.readAllStandardError();
23
24		if(!result.isEmpty()){
25		//catch exception
26	<	myLogger->writeString("Xml Tools Error: \n"+this->commands->at(i)+"\n"+result);
26	>	LOG_ERROR << "Xml Tools Error: \n" + this->commands->at(i) + "\n"+result;
27		errorMessage=result;
28		numErrors++;
29		}
30
31		}
32
34	–	delete myProcess; //delete object and make pointer invalid
33		this->commands->clear(); //clean list
34
35		//let's cut it a bit, complete error is in log file.

Diff Legend

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