whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove qCopy from the Windows platform plugin 

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I949da7a111d9206b6a0be8114b2c4803c06728b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Giuseppe D'Angelo 2013-09-03 22:13:20 +02:00 committed by The Qt Project
parent 3f07d12ae2
commit 7c270390c4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/windows/array.h
View File

@ -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;

6
src/plugins/platforms/windows/qwindowsinputcontext.cpp
View File

@ -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;
}