1 files changed, 42 insertions, 60 deletions

diff --git a/src/libs/kdtools/kdupdaterupdate.h b/src/libs/kdtools/kdupdaterupdate.h
index 17250a71e..ec9c56d24 100644
--- a/src/libs/kdtools/kdupdaterupdate.h
+++ b/src/libs/kdtools/kdupdaterupdate.h
@@ -1,87 +1,69 @@
 /****************************************************************************
-** Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.  All rights reserved.
 **
-** This file is part of the KD Tools library.
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Contact: http://www.qt-project.org/legal
 **
-** Licensees holding valid commercial KD Tools licenses may use this file in
-** accordance with the KD Tools Commercial License Agreement provided with
-** the Software.
+** 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.
 **
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL included.
+** 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.
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+** 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.
 **
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
+** 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 KD_UPDATER_UPDATE_H
 #define KD_UPDATER_UPDATE_H
 
-#include "kdupdater.h"
-#include "kdupdatertask.h"
-
-#include <QUrl>
-#include <QDate>
 #include <QHash>
+#include <QUrl>
 #include <QVariant>
-#include <QList>
 
 namespace KDUpdater {
 
-class Application;
-struct UpdateSourceInfo;
-class UpdateFinder;
-class UpdateOperation;
-
-class KDTOOLS_EXPORT Update : public Task
+class Update
 {
-    Q_OBJECT
-
 public:
-    ~Update();
+    QVariant data(const QString &name, const QVariant &defaultValue = QVariant()) const;
 
-    Application *application() const;
-
-    UpdateType type() const;
-    QUrl updateUrl() const;
-    QDate releaseDate() const;
-    QVariant data(const QString &m_name, const QVariant &defaultValue = QVariant()) const;
-    UpdateSourceInfo sourceInfo() const;
-
-    bool canDownload() const;
-    bool isDownloaded() const;
-    void download() { run(); }
-    QString downloadedFileName() const;
-
-    QList<UpdateOperation *> operations() const;
-
-    quint64 compressedSize() const;
-    quint64 uncompressedSize() const;
-
-private Q_SLOTS:
-    void downloadProgress(double);
-    void downloadAborted(const QString &msg);
-    void downloadCompleted();
+    int priority() const;
+    QUrl sourceInfoUrl() const;
 
 private:
     friend class UpdateFinder;
-    struct UpdateData;
-    UpdateData *d;
-
-    void doRun();
-    bool doStop();
-    bool doPause();
-    bool doResume();
+    Update(int p, const QUrl &sourceInfoUrl, const QHash<QString, QVariant> &data);
 
-    Update(Application *application, const UpdateSourceInfo &sourceInfo,
-           UpdateType type, const QUrl &updateUrl, const QHash<QString, QVariant> &data,
-           quint64 compressedSize, quint64 uncompressedSize, const QByteArray &sha1sum);
+private:
+    int m_priority;
+    QUrl m_sourceInfoUrl;
+    QHash<QString, QVariant> m_data;
 };
 
 } // namespace KDUpdater