summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/lib7z_facade.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/installer/lib7z_facade.h')
-rw-r--r--src/libs/installer/lib7z_facade.h92
1 files changed, 71 insertions, 21 deletions
diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h
index 515d63bba..a783fbd44 100644
--- a/src/libs/installer/lib7z_facade.h
+++ b/src/libs/installer/lib7z_facade.h
@@ -1,17 +1,56 @@
+/**************************************************************************
+**
+** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Installer Framework.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+**************************************************************************/
#ifndef LIB7Z_FACADE_H
#define LIB7Z_FACADE_H
#include "installer_global.h"
+#include <QCoreApplication>
#include <QDateTime>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QPoint>
-#include <QtCore/QRunnable>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QVariant>
-#include <QtCore/QReadWriteLock>
+#include <QFile>
+#include <QPoint>
+#include <QRunnable>
+#include <QString>
+#include <QVariant>
+#include <QVector>
#include "Common/MyWindows.h"
@@ -46,7 +85,6 @@ namespace Lib7z {
QFile::Permissions permissions;
QString path;
- QString name;
QDateTime mtime;
quint64 uncompressedSize;
quint64 compressedSize;
@@ -112,20 +150,32 @@ namespace Lib7z {
void deviceDestroyed(QObject*);
};
- /*
- * @throws Lib7z::SevenZipException
- */
- void INSTALLER_EXPORT extractArchive( QIODevice* archive, const File& item, QIODevice* out, ExtractCallback* callback=0 );
+ /*!
+ Extracts the given File \a file from \a archive into output device \a out using the provided extract
+ callback \a callback.
- /*
- * @throws Lib7z::SevenZipException
- */
- void INSTALLER_EXPORT extractArchive( QIODevice* archive, const File& item, const QString& targetDirectory, ExtractCallback* callback=0 );
+ Throws Lib7z::SevenZipException on error.
+ */
+ void INSTALLER_EXPORT extractFileFromArchive(QIODevice* archive, const File& item, QIODevice* out,
+ ExtractCallback* callback=0 );
- /*
- * @throws Lib7z::SevenZipException
- */
- void INSTALLER_EXPORT extractArchive( QIODevice* archive, const QString& targetDirectory, ExtractCallback* callback=0 );
+ /*!
+ Extracts the given File \a file from \a archive into target directory \a targetDirectory using the
+ provided extract callback \a callback. The output filename is deduced from the \a file path name.
+
+ Throws Lib7z::SevenZipException on error.
+ */
+ void INSTALLER_EXPORT extractFileFromArchive(QIODevice* archive, const File& item,
+ const QString& targetDirectory, ExtractCallback* callback = 0);
+
+ /*!
+ Extracts the given \a archive content into target directory \a targetDirectory using the
+ provided extract callback \a callback. The output filenames are deduced from the \a archive content.
+
+ Throws Lib7z::SevenZipException on error.
+ */
+ void INSTALLER_EXPORT extractArchive(QIODevice* archive, const QString& targetDirectory,
+ ExtractCallback* callback = 0);
/*
* @thows Lib7z::SevenZipException