From 9ee554ac1d1af97e7ad5b4bf78e2779f7d1c405f Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 13:37:58 +0200 Subject: qglobal.h: remove deprecated global functions Since 5.0 - qMalloc(), qFree(), qRealloc(), qMemCopy(), qMemSet() Since 5.15 - qsrand(), qrand() Change-Id: I74fa3d17b05521271c3dc563fc85a5b133289ce3 Reviewed-by: Lars Knoll --- src/corelib/global/qglobal.cpp | 9 ------- src/corelib/global/qglobal.h | 15 ----------- src/corelib/global/qmalloc.cpp | 23 ---------------- src/corelib/global/qrandom.cpp | 60 +----------------------------------------- 4 files changed, 1 insertion(+), 106 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5655f77d3c..4f51a0e259 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -122,12 +122,6 @@ extern "C" { QT_BEGIN_NAMESPACE -#if !QT_DEPRECATED_SINCE(5, 0) -// Make sure they're defined to be exported -Q_CORE_EXPORT void *qMemCopy(void *dest, const void *src, size_t n); -Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); -#endif - // Statically check assumptions about the environment we're running // in. The idea here is to error or warn if otherwise implicit Qt // assumptions are not fulfilled on new hardware or compilers @@ -3165,9 +3159,6 @@ Q_CORE_EXPORT Q_DECL_CONST_FUNCTION unsigned int qt_int_sqrt(unsigned int n) return p; } -void *qMemCopy(void *dest, const void *src, size_t n) { return memcpy(dest, src, n); } -void *qMemSet(void *dest, int c, size_t n) { return memset(dest, c, n); } - // In the C runtime on all platforms access to the environment is not thread-safe. We // add thread-safety for the Qt wrappers. static QBasicMutex environmentMutex; diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 94de9fd79e..db858c44b3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -968,13 +968,6 @@ inline void qSwap(T &value1, T &value2) QT_WARNING_POP -#if QT_DEPRECATED_SINCE(5, 0) -Q_CORE_EXPORT QT_DEPRECATED void *qMalloc(size_t size) Q_ALLOC_SIZE(1); -Q_CORE_EXPORT QT_DEPRECATED void qFree(void *ptr); -Q_CORE_EXPORT QT_DEPRECATED void *qRealloc(void *ptr, size_t size) Q_ALLOC_SIZE(2); -Q_CORE_EXPORT QT_DEPRECATED void *qMemCopy(void *dest, const void *src, size_t n); -Q_CORE_EXPORT QT_DEPRECATED void *qMemSet(void *dest, int c, size_t n); -#endif Q_CORE_EXPORT void *qMallocAligned(size_t size, size_t alignment) Q_ALLOC_SIZE(1); Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment) Q_ALLOC_SIZE(2); Q_CORE_EXPORT void qFreeAligned(void *ptr); @@ -1268,14 +1261,6 @@ Q_CORE_EXPORT int qEnvironmentVariableIntValue(const char *varName, bool *ok=nu inline int qIntCast(double f) { return int(f); } inline int qIntCast(float f) { return int(f); } -/* - Reentrant versions of basic rand() functions for random number generation -*/ -#if QT_DEPRECATED_SINCE(5, 15) -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") void qsrand(uint seed); -Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int qrand(); -#endif - #define QT_MODULE(x) #if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && \ diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp index b071c1df62..fbea0e5689 100644 --- a/src/corelib/global/qmalloc.cpp +++ b/src/corelib/global/qmalloc.cpp @@ -49,29 +49,6 @@ QT_BEGIN_NAMESPACE -#if !QT_DEPRECATED_SINCE(5, 0) -// Make sure they're defined to be exported -Q_CORE_EXPORT void *qMalloc(size_t size) Q_ALLOC_SIZE(1); -Q_CORE_EXPORT void qFree(void *ptr); -Q_CORE_EXPORT void *qRealloc(void *ptr, size_t size) Q_ALLOC_SIZE(2); -#endif - - -void *qMalloc(size_t size) -{ - return ::malloc(size); -} - -void qFree(void *ptr) -{ - ::free(ptr); -} - -void *qRealloc(void *ptr, size_t size) -{ - return ::realloc(ptr, size); -} - void *qMallocAligned(size_t size, size_t alignment) { return qReallocAligned(nullptr, size, 0, alignment); diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index 4ebe53d572..1d2a29c074 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -595,7 +595,7 @@ inline QRandomGenerator::SystemGenerator &QRandomGenerator::SystemGenerator::sel \snippet code/src_corelib_global_qrandom.cpp 3 - \sa QRandomGenerator64, qrand() + \sa QRandomGenerator64 */ /*! @@ -1242,62 +1242,4 @@ static inline QRandEngine *randTLS() } #endif -/*! - \relates - \deprecated - \since 4.2 - - Thread-safe version of the standard C++ \c srand() function. - - Sets the argument \a newSeed to be used to generate a new random number sequence of - pseudo random integers to be returned by qrand(). - - The sequence of random numbers generated is deterministic per thread. For example, - if two threads call qsrand(1) and subsequently call qrand(), the threads will get - the same random number sequence. - - \note This function is deprecated. In new applications, use - QRandomGenerator instead. - - \sa qrand(), QRandomGenerator -*/ -void qsrand(uint newSeed) -{ - auto prng = randTLS(); - if (prng) - prng->seed(newSeed); - else - srand(newSeed); -} - -/*! - \relates - \deprecated - \since 4.2 - - Thread-safe version of the standard C++ \c rand() function. - - Returns a value between 0 and \c RAND_MAX (defined in \c and - \c ), the next number in the current sequence of pseudo-random - integers. - - Use \c qsrand() to initialize the pseudo-random number generator with a - seed value. Seeding must be performed at least once on each thread. If that - step is skipped, then the sequence will be pre-seeded with a constant - value. - - \note This function is deprecated. In new applications, use - QRandomGenerator instead. - - \sa qsrand(), QRandomGenerator -*/ -int qrand() -{ - auto prng = randTLS(); - if (prng) - return prng->generate(); - else - return rand(); -} - QT_END_NAMESPACE -- cgit v1.2.3