From e3ea95f81fa526b36f04e4052265b0554604889a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 22 Mar 2017 18:27:37 +0100 Subject: [PATCH] Remove unused QPodList class It's private API, the last in-tree user was removed in acbd7999, but failed to remove the class. Do it now. Change-Id: I26294b535d80b419a2f545a4783014b493a5dc93 Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/corelib/kernel/qeventdispatcher_unix_p.h | 1 - src/corelib/tools/qpodlist_p.h | 109 ------------------- src/corelib/tools/qvarlengtharray.h | 4 - src/corelib/tools/tools.pri | 1 - 4 files changed, 115 deletions(-) delete mode 100644 src/corelib/tools/qpodlist_p.h diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index d728040343..bcf5b10baa 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -55,7 +55,6 @@ #include "QtCore/qlist.h" #include "private/qabstracteventdispatcher_p.h" #include "private/qcore_unix_p.h" -#include "private/qpodlist_p.h" #include "QtCore/qvarlengtharray.h" #include "private/qtimerinfo_unix_p.h" diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h deleted file mode 100644 index 95990e0bb6..0000000000 --- a/src/corelib/tools/qpodlist_p.h +++ /dev/null @@ -1,109 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPODLIST_P_H -#define QPODLIST_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -QT_BEGIN_NAMESPACE - - -template -class QPodList : public QVarLengthArray -{ - using QVarLengthArray::s; - using QVarLengthArray::a; - using QVarLengthArray::ptr; - using QVarLengthArray::realloc; -public: - inline explicit QPodList(int size = 0) - : QVarLengthArray(size) - {} - - inline void insert(int idx, const T &t) - { - const int sz = s++; - if (s == a) - realloc(s, s << 1); - ::memmove(ptr + idx + 1, ptr + idx, (sz - idx) * sizeof(T)); - ptr[idx] = t; - } - - inline void removeAll(const T &t) - { - int i = 0; - for (int j = 0; j < s; ++j) { - if (ptr[j] != t) - ptr[i++] = ptr[j]; - } - s = i; - } - - inline void removeAt(int idx) - { - Q_ASSERT(idx >= 0 && idx < s); - ::memmove(ptr + idx, ptr + idx + 1, (s - idx - 1) * sizeof(T)); - --s; - } - - inline T takeFirst() - { - Q_ASSERT(s > 0); - T tmp = ptr[0]; - removeAt(0); - return tmp; - } -}; - -QT_END_NAMESPACE - -#endif // QPODLIST_P_H diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 5d0231417b..c73d6bfa43 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -56,9 +56,6 @@ QT_BEGIN_NAMESPACE -template -class QPodList; - // Prealloc = 256 by default, specified in qcontainerfwd.h template class QVarLengthArray @@ -236,7 +233,6 @@ public: inline const T &back() const { return last(); } private: - friend class QPodList; void realloc(int size, int alloc); int a; // capacity diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index b93ec824ed..bb6c135a1a 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -39,7 +39,6 @@ HEADERS += \ tools/qmargins.h \ tools/qmessageauthenticationcode.h \ tools/qcontiguouscache.h \ - tools/qpodlist_p.h \ tools/qpair.h \ tools/qpoint.h \ tools/qqueue.h \