diff options
Diffstat (limited to 'src/libs/kdtools')
48 files changed, 859 insertions, 372 deletions
diff --git a/src/libs/kdtools/environment.cpp b/src/libs/kdtools/environment.cpp index 76babf377..644e6cbbf 100644 --- a/src/libs/kdtools/environment.cpp +++ b/src/libs/kdtools/environment.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/environment.h b/src/libs/kdtools/environment.h index 013645b87..d590d6dcd 100644 --- a/src/libs/kdtools/environment.h +++ b/src/libs/kdtools/environment.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdgenericfactory.cpp b/src/libs/kdtools/kdgenericfactory.cpp index 683b18876..65cc14913 100644 --- a/src/libs/kdtools/kdgenericfactory.cpp +++ b/src/libs/kdtools/kdgenericfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -129,7 +129,7 @@ /*! \fn KDGenericFactory::~KDGenericFactory() - Destructor. + Destroys the generic factory. */ /*! @@ -139,9 +139,26 @@ */ /*! + \typedef KDGenericFactory::FactoryFunctionWithArg + + This typedef defines a factory function producing an object of type T_Product + with the arguments specified by \a arg. +*/ + +/*! \fn KDGenericFactory::registerProduct( const T_Identifier& name ) - Registers a product of type T, identified by \a name in the factory. + Registers a product of the type T, identified by \a name in the factory. + Any type with the same name gets unregistered. + + If a product was registered via this method, it will be created using its + default constructor. +*/ + +/*! + \fn KDGenericFactory::registerProductWithArg(const T_Identifier &name) + + Registers a product of the type T, identified by \a name, with arguments. Any type with the same name gets unregistered. If a product was registered via this method, it will be created using its @@ -151,6 +168,14 @@ /*! \fn KDGenericFactory::create( const T_Identifier& name ) const - Creates and returns a product of the type identified by \a name. + Creates and returns a product of the type T identified by \a name. + Ownership of the product is transferred to the caller. +*/ + +/*! + \fn KDGenericFactory::createWithArg(const T_Identifier &name, const T_Argument &arg) const + + Creates and returns a product of the type T identified by \a name with the + arguments specified by \a arg. Ownership of the product is transferred to the caller. */ diff --git a/src/libs/kdtools/kdgenericfactory.h b/src/libs/kdtools/kdgenericfactory.h index c4826dfb9..cca53e986 100644 --- a/src/libs/kdtools/kdgenericfactory.h +++ b/src/libs/kdtools/kdgenericfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdjob.cpp b/src/libs/kdtools/kdjob.cpp index 0a0636fa8..43ca36875 100644 --- a/src/libs/kdtools/kdjob.cpp +++ b/src/libs/kdtools/kdjob.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdjob.h b/src/libs/kdtools/kdjob.h index dfa85df5f..14231e7ed 100644 --- a/src/libs/kdtools/kdjob.h +++ b/src/libs/kdtools/kdjob.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/kdlockfile.cpp index 42d6d5711..c929298e3 100644 --- a/src/libs/kdtools/kdlockfile.cpp +++ b/src/libs/kdtools/kdlockfile.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile.h b/src/libs/kdtools/kdlockfile.h index 348d2f72e..615793fb4 100644 --- a/src/libs/kdtools/kdlockfile.h +++ b/src/libs/kdtools/kdlockfile.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_p.h b/src/libs/kdtools/kdlockfile_p.h index 152393b85..8c482a3a0 100644 --- a/src/libs/kdtools/kdlockfile_p.h +++ b/src/libs/kdtools/kdlockfile_p.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_unix.cpp b/src/libs/kdtools/kdlockfile_unix.cpp index eac314bbe..938961ac2 100644 --- a/src/libs/kdtools/kdlockfile_unix.cpp +++ b/src/libs/kdtools/kdlockfile_unix.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdlockfile_win.cpp b/src/libs/kdtools/kdlockfile_win.cpp index 3fde9de3a..963ba682f 100644 --- a/src/libs/kdtools/kdlockfile_win.cpp +++ b/src/libs/kdtools/kdlockfile_win.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/kdrunoncechecker.cpp index 8e4c42711..dbc9cb30d 100644 --- a/src/libs/kdtools/kdrunoncechecker.cpp +++ b/src/libs/kdtools/kdrunoncechecker.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdrunoncechecker.h b/src/libs/kdtools/kdrunoncechecker.h index 92051ee9f..9ee71b8e0 100644 --- a/src/libs/kdtools/kdrunoncechecker.h +++ b/src/libs/kdtools/kdrunoncechecker.h @@ -1,8 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -11,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdselfrestarter.cpp b/src/libs/kdtools/kdselfrestarter.cpp index b3803db28..358076506 100644 --- a/src/libs/kdtools/kdselfrestarter.cpp +++ b/src/libs/kdtools/kdselfrestarter.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdselfrestarter.h b/src/libs/kdtools/kdselfrestarter.h index 10956360b..3808ac207 100644 --- a/src/libs/kdtools/kdselfrestarter.h +++ b/src/libs/kdtools/kdselfrestarter.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo.cpp b/src/libs/kdtools/kdsysinfo.cpp index 47002a4cc..c56e4c98f 100644 --- a/src/libs/kdtools/kdsysinfo.cpp +++ b/src/libs/kdtools/kdsysinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo.h b/src/libs/kdtools/kdsysinfo.h index aa163bfc5..4b8f24fa1 100644 --- a/src/libs/kdtools/kdsysinfo.h +++ b/src/libs/kdtools/kdsysinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_mac.cpp b/src/libs/kdtools/kdsysinfo_mac.cpp index 1394aa912..8c25bde42 100644 --- a/src/libs/kdtools/kdsysinfo_mac.cpp +++ b/src/libs/kdtools/kdsysinfo_mac.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp index 531e9b03c..545cc6aad 100644 --- a/src/libs/kdtools/kdsysinfo_win.cpp +++ b/src/libs/kdtools/kdsysinfo_win.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdsysinfo_x11.cpp b/src/libs/kdtools/kdsysinfo_x11.cpp index 140754707..1e0a109b7 100644 --- a/src/libs/kdtools/kdsysinfo_x11.cpp +++ b/src/libs/kdtools/kdsysinfo_x11.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdtoolsglobal.h b/src/libs/kdtools/kdtoolsglobal.h index d2b4730a2..5daedb9c5 100644 --- a/src/libs/kdtools/kdtoolsglobal.h +++ b/src/libs/kdtools/kdtoolsglobal.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdater.h b/src/libs/kdtools/kdupdater.h index b1e6cd582..bd873227a 100644 --- a/src/libs/kdtools/kdupdater.h +++ b/src/libs/kdtools/kdupdater.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterapplication.cpp b/src/libs/kdtools/kdupdaterapplication.cpp index bd766b436..95c3613da 100644 --- a/src/libs/kdtools/kdupdaterapplication.cpp +++ b/src/libs/kdtools/kdupdaterapplication.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -45,20 +45,47 @@ using namespace KDUpdater; /*! \inmodule kdupdater \namespace KDUpdater - \brief The KDUpdater classes where initially developed by KDAB to help provide automatic - updates for your applications. Now they are solely part of the Qt Installer Framework. + \brief The KDUpdater classes provide functions to automatically detect + updates to applications, to retrieve them from external repositories, and to + install them. + + KDUpdater classes are a fork of KDAB's general + \l{http://docs.kdab.com/kdtools/2.2.2/group__kdupdater.html}{KDUpdater module}. +*/ + +/*! + \class KDUpdater::ConfigurationInterface + \inmodule kdupdater + \brief The ConfigurationInterface class provides an interface for configuring + an application. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::~ConfigurationInterface() + Destroys the configuration interface. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::value(const QString &key) const + Returns the value of the key \a key. +*/ + +/*! + \fn KDUpdater::ConfigurationInterface::setValue(const QString &key, const QVariant &value) + Sets the value \a value for the key \a key. */ /*! \class KDUpdater::Application \inmodule kdupdater - \brief The \c Application class represents an application that can be updated. + \brief The Application class represents an application that can be updated. A KDUpdater application is an application that interacts with one or more update servers and downloads or installs updates. This class helps in describing an application in terms of: \list \li Application Directory - \li Packages XML file name and its corresponding KDUpdater::PackagesInfo object + \li Installation information XML file name and its corresponding + KDUpdater::PackagesInfo object \li Update sources XML file name and its corresponding KDUpdater::UpdateSourcesInfo object \endlist @@ -106,8 +133,7 @@ struct Application::ApplicationData Application *Application::ApplicationData::instance = 0; /*! - Constructs the \c Application class and configures it to assume the application directory to be - the directory in which the application exists. + Constructs an application with the parent \a p and configuration class \a config. */ Application::Application(ConfigurationInterface* config, QObject* p) : QObject(p) { @@ -121,7 +147,7 @@ Application::Application(ConfigurationInterface* config, QObject* p) : QObject(p } /*! - Destructor + Destroys the application. */ Application::~Application() { @@ -131,7 +157,7 @@ Application::~Application() } /*! - Returns a previously created \c Application instance. + Returns a previously created application instance. */ Application *Application::instance() { @@ -139,8 +165,8 @@ Application *Application::instance() } /*! - Sets the application directory path directory to \a dir. The package XML and update sources - XML files found in the new application directory will be used. + Sets the application directory path directory to \a dir. The installation information and + update sources XML files found in the new application directory will be used. */ void Application::setApplicationDirectory(const QString &dir) { @@ -186,7 +212,8 @@ QString Application::applicationVersion() const } /*! - Adds update source info to this class. + Adds the \a name, \a title, \a description, \a url, and \a priority of the + update source to this class. \sa KDUpdater::UpdateSourceInfo \sa KDUpdater::UpdateSourcesInfo @@ -205,8 +232,8 @@ void Application::addUpdateSource(const QString &name, const QString &title, /*! - Sets the file name of the package XML file for this application to \a fileName. By default, - this is assumed to be Packages.xml in the application directory. + Sets the file name of the installation information XML file for this application to \a fileName. + By default, this is assumed to be Packages.xml in the application directory. \sa KDUpdater::PackagesInfo::setFileName() */ @@ -216,7 +243,7 @@ void Application::setPackagesXMLFileName(const QString &fileName) } /*! - Returns the package XML file name. + Returns the installation information XML file name. */ QString Application::packagesXMLFileName() const { @@ -232,8 +259,9 @@ PackagesInfo* Application::packagesInfo() const } /*! - Sets the file name of the update sources XML file for this application. By default, this is - assumed to be UpdateSources.xml in the application directory. + Sets \a fileName as the file name of the update sources XML file for this + application. By default, this is assumed to be UpdateSources.xml in the + application directory. \sa KDUpdater::UpdateSourcesInfo::setFileName() */ @@ -258,16 +286,25 @@ UpdateSourcesInfo* Application::updateSourcesInfo() const return d->updateSourcesInfo; } +/*! + Prints the error code \a errorCode and error message specified by \a error. +*/ void Application::printError(int errorCode, const QString &error) { qDebug() << errorCode << error; } +/*! + Returns a list of files that are scheduled for delayed deletion. +*/ QStringList Application::filesForDelayedDeletion() const { return d->filesForDelayedDeletion; } +/*! + Schedules \a files for delayed deletion. +*/ void Application::addFilesForDelayedDeletion(const QStringList &files) { d->filesForDelayedDeletion << files; diff --git a/src/libs/kdtools/kdupdaterapplication.h b/src/libs/kdtools/kdupdaterapplication.h index c148a2be8..fec066880 100644 --- a/src/libs/kdtools/kdupdaterapplication.h +++ b/src/libs/kdtools/kdupdaterapplication.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp index 9f656cb77..735358afe 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -70,17 +70,112 @@ static double calcProgress(qint64 done, qint64 total) File downloaders are used by the KDUpdater::Update class to download update files. Each subclass of FileDownloader can download files from a specific category of sources (such as - local, ftp, http). + \c local, \c ftp, \c http). - This is an internal class, not a part of the public API. Currently we have three - subclasses of FileDownloader + This is an internal class, not a part of the public API. Currently we have the + following subclasses of FileDownloader: \list - \li Use the FtpDownloader to download files from an FTP site. - \li Use the HttpDownloader to download files from an HTTP site. - \li Use the LocalFileDownloader to download files from the local file system. + \li HttpDownloader to download files over FTP, HTTP, or HTTPS if Qt is built with SSL. + \li LocalFileDownloader to copy files from the local file system. + \li ResourceFileDownloader to download resource files. \endlist */ +/*! + \property FileDownloader::autoRemoveDownloadedFile + \brief Whether the downloaded file should be automatically removed after it + is downloaded and the class goes out of scope. +*/ + +/*! + \property FileDownloader::url + \brief The URL to download files from. +*/ + +/*! + \property FileDownloader::scheme + \brief The scheme to use for downloading files. + */ + +/*! + \fn FileDownloader::authenticatorChanged(const QAuthenticator &authenticator) + This signal is emitted when the authenticator changes to \a authenticator. +*/ + +/*! + \fn FileDownloader::canDownload() const = 0 + Returns \c true if the file exists and is readable. +*/ + +/*! + \fn FileDownloader::clone(QObject *parent=0) const = 0 + Clones the local file downloader and assigns it the parent \a parent. +*/ + +/*! + \fn FileDownloader::downloadCanceled() + This signal is emitted if downloading a file is canceled. +*/ + +/*! + \fn FileDownloader::downloadedFileName() const = 0 + Returns the file name of the downloaded file. +*/ + +/*! + \fn FileDownloader::downloadProgress(double progress) + This signal is emitted with the current download \a progress. +*/ + +/*! + \fn FileDownloader::downloadProgress(qint64 bytesReceived, qint64 bytesToReceive) + This signal is emitted with the download progress as the number of received bytes, + \a bytesReceived, and the total size of the file to download, \a bytesToReceive. +*/ + +/*! + \fn FileDownloader::downloadSpeed(qint64 bytesPerSecond) + This signal is emitted with the download speed in bytes per second as \a bytesPerSecond. +*/ + +/*! + \fn FileDownloader::downloadStarted() + This signal is emitted when downloading a file starts. +*/ + +/*! + \fn FileDownloader::downloadStatus(const QString &status) + This signal is emitted with textual representation of the current download \a status in the + following format: "100 MiB of 150 MiB - (DAYS) (HOURS) (MINUTES) (SECONDS) remaining". +*/ + +/*! + \fn FileDownloader::estimatedDownloadTime(int seconds) + This signal is emitted with the estimated download time in \a seconds. +*/ + +/*! + \fn FileDownloader::isDownloaded() const = 0 + Returns \c true if the file is downloaded. +*/ + +/*! + \fn FileDownloader::onError() = 0 + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ + +/*! + \fn FileDownloader::onSuccess() = 0 + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ + +/*! + \fn FileDownloader::setDownloadedFileName(const QString &name) = 0 + Sets the file name of the downloaded file to \a name. +*/ + struct KDUpdater::FileDownloader::Private { Private() @@ -130,6 +225,9 @@ struct KDUpdater::FileDownloader::Private bool m_ignoreSslErrors; }; +/*! + Creates a file downloader with the scheme \a scheme and parent \a parent. +*/ KDUpdater::FileDownloader::FileDownloader(const QString &scheme, QObject *parent) : QObject(parent) , d(new Private) @@ -138,6 +236,9 @@ KDUpdater::FileDownloader::FileDownloader(const QString &scheme, QObject *parent d->followRedirect = false; } +/*! + Destroys the file downloader. +*/ KDUpdater::FileDownloader::~FileDownloader() { delete d; @@ -153,26 +254,42 @@ QUrl KDUpdater::FileDownloader::url() const return d->url; } +/*! + Returns the SHA-1 checksum of the downloaded file. +*/ QByteArray KDUpdater::FileDownloader::sha1Sum() const { return d->m_hash.result(); } +/*! + Returns the assumed SHA-1 checksum of the file to download. +*/ QByteArray KDUpdater::FileDownloader::assumedSha1Sum() const { return d->m_assumedSha1Sum; } +/*! + Sets the assumed SHA-1 checksum of the file to download to \a sum. +*/ void KDUpdater::FileDownloader::setAssumedSha1Sum(const QByteArray &sum) { d->m_assumedSha1Sum = sum; } +/*! + Returns an error message. +*/ QString FileDownloader::errorString() const { return d->errorString; } +/*! + Sets the human readable description of the last error that occurred to \a error. Emits the + downloadStatus() and downloadAborted() signals. +*/ void FileDownloader::setDownloadAborted(const QString &error) { d->errorString = error; @@ -180,6 +297,15 @@ void FileDownloader::setDownloadAborted(const QString &error) emit downloadAborted(error); } +/*! + Sets the download status to \c completed and displays a status message. + + If an assumed SHA-1 checksum is set and the actual calculated checksum does not match it, sets + the status to \c error. If no SHA-1 is assumed, no check is performed, and status is set to + \c success. + + Emits the downloadCompleted() and downloadStatus() signals on success. +*/ void KDUpdater::FileDownloader::setDownloadCompleted() { if (d->m_assumedSha1Sum.isEmpty() || (d->m_assumedSha1Sum == sha1Sum())) { @@ -192,6 +318,9 @@ void KDUpdater::FileDownloader::setDownloadCompleted() } } +/*! + Emits the downloadCanceled() and downloadStatus() signals. +*/ void KDUpdater::FileDownloader::setDownloadCanceled() { emit downloadCanceled(); @@ -213,11 +342,17 @@ void KDUpdater::FileDownloader::setAutoRemoveDownloadedFile(bool val) d->autoRemove = val; } +/*! + Determines that redirects should be followed if \a val is \c true. +*/ void KDUpdater::FileDownloader::setFollowRedirects(bool val) { d->followRedirect = val; } +/*! + Returns whether redirects should be followed. +*/ bool KDUpdater::FileDownloader::followRedirects() const { return d->followRedirect; @@ -228,43 +363,68 @@ bool KDUpdater::FileDownloader::isAutoRemoveDownloadedFile() const return d->autoRemove; } +/*! + Downloads files. +*/ void KDUpdater::FileDownloader::download() { QMetaObject::invokeMethod(this, "doDownload", Qt::QueuedConnection); } +/*! + Cancels file download. +*/ void KDUpdater::FileDownloader::cancelDownload() { // Do nothing } +/*! + Starts the download speed timer. +*/ void KDUpdater::FileDownloader::runDownloadSpeedTimer() { if (!d->m_timer.isActive()) d->m_timer.start(d->m_speedTimerInterval, this); } +/*! + Stops the download speed timer. +*/ void KDUpdater::FileDownloader::stopDownloadSpeedTimer() { d->m_timer.stop(); } +/*! + Adds \a sample to the current speed bin. +*/ void KDUpdater::FileDownloader::addSample(qint64 sample) { d->m_currentSpeedBin += sample; } +/*! + Returns the download speed timer ID. +*/ int KDUpdater::FileDownloader::downloadSpeedTimerId() const { return d->m_timer.timerId(); } +/*! + Sets the file download progress to the number of received bytes, \a bytesReceived, + and the number of total bytes to receive, \a bytesToReceive. +*/ void KDUpdater::FileDownloader::setProgress(qint64 bytesReceived, qint64 bytesToReceive) { d->m_bytesReceived = bytesReceived; d->m_bytesToReceive = bytesToReceive; } +/*! + Calculates the download speed in bytes per second and emits the downloadSpeed() signal. +*/ void KDUpdater::FileDownloader::emitDownloadSpeed() { unsigned int windowSize = sizeof(d->m_samples) / sizeof(qint64); @@ -290,6 +450,12 @@ void KDUpdater::FileDownloader::emitDownloadSpeed() emit downloadSpeed(d->m_downloadSpeed); } +/*! + Builds a textual representation of the download status in the following format: + "100 MiB of 150 MiB - (DAYS) (HOURS) (MINUTES) (SECONDS) remaining". + + Emits the downloadStatus() signal. +*/ void KDUpdater::FileDownloader::emitDownloadStatus() { QString status; @@ -342,11 +508,17 @@ void KDUpdater::FileDownloader::emitDownloadStatus() emit downloadStatus(status); } +/*! + Emits dowload progress. +*/ void KDUpdater::FileDownloader::emitDownloadProgress() { emit downloadProgress(d->m_bytesReceived, d->m_bytesToReceive); } +/*! + Emits the estimated download time. +*/ void KDUpdater::FileDownloader::emitEstimatedDownloadTime() { if (d->m_bytesToReceive <= 0 || d->m_downloadSpeed <= 0) { @@ -356,16 +528,25 @@ void KDUpdater::FileDownloader::emitEstimatedDownloadTime() emit estimatedDownloadTime((d->m_bytesToReceive - d->m_bytesReceived) / d->m_downloadSpeed); } +/*! + \overload addCheckSumData() +*/ void KDUpdater::FileDownloader::addCheckSumData(const QByteArray &data) { d->m_hash.addData(data); } +/*! + Adds the \a length of characters of \a data to the cryptographic hash of the downloaded file. +*/ void KDUpdater::FileDownloader::addCheckSumData(const char *data, int length) { d->m_hash.addData(data, length); } +/*! + Resets SHA-1 checksum data of the downloaded file. +*/ void KDUpdater::FileDownloader::resetCheckSumData() { d->m_hash.reset(); @@ -373,8 +554,8 @@ void KDUpdater::FileDownloader::resetCheckSumData() /*! - Returns a copy of the proxy factory that this FileDownloader object is using to determine the proxies to - be used for requests. + Returns a copy of the proxy factory that this FileDownloader object is using to determine the + proxies to be used for requests. */ FileDownloaderProxyFactory *KDUpdater::FileDownloader::proxyFactory() const { @@ -384,9 +565,9 @@ FileDownloaderProxyFactory *KDUpdater::FileDownloader::proxyFactory() const } /*! - Sets the proxy factory for this class to be \a factory. A proxy factory is used to determine a more - specific list of proxies to be used for a given request, instead of trying to use the same proxy value - for all requests. This might only be of use for http or ftp requests. + Sets the proxy factory for this class to be \a factory. A proxy factory is used to determine a + more specific list of proxies to be used for a given request, instead of trying to use the same + proxy value for all requests. This might only be of use for HTTP or FTP requests. */ void KDUpdater::FileDownloader::setProxyFactory(FileDownloaderProxyFactory *factory) { @@ -395,8 +576,8 @@ void KDUpdater::FileDownloader::setProxyFactory(FileDownloaderProxyFactory *fact } /*! - Returns a copy of the authenticator that this FileDownloader object is using to set the username and - password for download request. + Returns a copy of the authenticator that this FileDownloader object is using to set the username + and password for a download request. */ QAuthenticator KDUpdater::FileDownloader::authenticator() const { @@ -404,9 +585,9 @@ QAuthenticator KDUpdater::FileDownloader::authenticator() const } /*! - Sets the authenticator object for this class to be \a authenticator. A authenticator is used to - pass on the required authentication information. This might only be of use for http or ftp requests. - Emits the authenticator changed signal with the new authenticator in use. + Sets the authenticator object for this class to be \a authenticator. An authenticator is used to + pass on the required authentication information. This might only be of use for HTTP or FTP + requests. Emits the authenticator changed signal with the new authenticator in use. */ void KDUpdater::FileDownloader::setAuthenticator(const QAuthenticator &authenticator) { @@ -416,11 +597,17 @@ void KDUpdater::FileDownloader::setAuthenticator(const QAuthenticator &authentic } } +/*! + Returns \c true if SSL errors should be ignored. +*/ bool KDUpdater::FileDownloader::ignoreSslErrors() { return d->m_ignoreSslErrors; } +/*! + Determines that SSL errors should be ignored if \a ignore is \c true. +*/ void KDUpdater::FileDownloader::setIgnoreSslErrors(bool ignore) { d->m_ignoreSslErrors = ignore; @@ -428,20 +615,17 @@ void KDUpdater::FileDownloader::setIgnoreSslErrors(bool ignore) // -- KDUpdater::LocalFileDownloader -/* - Even though QFile::copy() does the task of copying local files from one place - to another, I prefer to use the timer and copy one block of data per unit time. - - This is because, it is possible that the user of KDUpdater is simultaneously - downloading several files. Sometimes in tandem with other file downloaders. - If the local file that is being downloaded takes a long time; then that will - hang the other downloads. - - On the other hand, local downloads need not actually download the file. It can - simply pass on the source file as destination file. At this moment however, - I think the user of LocalFileDownloader will assume that the downloaded file - can be fiddled around with without worrying about whether it would mess up - the original source or not. +/*! + \inmodule kdupdater + \class KDUpdater::LocalFileDownloader + \brief The LocalFileDownloader class is used to copy files from the local + file system. + + The user of KDUpdater might be simultaneously downloading several files; + sometimes in parallel to other file downloaders. If copying a local file takes + a long time, it will make the other downloads hang. Therefore, a timer is used + and one block of data is copied per unit time, even though QFile::copy() does the + task of copying local files from one place to another. */ struct KDUpdater::LocalFileDownloader::Private @@ -460,12 +644,18 @@ struct KDUpdater::LocalFileDownloader::Private int timerId; }; +/*! + Creates a local file downloader with the parent \a parent. +*/ KDUpdater::LocalFileDownloader::LocalFileDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("file"), parent) , d (new Private) { } +/*! + Destroys the local file downloader. +*/ KDUpdater::LocalFileDownloader::~LocalFileDownloader() { if (this->isAutoRemoveDownloadedFile() && !d->destFileName.isEmpty()) @@ -474,12 +664,18 @@ KDUpdater::LocalFileDownloader::~LocalFileDownloader() delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::LocalFileDownloader::canDownload() const { QFileInfo fi(url().toLocalFile()); return fi.exists() && fi.isReadable(); } +/*! + Returns \c true if the file is copied. +*/ bool KDUpdater::LocalFileDownloader::isDownloaded() const { return d->downloaded; @@ -529,21 +725,34 @@ void KDUpdater::LocalFileDownloader::doDownload() emit downloadProgress(0); } +/*! + Returns the file name of the copied file. +*/ QString KDUpdater::LocalFileDownloader::downloadedFileName() const { return d->destFileName; } +/*! + Sets the file name of the copied file to \a name. +*/ void KDUpdater::LocalFileDownloader::setDownloadedFileName(const QString &name) { d->destFileName = name; } +/*! + Clones the local file downloader and assigns it the parent \a parent. Returns + the new local file downloader. +*/ KDUpdater::LocalFileDownloader *KDUpdater::LocalFileDownloader::clone(QObject *parent) const { return new LocalFileDownloader(parent); } +/*! + Cancels copying the file. +*/ void KDUpdater::LocalFileDownloader::cancelDownload() { if (d->timerId < 0) @@ -556,6 +765,9 @@ void KDUpdater::LocalFileDownloader::cancelDownload() setDownloadCanceled(); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::LocalFileDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == d->timerId) { @@ -602,6 +814,10 @@ void KDUpdater::LocalFileDownloader::timerEvent(QTimerEvent *event) } } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void LocalFileDownloader::onSuccess() { d->downloaded = true; @@ -616,6 +832,10 @@ void LocalFileDownloader::onSuccess() stopDownloadSpeedTimer(); } +/*! + Clears the destination file if an error occurs during copying and stops + the download speed timer. +*/ void LocalFileDownloader::onError() { d->downloaded = false; @@ -630,6 +850,11 @@ void LocalFileDownloader::onError() // -- ResourceFileDownloader +/*! + \inmodule kdupdater + \class KDUpdater::ResourceFileDownloader + \brief The ResourceFileDownloader class can be used to download resource files. +*/ struct KDUpdater::ResourceFileDownloader::Private { Private() @@ -642,28 +867,43 @@ struct KDUpdater::ResourceFileDownloader::Private bool downloaded; }; +/*! + Creates a resource file downloader with the parent \a parent. +*/ KDUpdater::ResourceFileDownloader::ResourceFileDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("resource"), parent) , d(new Private) { } +/*! + Destroys the resource file downloader. +*/ KDUpdater::ResourceFileDownloader::~ResourceFileDownloader() { delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::ResourceFileDownloader::canDownload() const { const QFileInfo fi(QInstaller::pathFromUrl(url())); return fi.exists() && fi.isReadable(); } +/*! + Returns \c true if the file is downloaded. +*/ bool KDUpdater::ResourceFileDownloader::isDownloaded() const { return d->downloaded; } +/*! + Downloads a resource file. +*/ void KDUpdater::ResourceFileDownloader::doDownload() { // Already downloaded @@ -686,21 +926,34 @@ void KDUpdater::ResourceFileDownloader::doDownload() d->timerId = startTimer(0); // start as fast as possible } +/*! + Returns the file name of the downloaded file. +*/ QString KDUpdater::ResourceFileDownloader::downloadedFileName() const { return d->destFile.fileName(); } +/*! + Sets the file name of the downloaded file to \a name. +*/ void KDUpdater::ResourceFileDownloader::setDownloadedFileName(const QString &/*name*/) { // Not supported! } +/*! + Clones the resource file downloader and assigns it the parent \a parent. Returns + the new resource file downloader. +*/ KDUpdater::ResourceFileDownloader *KDUpdater::ResourceFileDownloader::clone(QObject *parent) const { return new ResourceFileDownloader(parent); } +/*! + Cancels downloading the file. +*/ void KDUpdater::ResourceFileDownloader::cancelDownload() { if (d->timerId < 0) @@ -712,6 +965,9 @@ void KDUpdater::ResourceFileDownloader::cancelDownload() setDownloadCanceled(); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::ResourceFileDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == d->timerId) { @@ -748,6 +1004,10 @@ void KDUpdater::ResourceFileDownloader::timerEvent(QTimerEvent *event) } } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void KDUpdater::ResourceFileDownloader::onSuccess() { d->destFile.close(); @@ -755,6 +1015,10 @@ void KDUpdater::ResourceFileDownloader::onSuccess() stopDownloadSpeedTimer(); } +/*! + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ void KDUpdater::ResourceFileDownloader::onError() { d->destFile.close(); @@ -766,6 +1030,13 @@ void KDUpdater::ResourceFileDownloader::onError() // -- KDUpdater::HttpDownloader +/*! + \inmodule kdupdater + \class KDUpdater::HttpDownloader + \brief The HttpDownloader class is used to download files over FTP, HTTP, or HTTPS. + + HTTPS is supported if Qt is built with SSL. +*/ struct KDUpdater::HttpDownloader::Private { explicit Private(HttpDownloader *qq) @@ -798,6 +1069,9 @@ struct KDUpdater::HttpDownloader::Private } }; +/*! + Creates an HTTP downloader with the parent \a parent. +*/ KDUpdater::HttpDownloader::HttpDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("http"), parent) , d(new Private(this)) @@ -810,6 +1084,12 @@ KDUpdater::HttpDownloader::HttpDownloader(QObject *parent) SLOT(onAuthenticationRequired(QNetworkReply*, QAuthenticator*))); } +/*! + Destroys an HTTP downloader. + + Removes the downloaded file if FileDownloader::isAutoRemoveDownloadedFile() returns \c true or + FileDownloader::setAutoRemoveDownloadedFile() was called with \c true. +*/ KDUpdater::HttpDownloader::~HttpDownloader() { if (this->isAutoRemoveDownloadedFile() && !d->destFileName.isEmpty()) @@ -817,12 +1097,18 @@ KDUpdater::HttpDownloader::~HttpDownloader() delete d; } +/*! + Returns \c true if the file exists and is readable. +*/ bool KDUpdater::HttpDownloader::canDownload() const { // TODO: Check whether the http file actually exists or not. return true; } +/*! + Returns \c true if the file is downloaded. +*/ bool KDUpdater::HttpDownloader::isDownloaded() const { return d->downloaded; @@ -840,16 +1126,26 @@ void KDUpdater::HttpDownloader::doDownload() runDownloadSpeedTimer(); } +/*! + Returns the file name of the downloaded file. +*/ QString KDUpdater::HttpDownloader::downloadedFileName() const { return d->destFileName; } +/*! + Sets the file name of the downloaded file to \a name. +*/ void KDUpdater::HttpDownloader::setDownloadedFileName(const QString &name) { d->destFileName = name; } +/*! + Clones the HTTP downloader and assigns it the parent \a parent. Returns the new + HTTP downloader. +*/ KDUpdater::HttpDownloader *KDUpdater::HttpDownloader::clone(QObject *parent) const { return new HttpDownloader(parent); @@ -884,6 +1180,9 @@ void KDUpdater::HttpDownloader::httpError(QNetworkReply::NetworkError) httpDone(true); } +/*! + Cancels downloading the file. +*/ void KDUpdater::HttpDownloader::cancelDownload() { d->aborted = true; @@ -914,6 +1213,10 @@ void KDUpdater::HttpDownloader::httpDone(bool error) //PENDING: what about the non-error case?? } +/*! + Closes the destination file if an error occurs during copying and stops + the download speed timer. +*/ void KDUpdater::HttpDownloader::onError() { d->downloaded = false; @@ -923,6 +1226,10 @@ void KDUpdater::HttpDownloader::onError() stopDownloadSpeedTimer(); } +/*! + Closes the destination file after it has been successfully copied and stops + the download speed timer. +*/ void KDUpdater::HttpDownloader::onSuccess() { d->downloaded = true; @@ -967,6 +1274,9 @@ void KDUpdater::HttpDownloader::httpReadProgress(qint64 done, qint64 total) emit downloadProgress(calcProgress(done, total)); } +/*! + Called when the download timer event \a event occurs. +*/ void KDUpdater::HttpDownloader::timerEvent(QTimerEvent *event) { if (event->timerId() == downloadSpeedTimerId()) { diff --git a/src/libs/kdtools/kdupdaterfiledownloader.h b/src/libs/kdtools/kdupdaterfiledownloader.h index c8016b082..0a4cbce22 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.h +++ b/src/libs/kdtools/kdupdaterfiledownloader.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloader_p.h b/src/libs/kdtools/kdupdaterfiledownloader_p.h index b25e25b7d..e3be06ae4 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader_p.h +++ b/src/libs/kdtools/kdupdaterfiledownloader_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp index 39e6ba952..fad1023d1 100644 --- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -49,7 +49,9 @@ using namespace KDUpdater; be created and its reference can be fetched from the instance() method. */ - +/*! + Returns the file downloader factory instance. +*/ FileDownloaderFactory& FileDownloaderFactory::instance() { static KDUpdater::FileDownloaderFactory theFactory; @@ -57,7 +59,7 @@ FileDownloaderFactory& FileDownloaderFactory::instance() } /*! - Constructor + Constructs a file downloader factory and registers the default file downloader set. */ FileDownloaderFactory::FileDownloaderFactory() : d (new FileDownloaderFactoryData) @@ -78,42 +80,66 @@ FileDownloaderFactory::FileDownloaderFactory() d->m_followRedirects = false; } +/*! + Returns whether redirects should be followed. +*/ bool FileDownloaderFactory::followRedirects() { return FileDownloaderFactory::instance().d->m_followRedirects; } +/*! + Determines that redirects should be followed if \a val is \c true. +*/ void FileDownloaderFactory::setFollowRedirects(bool val) { FileDownloaderFactory::instance().d->m_followRedirects = val; } +/*! + Sets \a factory as the file downloader proxy factory. +*/ void FileDownloaderFactory::setProxyFactory(FileDownloaderProxyFactory *factory) { delete FileDownloaderFactory::instance().d->m_factory; FileDownloaderFactory::instance().d->m_factory = factory; } +/*! + Returns \c true if SSL errors should be ignored. +*/ bool FileDownloaderFactory::ignoreSslErrors() { return FileDownloaderFactory::instance().d->m_ignoreSslErrors; } +/*! + Determines that SSL errors should be ignored if \a ignore is \c true. +*/ void FileDownloaderFactory::setIgnoreSslErrors(bool ignore) { FileDownloaderFactory::instance().d->m_ignoreSslErrors = ignore; } +/*! + Destroys the file downloader factory. +*/ FileDownloaderFactory::~FileDownloaderFactory() { delete d; } +/*! + Returns a list of supported schemes. +*/ QStringList FileDownloaderFactory::supportedSchemes() { return FileDownloaderFactory::instance().d->m_supportedSchemes; } +/*! + Returns \c true if \a scheme is a supported scheme. +*/ bool FileDownloaderFactory::isSupportedScheme(const QString &scheme) { return FileDownloaderFactory::instance().d->m_supportedSchemes.contains(scheme @@ -121,8 +147,9 @@ bool FileDownloaderFactory::isSupportedScheme(const QString &scheme) } /*! - Returns a new instance of a KDUpdater::FileDownloader subclass. The subclass is instantiated - based on the communication protocol string stored in \a scheme. + Returns a new instance of a KDUpdater::FileDownloader subclass. The + instantiation of a subclass depends on the communication protocol string + stored in \a scheme with the parent \a parent. \note Ownership of the created object remains with the programmer. */ @@ -147,3 +174,26 @@ FileDownloader *FileDownloaderFactory::create(const QString &scheme, QObject *pa a downloader with the same scheme, the downloader is replaced. When create() is called with that \a scheme, the file downloader is constructed using its default constructor. */ + +/*! + \inmodule kdupdater + \class KDUpdater::FileDownloaderProxyFactory + \brief The FileDownloaderProxyFactory class provides fine-grained proxy selection. + + File downloader objects use a proxy factory to determine a more specific + list of proxies to be used for a given request, instead of trying to use the + same proxy value for all requests. This might only be of use for HTTP or FTP + requests. +*/ + +/*! + \fn FileDownloaderProxyFactory::~FileDownloaderProxyFactory() + + Destroys the file downloader proxy factory. +*/ + +/*! + \fn FileDownloaderProxyFactory::clone() const + + Clones a file downloader proxy factory. +*/ diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h b/src/libs/kdtools/kdupdaterfiledownloaderfactory.h index 4e95755de..ea85f2a05 100644 --- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.h +++ b/src/libs/kdtools/kdupdaterfiledownloaderfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.cpp b/src/libs/kdtools/kdupdaterpackagesinfo.cpp index 6eb32f1e3..78540e64d 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.cpp +++ b/src/libs/kdtools/kdupdaterpackagesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -325,7 +325,11 @@ void PackagesInfo::refresh() } /*! - Marks the package with \a name and \a version as installed. + Marks the package specified by \a name as installed. Sets the values of + \a version, \a title, \a description, \a dependencies, \a forcedInstallation, + \a virtualComp, \a uncompressedSize, and \a inheritVersionFrom for the + package. + */ bool PackagesInfo::installPackage(const QString &name, const QString &version, const QString &title, const QString &description, @@ -353,8 +357,10 @@ bool PackagesInfo::installPackage(const QString &name, const QString &version, } /*! - Updates the package and sets the package name to \a name, the version to \a version and the - last update date to \a date. + Updates the package specified by \a name and sets its version to \a version + and the last update date to \a date. + + Returns \c false if the package is not found. */ bool PackagesInfo::updatePackage(const QString &name, const QString &version, const QDate &date) { @@ -370,7 +376,9 @@ bool PackagesInfo::updatePackage(const QString &name, const QString &version, co } /*! - Remove the package with \a name. + Removes the package specified by \a name. + + Returns \c false if the package is not found. */ bool PackagesInfo::removePackage(const QString &name) { diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.h b/src/libs/kdtools/kdupdaterpackagesinfo.h index 4969fa9a4..1301d0b81 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.h +++ b/src/libs/kdtools/kdupdaterpackagesinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdatertask.cpp b/src/libs/kdtools/kdupdatertask.cpp index 922fc4c28..8278ff6a6 100644 --- a/src/libs/kdtools/kdupdatertask.cpp +++ b/src/libs/kdtools/kdupdatertask.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -50,17 +50,20 @@ using namespace KDUpdater; User should be careful of these points: \list \li Task classes can be started only once. - \li Instances of this class cannot be created. Only instance of the subclasses can. + \li Instances of this class cannot be created. Only instances of the subclasses can. \endlist */ /*! \enum Task::Capability - Sets the capabilities of the task. + This enum value sets the capabilities of the task. \value NoCapability + The task has no capabilities, so it cannot be paused or stopped. \value Pausable + The task can be paused. \value Stoppable + The task can be stopped. */ /*! @@ -95,7 +98,8 @@ QString Task::name() const } /*! - Returns the capabilities of the task. It is a combination of one or more Capability flags. + Returns the capabilities of the task. It is a combination of one or more + Task::Capability flags. */ int Task::capabilities() const { @@ -119,7 +123,7 @@ QString Task::errorString() const } /*! - Returns whether the task has started and is running or not. + Returns whether the task has started and is running. */ bool Task::isRunning() const { @@ -195,7 +199,7 @@ void Task::run() } /*! - Stops the task, provided the task has Stoppable capability. + Stops the task, provided the task has the Task::Stoppable capability. \note Once the task is stopped, it cannot be restarted. */ @@ -234,7 +238,7 @@ void Task::stop() } /*! - Pauses the task, provided the task has KDUpdater::Task::Pausable capability. + Pauses the task, provided the task has the Task::Pausable capability. */ void Task::pause() { @@ -357,30 +361,44 @@ void Task::reportDone() deleteLater(); } +/*! + Returns \c true if the task will be automatically deleted. +*/ bool Task::autoDelete() const { return m_autoDelete; } +/*! + Automatically deletes the task if \a autoDelete is \c true. +*/ void Task::setAutoDelete(bool autoDelete) { m_autoDelete = autoDelete; } /*! - \fn virtual bool KDUpdater::Task::doRun() = 0; + \fn virtual void KDUpdater::Task::doRun() = 0; + + Returns \c 0 if the task is run. */ /*! \fn virtual bool KDUpdater::Task::doStop() = 0; + + Returns \c true if the task is stopped. */ /*! \fn virtual bool KDUpdater::Task::doPause() = 0; + + Returns \c true if the task is paused. */ /*! \fn virtual bool KDUpdater::Task::doResume() = 0; + + Returns \c true if the task is resumed. */ /*! diff --git a/src/libs/kdtools/kdupdatertask.h b/src/libs/kdtools/kdupdatertask.h index 6f88fa949..5eea26348 100644 --- a/src/libs/kdtools/kdupdatertask.h +++ b/src/libs/kdtools/kdupdatertask.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdate.cpp b/src/libs/kdtools/kdupdaterupdate.cpp index e1f5b50db..69872ea92 100644 --- a/src/libs/kdtools/kdupdaterupdate.cpp +++ b/src/libs/kdtools/kdupdaterupdate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -60,18 +60,26 @@ Update::Update(int priority, const QUrl &sourceInfoUrl, const QHash<QString, QVa } /*! - Returns data whose name is given in parameter, or an invalid QVariant if the data doesn't exist. + Returns the data specified by \a name, or an invalid \a defaultValue if the + data does not exist. */ QVariant Update::data(const QString &name, const QVariant &defaultValue) const { return m_data.value(name, defaultValue); } +/*! + Returns the priority of the update. +*/ int Update::priority() const { return m_priority; } +/*! + Returns the URL of the update source. An update source is a repository that + contains an update for the application. +*/ QUrl Update::sourceInfoUrl() const { return m_sourceInfoUrl; diff --git a/src/libs/kdtools/kdupdaterupdate.h b/src/libs/kdtools/kdupdaterupdate.h index 523aa272d..f676f0b31 100644 --- a/src/libs/kdtools/kdupdaterupdate.h +++ b/src/libs/kdtools/kdupdaterupdate.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index e6c9044b8..21f6f86a5 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -460,7 +460,8 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion // /*! - Constructs an update finder for a given KDUpdater::Application. + Constructs an update finder for the KDUpdater::Application specified by + \a application. */ UpdateFinder::UpdateFinder(Application *application) : Task(QLatin1String("UpdateFinder"), Stoppable, application), diff --git a/src/libs/kdtools/kdupdaterupdatefinder.h b/src/libs/kdtools/kdupdaterupdatefinder.h index 10584b9f9..c94b0cd98 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.h +++ b/src/libs/kdtools/kdupdaterupdatefinder.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperation.cpp b/src/libs/kdtools/kdupdaterupdateoperation.cpp index 50d396671..8b6cbec64 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperation.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -50,7 +50,7 @@ using namespace KDUpdater; The KDUpdater::UpdateOperation is an abstract class that specifies an interface for update operations. Concrete implementations of this class must perform a single update - operation like copy, move, delete. + operation, such as copy, move, or delete. \note Two separate threads cannot be using a single instance of KDUpdater::UpdateOperation at the same time. @@ -58,12 +58,16 @@ using namespace KDUpdater; /*! \enum UpdateOperation::Error - Error codes related to operation arguments and operation runtime failures. - - NoError No error occurred. - InvalidArguments Number of arguments does not match or an invalid argument was set. - UserDefinedError An error occurred during operation run. Use UpdateOperation::errorString() - to get the human-readable description of the error that occurred. + This enum code specifies error codes related to operation arguments and + operation runtime failures. + + \value NoError + No error occurred. + \value InvalidArguments + Number of arguments does not match or an invalid argument was set. + \value UserDefinedError + An error occurred during operation run. Use UpdateOperation::errorString() + to get the human-readable description of the error that occurred. */ /* @@ -120,7 +124,7 @@ QString UpdateOperation::operationCommand() const } /*! - Returns \c true if there exists a value called \a name, otherwise returns \c false. + Returns \c true if a value called \a name exists, otherwise returns \c false. */ bool UpdateOperation::hasValue(const QString &name) const { @@ -136,7 +140,7 @@ void UpdateOperation::clearValue(const QString &name) } /*! - Returns the value of \a name. If the value does not exists, this returns an empty QVariant. + Returns the value of \a name. If the value does not exist, returns an empty QVariant. */ QVariant UpdateOperation::value(const QString &name) const { @@ -189,7 +193,11 @@ struct StartsWith QString m_searchTerm; }; - +/*! + Searches the arguments for the key specified by \a key. If it can find the + key, it returns the value set for it. Otherwise, it returns \a defaultValue. + Arguments are specified in the following form: \c{key=value}. +*/ QString UpdateOperation::argumentKeyValue(const QString &key, const QString &defaultValue) const { const QString keySeparater(key + QLatin1String("=")); @@ -278,6 +286,9 @@ void UpdateOperation::registerForDelayedDeletion(const QStringList &files) /*! Tries to delete \a file. If \a file cannot be deleted, it is registered for delayed deletion. + + If a backup copy of the file cannot be created, returns \c false and displays the error + message specified by \a errorString. */ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorString) { @@ -308,18 +319,24 @@ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorSt \fn virtual bool KDUpdater::UpdateOperation::performOperation() = 0; Subclasses must implement this function to perform the update operation. + + Returns \c true if the operation is successful. */ /*! \fn virtual bool KDUpdater::UpdateOperation::undoOperation() = 0; Subclasses must implement this function to perform the undo of the update operation. + + Returns \c true if the operation is successful. */ /*! \fn virtual bool KDUpdater::UpdateOperation::testOperation() = 0; Subclasses must implement this function to perform the test operation. + + Returns \c true if the operation is successful. */ /*! @@ -329,7 +346,8 @@ bool UpdateOperation::deleteFileNowOrLater(const QString &file, QString *errorSt */ /*! - Saves operation arguments and values as XML. You can override this method to store your + Saves operation arguments and values as an XML document and returns the + document. You can override this method to store your own extra-data. Extra-data can be any data that you need to store to perform or undo the operation. The default implementation is taking care of arguments and values set via UpdateOperation::setValue(). diff --git a/src/libs/kdtools/kdupdaterupdateoperation.h b/src/libs/kdtools/kdupdaterupdateoperation.h index 180481ed4..d841fb564 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.h +++ b/src/libs/kdtools/kdupdaterupdateoperation.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp b/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp index 9296bc955..f70134f36 100644 --- a/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperationfactory.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperationfactory.h b/src/libs/kdtools/kdupdaterupdateoperationfactory.h index a4ea6a075..394cc56e5 100644 --- a/src/libs/kdtools/kdupdaterupdateoperationfactory.h +++ b/src/libs/kdtools/kdupdaterupdateoperationfactory.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp index bba4bd087..31d9d1f44 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdateoperations.h b/src/libs/kdtools/kdupdaterupdateoperations.h index 44dec5a6e..4eafed744 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.h +++ b/src/libs/kdtools/kdupdaterupdateoperations.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesinfo.cpp index a4b19f371..b46d96943 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfo_p.h b/src/libs/kdtools/kdupdaterupdatesinfo_p.h index 4ae3d2a6b..716bc4fcf 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo_p.h +++ b/src/libs/kdtools/kdupdaterupdatesinfo_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h b/src/libs/kdtools/kdupdaterupdatesinfodata_p.h index 6ae156ebb..19e44fa10 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfodata_p.h +++ b/src/libs/kdtools/kdupdaterupdatesinfodata_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** diff --git a/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp index 96358214e..25b20c256 100644 --- a/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** @@ -72,6 +72,18 @@ using namespace KDUpdater; */ /*! + \fn KDUpdater::operator==(const UpdateSourceInfo &lhs, const UpdateSourceInfo &rhs) + + Returns \c true if \a lhs and \a rhs are equal; otherwise returns \c false. +*/ + +/*! + \fn KDUpdater::operator!=(const UpdateSourceInfo &lhs, const UpdateSourceInfo &rhs) + + Returns \c true if \a lhs and \a rhs are different; otherwise returns \c false. +*/ + +/*! \enum UpdateSourcesInfo::Error Error codes related to retrieving update sources. diff --git a/src/libs/kdtools/kdupdaterupdatesourcesinfo.h b/src/libs/kdtools/kdupdaterupdatesourcesinfo.h index 8d8a66af7..d0207de63 100644 --- a/src/libs/kdtools/kdupdaterupdatesourcesinfo.h +++ b/src/libs/kdtools/kdupdaterupdatesourcesinfo.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB) -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** |