1.1 --- a/file.cpp	Thu Nov 23 16:18:26 2006 +0000
     1.2 +++ b/file.cpp	Fri Dec 08 20:18:56 2006 +0000
     1.3 @@ -1,6 +1,4 @@
     1.4 -#include <qobject.h>
     1.5 -#include <qmessagebox.h>
     1.6 -//Added by qt3to4:
     1.7 +#include <QMessageBox>
     1.8  #include <QPixmap>
     1.9  #include <QLabel>
    1.10  #include <QTextStream>
    1.11 @@ -141,15 +139,15 @@
    1.12  	ErrorCode err=success;
    1.13  	
    1.14  	// zip the temporary directory
    1.15 +	QStringList args;
    1.16  	Process *zipProc=new Process ();
    1.17 -	zipProc->clearArguments();
    1.18 -	zipProc->setWorkingDirectory (QDir(zipDir));
    1.19 -	zipProc->addArgument ("zip");
    1.20 -	zipProc->addArgument ("-r");
    1.21 -	zipProc->addArgument (zipName);
    1.22 -	zipProc->addArgument (".");
    1.23 +	zipProc->setWorkingDirectory (zipDir.path());
    1.24 +	args <<"-r";
    1.25 +	args <<zipName;
    1.26 +	args <<".";
    1.27  
    1.28 -	if (!zipProc->start() )
    1.29 +	zipProc->start ("zip",args);
    1.30 +	if (!zipProc->waitForStarted() )
    1.31  	{	
    1.32  		// zip could not be started
    1.33  		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    1.34 @@ -158,8 +156,8 @@
    1.35  	} else
    1.36  	{
    1.37  		// zip could be started
    1.38 -		zipProc->waitFinished();
    1.39 -		if (!zipProc->normalExit() )
    1.40 +		zipProc->waitForFinished();
    1.41 +		if (zipProc->exitStatus()!=QProcess::NormalExit )
    1.42  		{
    1.43  			QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    1.44  						   QObject::tr("zip didn't exit normally")+
    1.45 @@ -167,10 +165,10 @@
    1.46  			err=aborted;
    1.47  		} else
    1.48  		{
    1.49 -			if (zipProc->exitStatus()>0)
    1.50 +			if (zipProc->exitCode()>0)
    1.51  			{
    1.52  				QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    1.53 -						   QString("zip exit code:  %1").arg(zipProc->exitStatus() )+
    1.54 +						   QString("zip exit code:  %1").arg(zipProc->exitCode() )+
    1.55  						   "\n" + zipProc->getErrout() );
    1.56  				err=aborted;
    1.57  			}
    1.58 @@ -184,16 +182,16 @@
    1.59  	ErrorCode err=success;
    1.60  
    1.61  	// Try to unzip file
    1.62 +	QStringList args;
    1.63  	Process *zipProc=new Process ();
    1.64 -	zipProc->clearArguments();
    1.65 -	zipProc->setWorkingDirectory (zipDir);
    1.66 -	zipProc->addArgument ("unzip");
    1.67 -	zipProc->addArgument ("-o");	// overwrite existing files!
    1.68 -	zipProc->addArgument (zipName );
    1.69 -	zipProc->addArgument ("-d");
    1.70 -	zipProc->addArgument (zipDir.path());
    1.71 +	zipProc->setWorkingDirectory (zipDir.path());
    1.72 +	args << "-o";	// overwrite existing files!
    1.73 +	args << zipName ;
    1.74 +	args << "-d";
    1.75 +	args << zipDir.path();
    1.76  
    1.77 -	if (!zipProc->start() )
    1.78 +	zipProc->start ("unzip",args);
    1.79 +	if (!zipProc->waitForStarted() )
    1.80  	{
    1.81  		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
    1.82  					   QObject::tr("Couldn't start unzip to decompress data."));
    1.83 @@ -201,8 +199,8 @@
    1.84  		
    1.85  	} else
    1.86  	{
    1.87 -		zipProc->waitFinished();
    1.88 -		if (!zipProc->normalExit() )
    1.89 +		zipProc->waitForFinished();
    1.90 +		if (zipProc->exitStatus()!=QProcess::NormalExit )
    1.91  		{
    1.92  			QMessageBox::critical( 0,QObject::tr( "Critical Error" ),
    1.93  						   QObject::tr("unzip didn't exit normally") +
    1.94 @@ -210,7 +208,7 @@
    1.95  			err=aborted;
    1.96  		} else
    1.97  		{
    1.98 -			if (zipProc->exitStatus()>0)
    1.99 +			if (zipProc->exitCode()>0)
   1.100  			{
   1.101  				if (zipProc->exitStatus()==9)
   1.102  					// no zipped file, but maybe .xml or old version? Try again.
   1.103 @@ -218,7 +216,7 @@
   1.104  				else	
   1.105  				{
   1.106  					QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
   1.107 -								   QString("unzip exit code:  %1").arg(zipProc->exitStatus() ) +
   1.108 +								   QString("unzip exit code:  %1").arg(zipProc->exitCode() ) +
   1.109  								   zipProc->getErrout() );
   1.110  					err=aborted;
   1.111  				}