AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate the last QList<QPoint> in QtBase production code

Browse Source 
QList<QPoint> is horribly inefficient™ (on 32-bit platforms).

Fix by using a QVector instead.

Change-Id: Id85cb71404f329049c3e9997e51113035569e1b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Marc Mutz 2019-09-12 09:24:29 +02:00
parent 319c478603
commit 6eaa1d07e1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/eglfs/api/qeglfscursor_p.h
View File

@ -59,6 +59,8 @@
#include <QtGui/QOpenGLShaderProgram> #include <QtGui/QOpenGLShaderProgram>
#include <QtGui/private/qinputdevicemanager_p.h> #include <QtGui/private/qinputdevicemanager_p.h>
#include <QtCore/qvector.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QOpenGLShaderProgram; class QOpenGLShaderProgram;
@ -143,7 +145,7 @@ private:
int cursorsPerRow; int cursorsPerRow;
int width, height; // width and height of the atlas int width, height; // width and height of the atlas
int cursorWidth, cursorHeight; // width and height of cursors inside the atlas int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
QList<QPoint> hotSpots; QVector<QPoint> hotSpots;
QImage image; // valid until it's uploaded QImage image; // valid until it's uploaded
} m_cursorAtlas; } m_cursorAtlas;

4
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
View File

@ -41,7 +41,7 @@
#define QEGLFSKMSGBMCURSOR_H #define QEGLFSKMSGBMCURSOR_H
#include <qpa/qplatformcursor.h> #include <qpa/qplatformcursor.h>
#include <QtCore/QList> #include <QtCore/QVector>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/private/qinputdevicemanager_p.h> #include <QtGui/private/qinputdevicemanager_p.h>
@ -110,7 +110,7 @@ private:
int cursorsPerRow; int cursorsPerRow;
int width, height; // width and height of the atlas int width, height; // width and height of the atlas
int cursorWidth, cursorHeight; // width and height of cursors inside the atlas int cursorWidth, cursorHeight; // width and height of cursors inside the atlas
QList<QPoint> hotSpots; QVector<QPoint> hotSpots;
QImage image; QImage image;
} m_cursorAtlas; } m_cursorAtlas;
}; };