diff -r e95081c21da2 -r c2a05fa925a1 file.cpp
--- a/file.cpp	Tue Sep 05 09:47:14 2006 +0000
+++ b/file.cpp	Fri Dec 08 20:18:56 2006 +0000
@@ -1,6 +1,4 @@
-#include <qobject.h>
-#include <qmessagebox.h>
-//Added by qt3to4:
+#include <QMessageBox>
 #include <QPixmap>
 #include <QLabel>
 #include <QTextStream>
@@ -141,15 +139,15 @@
 	ErrorCode err=success;
 	
 	// zip the temporary directory
+	QStringList args;
 	Process *zipProc=new Process ();
-	zipProc->clearArguments();
-	zipProc->setWorkingDirectory (QDir(zipDir));
-	zipProc->addArgument ("zip");
-	zipProc->addArgument ("-r");
-	zipProc->addArgument (zipName);
-	zipProc->addArgument (".");
+	zipProc->setWorkingDirectory (zipDir.path());
+	args <<"-r";
+	args <<zipName;
+	args <<".";
 
-	if (!zipProc->start() )
+	zipProc->start ("zip",args);
+	if (!zipProc->waitForStarted() )
 	{	
 		// zip could not be started
 		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
@@ -158,8 +156,8 @@
 	} else
 	{
 		// zip could be started
-		zipProc->waitFinished();
-		if (!zipProc->normalExit() )
+		zipProc->waitForFinished();
+		if (zipProc->exitStatus()!=QProcess::NormalExit )
 		{
 			QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
 						   QObject::tr("zip didn't exit normally")+
@@ -167,10 +165,10 @@
 			err=aborted;
 		} else
 		{
-			if (zipProc->exitStatus()>0)
+			if (zipProc->exitCode()>0)
 			{
 				QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
-						   QString("zip exit code:  %1").arg(zipProc->exitStatus() )+
+						   QString("zip exit code:  %1").arg(zipProc->exitCode() )+
 						   "\n" + zipProc->getErrout() );
 				err=aborted;
 			}
@@ -184,16 +182,16 @@
 	ErrorCode err=success;
 
 	// Try to unzip file
+	QStringList args;
 	Process *zipProc=new Process ();
-	zipProc->clearArguments();
-	zipProc->setWorkingDirectory (zipDir);
-	zipProc->addArgument ("unzip");
-	zipProc->addArgument ("-o");	// overwrite existing files!
-	zipProc->addArgument (zipName );
-	zipProc->addArgument ("-d");
-	zipProc->addArgument (zipDir.path());
+	zipProc->setWorkingDirectory (zipDir.path());
+	args << "-o";	// overwrite existing files!
+	args << zipName ;
+	args << "-d";
+	args << zipDir.path();
 
-	if (!zipProc->start() )
+	zipProc->start ("unzip",args);
+	if (!zipProc->waitForStarted() )
 	{
 		QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
 					   QObject::tr("Couldn't start unzip to decompress data."));
@@ -201,8 +199,8 @@
 		
 	} else
 	{
-		zipProc->waitFinished();
-		if (!zipProc->normalExit() )
+		zipProc->waitForFinished();
+		if (zipProc->exitStatus()!=QProcess::NormalExit )
 		{
 			QMessageBox::critical( 0,QObject::tr( "Critical Error" ),
 						   QObject::tr("unzip didn't exit normally") +
@@ -210,7 +208,7 @@
 			err=aborted;
 		} else
 		{
-			if (zipProc->exitStatus()>0)
+			if (zipProc->exitCode()>0)
 			{
 				if (zipProc->exitStatus()==9)
 					// no zipped file, but maybe .xml or old version? Try again.
@@ -218,7 +216,7 @@
 				else	
 				{
 					QMessageBox::critical( 0, QObject::tr( "Critical Error" ),
-								   QString("unzip exit code:  %1").arg(zipProc->exitStatus() ) +
+								   QString("unzip exit code:  %1").arg(zipProc->exitCode() ) +
 								   zipProc->getErrout() );
 					err=aborted;
 				}