diff options
Diffstat (limited to 'src/libs/kdtools/kdupdaterapplication.cpp')
| -rw-r--r-- | src/libs/kdtools/kdupdaterapplication.cpp | 92 |
1 files changed, 36 insertions, 56 deletions
diff --git a/src/libs/kdtools/kdupdaterapplication.cpp b/src/libs/kdtools/kdupdaterapplication.cpp index 352c33ca8..76290348c 100644 --- a/src/libs/kdtools/kdupdaterapplication.cpp +++ b/src/libs/kdtools/kdupdaterapplication.cpp @@ -1,24 +1,43 @@ /**************************************************************************** -** 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$ +** +****************************************************************************/ #include "kdupdaterapplication.h" #include "kdupdaterpackagesinfo.h" @@ -27,7 +46,6 @@ #include <QCoreApplication> #include <QDebug> #include <QDir> -#include <QSettings> using namespace KDUpdater; @@ -55,32 +73,6 @@ medium-to-large scale software systems. \namespace KDUpdater */ -ConfigurationInterface::~ConfigurationInterface() -{ -} - -namespace { - -class DefaultConfigImpl : public ConfigurationInterface -{ -public: - QVariant value(const QString &key) const - { - QSettings settings; - settings.beginGroup(QLatin1String("KDUpdater")); - return settings.value(key); - } - - void setValue(const QString &key, const QVariant &value) - { - QSettings settings; - settings.beginGroup(QLatin1String("KDUpdater")); - settings.setValue(key, value); - } -}; - -} // namespace anon - /*! \class KDUpdater::Application kdupdaterapplication.h KDUpdaterApplication \ingroup kdupdater @@ -95,7 +87,6 @@ public: User can also retrieve some information from this class: \li application name \li application version - \li compat level */ struct Application::ApplicationData @@ -103,7 +94,7 @@ struct Application::ApplicationData explicit ApplicationData(ConfigurationInterface *config) : packagesInfo(0), updateSourcesInfo(0), - configurationInterface(config ? config : new DefaultConfigImpl) + configurationInterface(config ? config : new ConfigurationInterface) { const QStringList oldFiles = configurationInterface->value(QLatin1String("FilesForDelayedDeletion")).toStringList(); Q_FOREACH(const QString &i, oldFiles) { //TODO this should happen asnyc and report errors, I guess @@ -122,7 +113,7 @@ struct Application::ApplicationData delete updateSourcesInfo; delete configurationInterface; } - + static Application *instance; QString applicationDirectory; @@ -161,7 +152,7 @@ Application::~Application() } /*! - Returns a previousle created Application instance. + Returns a previously created Application instance. */ Application *Application::instance() { @@ -215,17 +206,6 @@ QString Application::applicationVersion() const return QString(); } -/*! - Returns the compat level that this application is in. -*/ -int Application::compatLevel() const -{ - if (d->packagesInfo->isValid()) - return d->packagesInfo->compatLevel(); - - return -1; -} - void Application::addUpdateSource(const QString &name, const QString &title, const QString &description, const QUrl &url, int priority) { @@ -292,7 +272,7 @@ UpdateSourcesInfo* Application::updateSourcesInfo() const { return d->updateSourcesInfo; } - + void Application::printError(int errorCode, const QString &error) { qDebug() << errorCode << error; |