r17528 by craig - Allow FileUnzip to extract to a specific path

[scribus-commit]

Author: craig
Date: Thu May 31 20:01:33 2012
New Revision: 17528

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17528
Log:
Allow FileUnzip to extract to a specific path

Modified:
    branches/Version14x/Scribus/scribus/fileunzip.cpp
    branches/Version14x/Scribus/scribus/fileunzip.h

Modified: branches/Version14x/Scribus/scribus/fileunzip.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17528&path=/branches/Version14x/Scribus/scribus/fileunzip.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/fileunzip.cpp (original)
+++ branches/Version14x/Scribus/scribus/fileunzip.cpp Thu May 31 20:01:33 2012
@@ -83,10 +83,14 @@
 	zipFile = zipFilePath;
 }
 
-QString FileUnzip::getFile(QString name)
+QString FileUnzip::getFile(QString name, QString path)
 {
 	QString pwd = QDir::currentPath();
-	QString outDir = ScPaths::getTempFileDir();
+	QString outDir;
+	if (path.isNull())
+		outDir = ScPaths::getTempFileDir();
+	else
+		outDir=path;
 	QFile f(outDir);
 	QFileInfo fi(f);
 	if (!fi.isWritable())

Modified: branches/Version14x/Scribus/scribus/fileunzip.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17528&path=/branches/Version14x/Scribus/scribus/fileunzip.h
==============================================================================
--- branches/Version14x/Scribus/scribus/fileunzip.h (original)
+++ branches/Version14x/Scribus/scribus/fileunzip.h Thu May 31 20:01:33 2012
@@ -45,7 +45,7 @@
 public:
 	FileUnzip(QString zipFilePath);
 	~FileUnzip();
-	QString getFile(QString name);
+	QString getFile(QString name, QString path=QString::null);
 };
 
 #endif