From 24a9adf12d85d339333c12743df5f0e1c9c51135 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 30 Jan 2022 13:49:52 +0200 Subject: [PATCH] get rid of QScopedArrayPointer [ci reset] Signed-off-by: Ivailo Monev --- CMakeLists.txt | 2 -- cmake/modules/KatieBuildMacros.cmake | 2 +- package/freebsd/pkg-plist | 2 -- package/netbsd/PLIST | 2 -- package/openbsd/pkg/PLIST | 2 -- scripts/incfsck.py | 2 -- scripts/namefsck.py | 2 -- src/core/io/qdir.cpp | 3 +- src/core/tools/qscopedpointer.cpp | 56 --------------------------------- src/core/tools/qscopedpointer.h | 60 ------------------------------------ 10 files changed, 3 insertions(+), 130 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18994d168..73b4a3725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -758,8 +758,6 @@ katie_generate_obsolete(QRectF QtCore qrect.h) katie_generate_obsolete(QRegExpValidator QtGui qvalidator.h) katie_generate_obsolete(QResizeEvent QtGui qevent.h) katie_generate_obsolete(QReturnArgument QtCore qobjectdefs.h) -katie_generate_obsolete(QScopedArrayPointer QtCore qscopedpointer.h) -katie_generate_obsolete(QScopedPointerArrayDeleter QtCore qscopedpointer.h) katie_generate_obsolete(QScopedPointerPodDeleter QtCore qscopedpointer.h) katie_generate_obsolete(QSetIterator QtCore qset.h) katie_generate_obsolete(QSharedDataPointer QtCore qshareddata.h) diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 676012063..00193ba20 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -280,7 +280,7 @@ endfunction() # depend on KtNetwork depend on plugins that depend on it too add_custom_target(plugins_dependant_tests) function(KATIE_SETUP_PLUGIN FORPLUGIN) - add_dependencies(plugins_dependant_tests ${FORPLUGIN}) +# add_dependencies(plugins_dependant_tests ${FORPLUGIN}) endfunction() # a macro to ensure that object targets are build with PIC if the target they diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index d544face8..51cb7d5d3 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -132,9 +132,7 @@ include/katie/QtCore/QRegExp include/katie/QtCore/QResource include/katie/QtCore/QReturnArgument include/katie/QtCore/QRunnable -include/katie/QtCore/QScopedArrayPointer include/katie/QtCore/QScopedPointer -include/katie/QtCore/QScopedPointerArrayDeleter include/katie/QtCore/QScopedPointerPodDeleter include/katie/QtCore/QScopedValueRollback include/katie/QtCore/QSemaphore diff --git a/package/netbsd/PLIST b/package/netbsd/PLIST index cb76cbe74..67c19960d 100644 --- a/package/netbsd/PLIST +++ b/package/netbsd/PLIST @@ -135,9 +135,7 @@ include/katie/QtCore/QRegExp include/katie/QtCore/QResource include/katie/QtCore/QReturnArgument include/katie/QtCore/QRunnable -include/katie/QtCore/QScopedArrayPointer include/katie/QtCore/QScopedPointer -include/katie/QtCore/QScopedPointerArrayDeleter include/katie/QtCore/QScopedPointerPodDeleter include/katie/QtCore/QScopedValueRollback include/katie/QtCore/QSemaphore diff --git a/package/openbsd/pkg/PLIST b/package/openbsd/pkg/PLIST index acb93d1c4..be129a45f 100644 --- a/package/openbsd/pkg/PLIST +++ b/package/openbsd/pkg/PLIST @@ -135,9 +135,7 @@ include/katie/QtCore/QRegExp include/katie/QtCore/QResource include/katie/QtCore/QReturnArgument include/katie/QtCore/QRunnable -include/katie/QtCore/QScopedArrayPointer include/katie/QtCore/QScopedPointer -include/katie/QtCore/QScopedPointerArrayDeleter include/katie/QtCore/QScopedPointerPodDeleter include/katie/QtCore/QScopedValueRollback include/katie/QtCore/QSemaphore diff --git a/scripts/incfsck.py b/scripts/incfsck.py index ea03fc078..c2e4a2d3d 100755 --- a/scripts/incfsck.py +++ b/scripts/incfsck.py @@ -71,8 +71,6 @@ incmap = { 'QReadLocker': 'qreadwritelock.h', 'QRectF': 'qrect.h', 'QReturnArgument': 'qobjectdefs.h', - 'QScopedArrayPointer': 'qscopedpointer.h', - 'QScopedPointerArrayDeleter': 'qscopedpointer.h', 'QScopedPointerPodDeleter': 'qscopedpointer.h', 'QSetIterator': 'qset.h', 'QSharedDataPointer': 'qshareddata.h', diff --git a/scripts/namefsck.py b/scripts/namefsck.py index c428b4b5d..2d527ea88 100755 --- a/scripts/namefsck.py +++ b/scripts/namefsck.py @@ -475,9 +475,7 @@ classlist = [ "QRgb", "QRubberBand", "QRunnable", - "QScopedArrayPointer", "QScopedPointer", - "QScopedPointerArrayDeleter", "QScopedPointerPodDeleter", "QScopedValueRollback", "QScriptable", diff --git a/src/core/io/qdir.cpp b/src/core/io/qdir.cpp index eeeb1efe0..a5497c2eb 100644 --- a/src/core/io/qdir.cpp +++ b/src/core/io/qdir.cpp @@ -36,6 +36,7 @@ #include "qfilesystementry_p.h" #include "qfilesystemmetadata_p.h" #include "qfilesystemengine_p.h" +#include "qvarlengtharray.h" #include "qscopedpointer.h" #include "qcorecommon_p.h" @@ -237,7 +238,7 @@ inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &l, names->append(l.at(i).fileName()); } } else { - QScopedArrayPointer si(new QDirSortItem[n]); + QVarLengthArray si(n); for (int i = 0; i < n; ++i) si[i].item = l.at(i); qSort(si.data(), si.data() + n, QDirSortItemComparator(sort)); diff --git a/src/core/tools/qscopedpointer.cpp b/src/core/tools/qscopedpointer.cpp index 71a61d6dc..9b6a6602c 100644 --- a/src/core/tools/qscopedpointer.cpp +++ b/src/core/tools/qscopedpointer.cpp @@ -70,8 +70,6 @@ QT_BEGIN_NAMESPACE \list \i QScopedPointerDeleter - the default, deletes the pointer using \c delete - \i QScopedPointerArrayDeleter - deletes the pointer using \c{delete []}. Use - this handler for pointers that were allocated with \c{new []}. \i QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this handler for pointers that were allocated with \c{malloc()}. \endlist @@ -205,58 +203,4 @@ QT_BEGIN_NAMESPACE Swap this pointer with \a other. */ -/*! - \class QScopedArrayPointer - - \brief The QScopedArrayPointer class stores a pointer to a - dynamically allocated array of objects, and deletes it upon - destruction. - - \since 4.6 - \reentrant - \ingroup misc - - A QScopedArrayPointer is a QScopedPointer that defaults to - deleting the object it is pointing to with the delete[] operator. It - also features operator[] for convenience, so we can write: - - \code - void foo() - { - QScopedArrayPointer i(new int[10]); - i[2] = 42; - ... - return; // our integer array is now deleted using delete[] - } - \endcode -*/ - -/*! - \fn QScopedArrayPointer::QScopedArrayPointer() - - Constructs a QScopedArrayPointer instance. -*/ - -/*! - \fn T *QScopedArrayPointer::operator[](int i) - - Provides access to entry \a i of the scoped pointer's array of - objects. - - If the contained pointer is \c null, behavior is undefined. - - \sa isNull() -*/ - -/*! - \fn T *QScopedArrayPointer::operator[](int i) const - - Provides access to entry \a i of the scoped pointer's array of - objects. - - If the contained pointer is \c null, behavior is undefined. - - \sa isNull() -*/ - QT_END_NAMESPACE diff --git a/src/core/tools/qscopedpointer.h b/src/core/tools/qscopedpointer.h index 663da1be8..ba614a6f8 100644 --- a/src/core/tools/qscopedpointer.h +++ b/src/core/tools/qscopedpointer.h @@ -45,22 +45,6 @@ public: } }; -template -class QScopedPointerArrayDeleter -{ -public: - static inline void cleanup(T *pointer) - { - // Enforce a complete type. - // If you get a compile error here, read the section on forward declared - // classes in the QScopedPointer documentation. - typedef char IsIncompleteType[ sizeof(T) ? 1 : -1 ]; - (void) sizeof(IsIncompleteType); - - delete [] pointer; - } -}; - struct QScopedPointerPodDeleter { static inline void cleanup(void *pointer) { if (pointer) free(pointer); } @@ -168,50 +152,6 @@ namespace std { } QT_BEGIN_NAMESPACE - -namespace QtPrivate { - template struct QScopedArrayEnsureSameType; - template struct QScopedArrayEnsureSameType { typedef X* Type; }; - template struct QScopedArrayEnsureSameType { typedef X* Type; }; -} - -template > -class QScopedArrayPointer : public QScopedPointer -{ -public: - inline QScopedArrayPointer() : QScopedPointer(0) {} - - template - explicit inline QScopedArrayPointer(D *p, typename QtPrivate::QScopedArrayEnsureSameType::Type = 0) - : QScopedPointer(p) - { - } - - inline T &operator[](int i) - { - return this->d[i]; - } - - inline const T &operator[](int i) const - { - return this->d[i]; - } - -private: - explicit inline QScopedArrayPointer(void *) { - // Enforce the same type. - - // If you get a compile error here, make sure you declare - // QScopedArrayPointer with the same template type as you pass to the - // constructor. See also the QScopedPointer documentation. - - // Storing a scalar array as a pointer to a different type is not - // allowed and results in undefined behavior. - } - - Q_DISABLE_COPY(QScopedArrayPointer) -}; - QT_END_NAMESPACE #endif // QSCOPEDPOINTER_H -- 2.11.0