whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QScopedSharedPointer 

It's private and unused since ~2012.

Change-Id: Iea11af27f7eebf3eae2467b22b68cd4c26885edd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Giuseppe D'Angelo 2020-11-01 15:15:52 +01:00
parent 4111d8e8e7
commit 37808ee55a
5 changed files with 1 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/CMakeLists.txt
View File

@ -225,7 +225,7 @@ qt_internal_add_module(Core
tools/qrect.cpp tools/qrect.h
tools/qrefcount.cpp tools/qrefcount.h
tools/qringbuffer.cpp tools/qringbuffer_p.h
tools/qscopedpointer.h tools/qscopedpointer_p.h
tools/qscopedpointer.h
tools/qscopedvaluerollback.h
tools/qscopeguard.h
tools/qset.h

1
src/corelib/io/qsettings_p.h
View File

@ -64,7 +64,6 @@
#ifndef QT_NO_QOBJECT
#include "private/qobject_p.h"
#endif
#include "private/qscopedpointer_p.h"
QT_BEGIN_NAMESPACE

148
src/corelib/tools/qscopedpointer_p.h
View File

@ -1,148 +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$
**
****************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of internal files. This header file may change from version to version
// without notice, or even be removed.
//
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#ifndef QSCOPEDPOINTER_P_H
#define QSCOPEDPOINTER_P_H
#include "QtCore/qscopedpointer.h"
QT_BEGIN_NAMESPACE
/* Internal helper class - exposes the data through data_ptr (legacy from QShared).
Required for some internal Qt classes, do not use otherwise. */
template <typename T, typename Cleanup = QScopedPointerDeleter<T> >
class QCustomScopedPointer : public QScopedPointer<T, Cleanup>
{
public:
explicit inline QCustomScopedPointer(T *p = nullptr)
: QScopedPointer<T, Cleanup>(p)
{
}
inline T *&data_ptr()
{
return this->d;
}
inline bool operator==(const QCustomScopedPointer<T, Cleanup> &other) const
{
return this->d == other.d;
}
inline bool operator!=(const QCustomScopedPointer<T, Cleanup> &other) const
{
return this->d != other.d;
}
private:
Q_DISABLE_COPY(QCustomScopedPointer)
};
/* Internal helper class - a handler for QShared* classes, to be used in QCustomScopedPointer */
template <typename T>
class QScopedPointerSharedDeleter
{
public:
static inline void cleanup(T *d)
{
if (d && !d->ref.deref())
delete d;
}
};
/* Internal.
This class is basically a scoped pointer pointing to a ref-counted object
*/
template <typename T>
class QScopedSharedPointer : public QCustomScopedPointer<T, QScopedPointerSharedDeleter<T> >
{
public:
explicit inline QScopedSharedPointer(T *p = nullptr)
: QCustomScopedPointer<T, QScopedPointerSharedDeleter<T> >(p)
{
}
inline void detach()
{
qAtomicDetach(this->d);
}
inline void assign(T *other)
{
if (this->d == other)
return;
if (other)
other->ref.ref();
T *oldD = this->d;
this->d = other;
QScopedPointerSharedDeleter<T>::cleanup(oldD);
}
inline bool operator==(const QScopedSharedPointer<T> &other) const
{
return this->d == other.d;
}
inline bool operator!=(const QScopedSharedPointer<T> &other) const
{
return this->d != other.d;
}
private:
Q_DISABLE_COPY(QScopedSharedPointer)
};
QT_END_NAMESPACE
#endif

1
src/corelib/tools/tools.pri
View File

@ -34,7 +34,6 @@ HEADERS += \
tools/qrefcount.h \
tools/qscopeguard.h \
tools/qscopedpointer.h \
tools/qscopedpointer_p.h \
tools/qscopedvaluerollback.h \
tools/qshareddata.h \
tools/qshareddata_impl.h \

2
tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
View File

@ -412,8 +412,6 @@ void tst_QScopedPointer::comparison()
QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
{
// QScopedSharedPointer is an internal helper class -- it is unsupported!
RefCounted *a = new RefCounted;
RefCounted *b = new RefCounted;