diff options
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/array.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsinputcontext.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/array.h b/src/plugins/platforms/windows/array.h index 74759231f4..9b7e3a0acb 100644 --- a/src/plugins/platforms/windows/array.h +++ b/src/plugins/platforms/windows/array.h @@ -42,7 +42,8 @@ #ifndef ARRAY_H #define ARRAY_H -#include <QtCore/QtAlgorithms> +#include <QtCore/QtGlobal> +#include <algorithm> QT_BEGIN_NAMESPACE @@ -86,7 +87,7 @@ public: const T *oldData = data; data = new T[capacity]; if (oldData) { - qCopy(oldData, oldData + m_size, data); + std::copy(oldData, oldData + m_size, data); delete [] oldData; } m_capacity = capacity; diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp index 5287b79ac3..a84d30de0f 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp @@ -56,6 +56,8 @@ #include <QtGui/QPalette> #include <QtGui/QGuiApplication> +#include <algorithm> + QT_BEGIN_NAMESPACE static inline QByteArray debugComposition(int lParam) @@ -583,8 +585,8 @@ int QWindowsInputContext::reconvertString(RECONVERTSTRING *reconv) reconv->dwTargetStrLen = reconv->dwCompStrLen; reconv->dwTargetStrOffset = reconv->dwCompStrOffset; ushort *pastReconv = reinterpret_cast<ushort *>(reconv + 1); - qCopy(surroundingText.utf16(), surroundingText.utf16() + surroundingText.size(), - pastReconv); + std::copy(surroundingText.utf16(), surroundingText.utf16() + surroundingText.size(), + pastReconv); return memSize; } |