summaryrefslogtreecommitdiffstats
path: root/scribus/fileunzip.cpp
diff options
context:
space:
mode:
authorcraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-05-31 20:01:33 +0000
committercraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-05-31 20:01:33 +0000
commit3e45d96fc4cc935f1a318da181f9adafcbd4e7e4 (patch)
treedf8c7f57f7ed3f00e2c81115bcc108e51b74559a /scribus/fileunzip.cpp
parent7eb293d1e7e887b55c23a1cb992f9aeb03886f24 (diff)
downloadscribus-3e45d96fc4cc935f1a318da181f9adafcbd4e7e4.tar.gz
scribus-3e45d96fc4cc935f1a318da181f9adafcbd4e7e4.tar.xz
scribus-3e45d96fc4cc935f1a318da181f9adafcbd4e7e4.zip
Allow FileUnzip to extract to a specific path
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17528 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/fileunzip.cpp')
-rw-r--r--scribus/fileunzip.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/scribus/fileunzip.cpp b/scribus/fileunzip.cpp
index 4275a42..a3e034f 100644
--- a/scribus/fileunzip.cpp
+++ b/scribus/fileunzip.cpp
@@ -83,10 +83,14 @@ FileUnzip::FileUnzip(QString zipFilePath)
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())