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 --------- 1 file changed, 9 deletions(-) (limited to 'src/corelib/global/qglobal.cpp') 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; -- cgit v1.2.3