diff --git a/src/models/keylistmodel.cpp b/src/models/keylistmodel.cpp index 25a9e23274d1c6a4441f90c0e2015368e9b7d686..1cbd625b6b960003481743f12310bf9e129f6df4 100644 --- a/src/models/keylistmodel.cpp +++ b/src/models/keylistmodel.cpp @@ -69,79 +69,6 @@ using namespace Kleo; Q_DECLARE_METATYPE(GpgME::Key) -/**************************************************************************** -** -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License versions 2.0 or 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 GNU General Public Licensing requirements will be met: -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and -** http://www.gnu.org/copyleft/gpl.html. In addition, as a special -** exception, Nokia gives you certain additional rights. These rights -** are described in the Nokia Qt GPL Exception version 1.3, included in -** the file GPL_EXCEPTION.txt in this package. -** -** Qt for Windows(R) Licensees -** As a special exception, Nokia, as the sole copyright holder for Qt -** Designer, grants users of the Qt/Eclipse Integration plug-in the -** right for the Qt/Eclipse Integration to link to functionality -** provided by Qt Designer and its related libraries. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** -****************************************************************************/ - -/* - These functions are based on Peter J. Weinberger's hash function - (from the Dragon Book). The constant 24 in the original function - was replaced with 23 to produce fewer collisions on input such as - "a", "aa", "aaa", "aaaa", ... -*/ - -// adjustment to null-terminated strings -// (c) 2008 Klarälvdalens Datakonsult AB -static uint hash(const uchar *p) -{ - uint h = 0; - uint g; - - while (*p) { - h = (h << 4) + *p++; - if ((g = (h & 0xf0000000)) != 0) { - h ^= g >> 23; - } - h &= ~g; - } - return h; -} - -// -// end Nokia-copyrighted code -// - -static inline uint qHash(const char *data) -{ - if (!data) { - return 1; // something != 0 - } - return ::hash(reinterpret_cast(data)); -} - class AbstractKeyListModel::Private { public: