diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 13:37:58 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-14 09:59:36 +0200 |
| commit | 9ee554ac1d1af97e7ad5b4bf78e2779f7d1c405f (patch) | |
| tree | c40e65aa3b2f7d02c32b592855c8c03252909c2b /src/corelib/global/qglobal.h | |
| parent | ff555d89650f5cea72365e12fb2b71be9e25b89d (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 15 |
1 files changed, 0 insertions, 15 deletions
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__) && \ |