summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-23 16:49:32 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-23 23:00:55 +0200
commitfe1360a3868783c00d3979259583bf0dfe5f82da (patch)
tree13b950085801d12b1bc301700ecdd785545aba54 /src
parent0a383b2ebe2fc104d0538d109bca0867451f622c (diff)
Use QList instead of QVector
Task-number: QTBUG-84469 Change-Id: I822b48d0f5568ad271b148a3e2058d59097f0154 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/container/qaxbase.cpp10
-rw-r--r--src/activeqt/container/qaxscript.cpp4
-rw-r--r--src/activeqt/container/qaxselect.cpp6
-rw-r--r--src/activeqt/control/qaxserverbase.cpp6
-rw-r--r--src/activeqt/control/qaxservermain.cpp4
5 files changed, 15 insertions, 15 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 3845916..21b94e1 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -138,16 +138,16 @@ public:
void parsePrototype(const QByteArray &prototype) const;
DISPID dispIDofName(const QByteArray &name, IDispatch *disp) const;
- const QVector<QUuid> &connectionInterfaces() const { return m_connectionInterfaces; }
+ const QList<QUuid> &connectionInterfaces() const { return m_connectionInterfaces; }
- const UuidDispIdMapping &sigs() const { return m_sigs; }
- const UuidDispIdMapping &propsigs() const { return m_propsigs; }
- const UuidDispIdMapping &props() const { return m_props; }
+ const UuidDispIdMapping &sigs() const { return m_sigs; }
+ const UuidDispIdMapping &propsigs() const { return m_propsigs; }
+ const UuidDispIdMapping &props() const { return m_props; }
private:
friend class MetaObjectGenerator;
// save information about QAxEventSink connections, and connect when found in cache
- QVector<QUuid> m_connectionInterfaces;
+ QList<QUuid> m_connectionInterfaces;
// DISPID -> signal name
UuidDispIdMapping m_sigs;
// DISPID -> property changed signal name
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 7477e79..4052fe2 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -64,7 +64,7 @@
#include <qmetaobject.h>
#include <quuid.h>
#include <qwidget.h>
-#include <qvector.h>
+#include <qlist.h>
#include <qt_windows.h>
#ifndef QT_NO_QAXSCRIPT
@@ -77,7 +77,7 @@
QT_BEGIN_NAMESPACE
struct QAxEngineDescriptor { QString name, extension, code; };
-static QVector<QAxEngineDescriptor> engines;
+static QList<QAxEngineDescriptor> engines;
class QAxScriptManagerPrivate
{
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 2831ce7..2c87b9c 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -208,9 +208,9 @@ static bool querySubKeyValue(HKEY hKey, const QString &subKeyName, LPBYTE lpDat
return result;
}
-static QVector<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
+static QList<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
{
- QVector<Control> controls;
+ QList<Control> controls;
HKEY classesKey;
RegOpenKeyEx(HKEY_CLASSES_ROOT, rootKey, 0, KEY_READ, &classesKey);
if (!classesKey) {
@@ -282,7 +282,7 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const override ;
private:
- QVector<Control> m_controls;
+ QList<Control> m_controls;
};
QVariant ControlList::data(const QModelIndex &index, int role) const
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index a1f34c9..55b5051 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -76,7 +76,7 @@
#include <qabstractnativeeventfilter.h>
#include <qcoreapplication.h>
-#include <qvector.h>
+#include <qlist.h>
#include <private/qthread_p.h>
#include "qaxfactory.h"
@@ -425,7 +425,7 @@ private:
IUnknown *m_outerUnknown = nullptr;
IAdviseSink *m_spAdviseSink = nullptr;
- QVector<STATDATA> adviseSinks;
+ QList<STATDATA> adviseSinks;
IOleClientSite *m_spClientSite = nullptr;
IOleInPlaceSite *m_spInPlaceSite = nullptr;
IOleInPlaceSiteWindowless *m_spInPlaceSiteWindowless = nullptr;
@@ -642,7 +642,7 @@ public:
QAxConnection(QAxConnection &&) = delete;
QAxConnection &operator=(QAxConnection &&) = delete;
- using Connections = QVector<CONNECTDATA>;
+ using Connections = QList<CONNECTDATA>;
QAxConnection(QAxServerBase *parent, const QUuid &uuid)
: that(parent), iid(uuid)
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index 764899d..74739a2 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -49,7 +49,7 @@
****************************************************************************/
#include <qstringlist.h>
-#include <qvector.h>
+#include <qlist.h>
#include "qaxfactory.h"
@@ -228,7 +228,7 @@ struct Arg {
free(argv.at(i));
}
- QVector<char *> argv;
+ QList<char *> argv;
};
} // namespace