1 files changed, 32 insertions, 47 deletions
diff --git a/src/libs/kdtools/kdlockfile.cpp b/src/libs/kdtools/kdlockfile.cpp
index 3a440b6b0..a647f4eb8 100644
--- a/src/libs/kdtools/kdlockfile.cpp
+++ b/src/libs/kdtools/kdlockfile.cpp
@@ -1,24 +1,43 @@
 /****************************************************************************
-** Copyright (C) 2001-2010 Klaralvdalens Datakonsult AB.  All rights reserved.
 **
-** This file is part of the KD Tools library.
+** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
+** Contact: http://www.qt-project.org/legal
 **
-** Licensees holding valid commercial KD Tools licenses may use this file in
-** accordance with the KD Tools Commercial License Agreement provided with
-** the Software.
+** This file is part of the Qt Installer Framework.
 **
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
 **
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL included.
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
 **
-**********************************************************************/
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include "kdlockfile.h"
 
@@ -55,37 +74,3 @@ bool KDLockFile::unlock()
 {
     return d->unlock();
 }
-
-
-#ifdef KDTOOLSCORE_UNITTESTS
-
-#include <KDUnitTest/Test>
-#include <QDebug>
-#include <QDir>
-
-KDAB_UNITTEST_SIMPLE( KDLockFile, "kdcoretools" ) {
-    {
-        KDLockFile f( QLatin1String("/jlksdfdsfjkldsf-doesnotexist/file") );
-        const bool locked = f.lock();
-        assertFalse( locked );
-        qDebug() << f.errorString();
-        assertTrue( !f.errorString().isEmpty() );
-        if ( !locked )
-            assertTrue( f.unlock() );
-    }
-    {
-        KDLockFile f( QDir::currentPath() + QLatin1String("/kdlockfile-test") );
-        const bool locked = f.lock();
-        assertTrue( locked );
-        if ( !locked )
-            qDebug() << f.errorString();
-        assertEqual( locked, f.errorString().isEmpty() );
-        const bool unlocked = f.unlock();
-        assertTrue( unlocked );
-        if ( !unlocked )
-            qDebug() << f.errorString();
-        assertEqual( unlocked, f.errorString().isEmpty() );
-    }
-}
-
-#endif // KDTOOLSCORE_UNITTESTS