summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/distancefieldgenerator/distancefieldmodel.h4
-rw-r--r--src/distancefieldgenerator/mainwindow.cpp8
-rw-r--r--src/linguist/lupdate/merge.cpp10
-rw-r--r--src/linguist/shared/proitems.h8
-rw-r--r--src/qdbus/qdbusviewer/qdbusmodel.cpp8
-rw-r--r--src/qtattributionsscanner/jsongenerator.cpp2
-rw-r--r--src/qtattributionsscanner/jsongenerator.h4
-rw-r--r--src/qtattributionsscanner/main.cpp2
-rw-r--r--src/qtattributionsscanner/qdocgenerator.cpp2
-rw-r--r--src/qtattributionsscanner/qdocgenerator.h4
-rw-r--r--src/qtattributionsscanner/scanner.cpp12
-rw-r--r--src/qtattributionsscanner/scanner.h6
-rw-r--r--src/shared/deviceskin/deviceskin.cpp2
-rw-r--r--src/shared/deviceskin/deviceskin.h10
-rw-r--r--src/shared/qtgradienteditor/qtcolorline.cpp12
-rw-r--r--src/shared/winutils/elfreader.cpp2
-rw-r--r--src/shared/winutils/elfreader.h8
-rw-r--r--src/windeployqt/main.cpp8
-rw-r--r--src/winrtrunner/runner.cpp2
19 files changed, 59 insertions, 55 deletions
diff --git a/src/distancefieldgenerator/distancefieldmodel.h b/src/distancefieldgenerator/distancefieldmodel.h
index 5c71a20ab..174021301 100644
--- a/src/distancefieldgenerator/distancefieldmodel.h
+++ b/src/distancefieldgenerator/distancefieldmodel.h
@@ -224,8 +224,8 @@ private:
DistanceFieldModelWorker *m_worker;
QScopedPointer<QThread> m_workerThread;
quint16 m_glyphCount;
- QVector<QImage> m_distanceFields;
- QVector<QPainterPath> m_paths;
+ QList<QImage> m_distanceFields;
+ QList<QPainterPath> m_paths;
QMultiHash<UnicodeRange, glyph_t> m_glyphsPerUnicodeRange;
QHash<quint32, glyph_t> m_glyphsPerUcs4;
bool m_doubleGlyphResolution;
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp
index 6bc793ede..2f0820ae7 100644
--- a/src/distancefieldgenerator/mainwindow.cpp
+++ b/src/distancefieldgenerator/mainwindow.cpp
@@ -438,7 +438,7 @@ QByteArray MainWindow::createSfntTable()
sizeof(QtdfHeader));
// Maximum height allocator to find optimal number of textures
- QVector<QRect> allocatedAreaPerTexture;
+ QList<QRect> allocatedAreaPerTexture;
struct GlyphData {
QSGDistanceFieldGlyphCache::TexCoord texCoord;
@@ -446,7 +446,7 @@ QByteArray MainWindow::createSfntTable()
QSize glyphSize;
int textureIndex;
};
- QVector<GlyphData> glyphDatas;
+ QList<GlyphData> glyphDatas;
glyphDatas.resize(m_model->rowCount());
int textureCount = 0;
@@ -513,7 +513,7 @@ QByteArray MainWindow::createSfntTable()
}
}
- QVector<QDistanceField> textures;
+ QList<QDistanceField> textures;
textures.resize(textureCount);
for (int textureIndex = 0; textureIndex < textureCount; ++textureIndex) {
@@ -746,7 +746,7 @@ void MainWindow::selectString()
tr("Select glyphs for string"),
tr("String to parse:"));
if (!s.isEmpty()) {
- QVector<uint> ucs4String = s.toUcs4();
+ QList<uint> ucs4String = s.toUcs4();
for (uint ucs4 : ucs4String) {
glyph_t glyph = m_model->glyphIndexForUcs4(ucs4);
if (glyph != 0) {
diff --git a/src/linguist/lupdate/merge.cpp b/src/linguist/lupdate/merge.cpp
index 0a5a9c1f5..d9ea5dc96 100644
--- a/src/linguist/lupdate/merge.cpp
+++ b/src/linguist/lupdate/merge.cpp
@@ -33,9 +33,9 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
+#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QStringList>
-#include <QtCore/QVector>
QT_BEGIN_NAMESPACE
@@ -93,8 +93,8 @@ static QString translationAttempt(const QString &oldTranslation,
QString attempt;
QStringList oldNumbers;
QStringList newNumbers;
- QVector<bool> met(p);
- QVector<int> matchedYet(p);
+ QList<bool> met(p);
+ QList<int> matchedYet(p);
int i, j;
int k = 0, ell, best;
int m, n;
@@ -209,7 +209,7 @@ static QString translationAttempt(const QString &oldTranslation,
int applyNumberHeuristic(Translator &tor)
{
QMap<QString, QPair<QString, QString> > translated;
- QVector<bool> untranslated(tor.messageCount());
+ QList<bool> untranslated(tor.messageCount());
int inserted = 0;
for (int i = 0; i < tor.messageCount(); ++i) {
@@ -258,7 +258,7 @@ int applySameTextHeuristic(Translator &tor)
{
QMap<QString, QStringList> translated;
QMap<QString, bool> avoid; // Want a QTreeSet, in fact
- QVector<bool> untranslated(tor.messageCount());
+ QList<bool> untranslated(tor.messageCount());
int inserted = 0;
for (int i = 0; i < tor.messageCount(); ++i) {
diff --git a/src/linguist/shared/proitems.h b/src/linguist/shared/proitems.h
index 24ee9e849..23a307393 100644
--- a/src/linguist/shared/proitems.h
+++ b/src/linguist/shared/proitems.h
@@ -31,10 +31,10 @@
#include "qmake_global.h"
-#include <qstring.h>
-#include <qvector.h>
#include <qhash.h>
+#include <qlist.h>
#include <qmap.h>
+#include <qstring.h>
QT_BEGIN_NAMESPACE
@@ -280,7 +280,7 @@ private:
const ProString *m_ps;
};
-class ProStringList : public QVector<ProString> {
+class ProStringList : public QList<ProString> {
public:
ProStringList() {}
ProStringList(const ProString &str) { *this << str; }
@@ -288,7 +288,7 @@ public:
QStringList toQStringList() const;
ProStringList &operator<<(const ProString &str)
- { QVector<ProString>::operator<<(str); return *this; }
+ { QList<ProString>::operator<<(str); return *this; }
int length() const { return size(); }
diff --git a/src/qdbus/qdbusviewer/qdbusmodel.cpp b/src/qdbus/qdbusviewer/qdbusmodel.cpp
index 1e1e4f9fc..8f47b5bc5 100644
--- a/src/qdbus/qdbusviewer/qdbusmodel.cpp
+++ b/src/qdbus/qdbusviewer/qdbusmodel.cpp
@@ -28,13 +28,15 @@
#include "qdbusmodel.h"
-#include <QtCore/qvector.h>
#include <QtCore/QDebug>
-#include <QtXml/QDomDocument>
+#include <QtCore/QList>
+
#include <QtDBus/QDBusObjectPath>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
+#include <QtXml/QDomDocument>
+
struct QDBusItem
{
inline QDBusItem(QDBusModel::Type aType, const QString &aName, QDBusItem *aParent = 0)
@@ -62,7 +64,7 @@ struct QDBusItem
QDBusModel::Type type;
QDBusItem *parent;
- QVector<QDBusItem *> children;
+ QList<QDBusItem *> children;
bool isPrefetched;
QString name;
QString caption;
diff --git a/src/qtattributionsscanner/jsongenerator.cpp b/src/qtattributionsscanner/jsongenerator.cpp
index 44fb784aa..792f616a5 100644
--- a/src/qtattributionsscanner/jsongenerator.cpp
+++ b/src/qtattributionsscanner/jsongenerator.cpp
@@ -63,7 +63,7 @@ static QJsonObject generate(Package package)
return obj;
}
-void generate(QTextStream &out, const QVector<Package> &packages, LogLevel logLevel)
+void generate(QTextStream &out, const QList<Package> &packages, LogLevel logLevel)
{
if (logLevel == VerboseLog)
std::cerr << qPrintable(tr("Generating json...\n"));
diff --git a/src/qtattributionsscanner/jsongenerator.h b/src/qtattributionsscanner/jsongenerator.h
index a4b6f11e2..5099822e6 100644
--- a/src/qtattributionsscanner/jsongenerator.h
+++ b/src/qtattributionsscanner/jsongenerator.h
@@ -33,11 +33,11 @@
#include "package.h"
#include <QtCore/qtextstream.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
namespace JsonGenerator {
-void generate(QTextStream &out, const QVector<Package> &packages, LogLevel logLevel);
+void generate(QTextStream &out, const QList<Package> &packages, LogLevel logLevel);
} // namespace JsonGenerator
diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp
index a317aec29..2684a6207 100644
--- a/src/qtattributionsscanner/main.cpp
+++ b/src/qtattributionsscanner/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
}
// Parse the attribution files
- QVector<Package> packages;
+ QList<Package> packages;
const QFileInfo pathInfo(path);
if (pathInfo.isDir()) {
if (logLevel == VerboseLog)
diff --git a/src/qtattributionsscanner/qdocgenerator.cpp b/src/qtattributionsscanner/qdocgenerator.cpp
index dfa460f3d..3e2fe34bf 100644
--- a/src/qtattributionsscanner/qdocgenerator.cpp
+++ b/src/qtattributionsscanner/qdocgenerator.cpp
@@ -154,7 +154,7 @@ static void generate(QTextStream &out, const Package &package, const QDir &baseD
out << "*/\n";
}
-void generate(QTextStream &out, const QVector<Package> &packages, const QString &baseDirectory,
+void generate(QTextStream &out, const QList<Package> &packages, const QString &baseDirectory,
LogLevel logLevel)
{
if (logLevel == VerboseLog)
diff --git a/src/qtattributionsscanner/qdocgenerator.h b/src/qtattributionsscanner/qdocgenerator.h
index 758318f13..826f01e01 100644
--- a/src/qtattributionsscanner/qdocgenerator.h
+++ b/src/qtattributionsscanner/qdocgenerator.h
@@ -33,11 +33,11 @@
#include "package.h"
#include <QtCore/qtextstream.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
namespace QDocGenerator {
-void generate(QTextStream &out, const QVector<Package> &packages, const QString &baseDirectory,
+void generate(QTextStream &out, const QList<Package> &packages, const QString &baseDirectory,
LogLevel logLevel);
} // namespace QDocGenerator
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index fd9d06366..4eb41e4d4 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -224,9 +224,9 @@ static Package parseChromiumFile(QFile &file, const QString &filePath, LogLevel
return p;
}
-QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
+QList<Package> readFile(const QString &filePath, LogLevel logLevel)
{
- QVector<Package> packages;
+ QList<Package> packages;
if (logLevel == VerboseLog) {
std::cerr << qPrintable(tr("Reading file %1...").arg(
@@ -237,7 +237,7 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
if (logLevel != SilentLog)
std::cerr << qPrintable(tr("Could not open file %1.").arg(
QDir::toNativeSeparators(file.fileName()))) << std::endl;
- return QVector<Package>();
+ return QList<Package>();
}
if (filePath.endsWith(QLatin1String(".json"))) {
@@ -249,7 +249,7 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
QDir::toNativeSeparators(file.fileName()),
jsonParseError.errorString()))
<< std::endl;
- return QVector<Package>();
+ return QList<Package>();
}
if (document.isObject()) {
@@ -286,10 +286,10 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
return packages;
}
-QVector<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel)
+QList<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel)
{
QDir dir(directory);
- QVector<Package> packages;
+ QList<Package> packages;
QStringList nameFilters = QStringList();
if (inputFormats & InputFormat::QtAttributions)
diff --git a/src/qtattributionsscanner/scanner.h b/src/qtattributionsscanner/scanner.h
index e697f937a..e681c9891 100644
--- a/src/qtattributionsscanner/scanner.h
+++ b/src/qtattributionsscanner/scanner.h
@@ -33,7 +33,7 @@
#include "package.h"
#include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
namespace Scanner {
@@ -44,8 +44,8 @@ enum class InputFormat {
Q_DECLARE_FLAGS(InputFormats, InputFormat)
Q_DECLARE_OPERATORS_FOR_FLAGS(InputFormats)
-QVector<Package> readFile(const QString &filePath, LogLevel logLevel);
-QVector<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel);
+QList<Package> readFile(const QString &filePath, LogLevel logLevel);
+QList<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel);
}
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 6d72f9f84..a9e80f2d3 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -535,7 +535,7 @@ void DeviceSkin::paintEvent( QPaintEvent *)
} else {
p.drawPixmap(0, 0, skinImageClosed);
}
- QVector<int> toDraw;
+ QList<int> toDraw;
if ( buttonPressed == true ) {
toDraw += buttonIndex;
}
diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h
index fcdb88093..2f7d09510 100644
--- a/src/shared/deviceskin/deviceskin.h
+++ b/src/shared/deviceskin/deviceskin.h
@@ -41,10 +41,12 @@
#define SKIN_H
#include <QtWidgets/QWidget>
+
+#include <QtGui/QPixmap>
#include <QtGui/QPolygon>
#include <QtGui/QRegion>
-#include <QtGui/QPixmap>
-#include <QtCore/QVector>
+
+#include <QtCore/QList>
QT_BEGIN_NAMESPACE
@@ -90,7 +92,7 @@ struct DeviceSkinParameters {
QRect closedScreenRect;
int screenDepth;
QPoint cursorHot;
- QVector<DeviceSkinButtonArea> buttonAreas;
+ QList<DeviceSkinButtonArea> buttonAreas;
QList<int> toggleAreaList;
int joystick;
@@ -143,7 +145,7 @@ private:
void endPress();
const DeviceSkinParameters m_parameters;
- QVector<QRegion> buttonRegions;
+ QList<QRegion> buttonRegions;
QPixmap skinImageUp;
QPixmap skinImageDown;
QPixmap skinImageClosed;
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index 3c48cdfcb..5e0f0e025 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -94,7 +94,7 @@ private:
QPixmap hueGradientPixmap(Qt::Orientation orientation, bool flipped = false,
int saturation = 0xFF, int value = 0xFF, int alpha = 0xFF) const;
- QVector<QRect> rects(const QPointF &point) const;
+ QList<QRect> rects(const QPointF &point) const;
QColor colorFromPoint(const QPointF &point) const;
QPointF pointFromColor(const QColor &color) const;
@@ -620,7 +620,7 @@ QPointF QtColorLinePrivate::pointFromColor(const QColor &color) const
return p;
}
-QVector<QRect> QtColorLinePrivate::rects(const QPointF &point) const
+QList<QRect> QtColorLinePrivate::rects(const QPointF &point) const
{
QRect r = q_ptr->geometry();
r.moveTo(0, 0);
@@ -630,7 +630,7 @@ QVector<QRect> QtColorLinePrivate::rects(const QPointF &point) const
int y1 = (int)((r.height() - m_indicatorSize - 2 * m_indicatorSpace) * point.y() + 0.5);
int y2 = y1 + m_indicatorSize + 2 * m_indicatorSpace;
- QVector<QRect> rects;
+ QList<QRect> rects;
if (m_orientation == Qt::Horizontal) {
// r0 r1 r2
QRect r0(0, 0, x1, r.height());
@@ -660,7 +660,7 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
{
QRect rect = q_ptr->rect();
- QVector<QRect> r = rects(m_point);
+ QList<QRect> r = rects(m_point);
QColor c = colorFromPoint(m_point);
if (!m_combiningAlpha && m_component != QtColorLine::Alpha)
@@ -915,7 +915,7 @@ void QtColorLinePrivate::mousePressEvent(QMouseEvent *event)
if (event->button() != Qt::LeftButton)
return;
- QVector<QRect> r = rects(m_point);
+ QList<QRect> r = rects(m_point);
QPoint clickPos = event->pos();
QPoint posOnField = r[1].topLeft() - QPoint(m_indicatorSpace, m_indicatorSpace);
@@ -969,7 +969,7 @@ void QtColorLinePrivate::mouseDoubleClickEvent(QMouseEvent *event)
if (event->button() != Qt::LeftButton)
return;
- QVector<QRect> r = rects(m_point);
+ QList<QRect> r = rects(m_point);
QPoint clickPos = event->pos();
if (!r[0].contains(clickPos) && !r[2].contains(clickPos))
return;
diff --git a/src/shared/winutils/elfreader.cpp b/src/shared/winutils/elfreader.cpp
index ab2242619..f375f5841 100644
--- a/src/shared/winutils/elfreader.cpp
+++ b/src/shared/winutils/elfreader.cpp
@@ -399,7 +399,7 @@ QList<QByteArray> ElfReader::dependencies()
quint64 dynamicOffset = 0;
quint64 dynamicSize = 0;
- const QVector<ElfSectionHeader> &headers = readHeaders().sectionHeaders;
+ const QList<ElfSectionHeader> &headers = readHeaders().sectionHeaders;
for (const ElfSectionHeader &eh : headers) {
if (eh.name == QByteArrayLiteral(".dynstr")) {
dynStrOffset = eh.offset;
diff --git a/src/shared/winutils/elfreader.h b/src/shared/winutils/elfreader.h
index 65de80ec4..d84f5a060 100644
--- a/src/shared/winutils/elfreader.h
+++ b/src/shared/winutils/elfreader.h
@@ -29,9 +29,9 @@
#ifndef ELFREADER_H
#define ELFREADER_H
-#include <QtCore/QtEndian>
+#include <QtCore/QList>
#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/QtEndian>
QT_BEGIN_NAMESPACE
@@ -146,8 +146,8 @@ public:
QByteArray debugLink;
QByteArray buildId;
DebugSymbolsType symbolsType;
- QVector<ElfSectionHeader> sectionHeaders;
- QVector<ElfProgramHeader> programHeaders;
+ QList<ElfSectionHeader> sectionHeaders;
+ QList<ElfProgramHeader> programHeaders;
};
class ElfReader
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 90956e3fe..47395f628 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -29,17 +29,17 @@
#include "utils.h"
#include "qmlutils.h"
+#include <QtCore/QCommandLineOption>
+#include <QtCore/QCommandLineParser>
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QCoreApplication>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QCommandLineOption>
+#include <QtCore/QList>
#include <QtCore/QOperatingSystemVersion>
#include <QtCore/QSharedPointer>
-#include <QtCore/QVector>
#ifdef Q_OS_WIN
#include <QtCore/qt_windows.h>
@@ -314,7 +314,7 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
Options *options, QString *errorMessage)
{
using CommandLineOptionPtr = QSharedPointer<QCommandLineOption>;
- using OptionPtrVector = QVector<CommandLineOptionPtr>;
+ using OptionPtrVector = QList<CommandLineOptionPtr>;
parser->setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser->setApplicationDescription(QStringLiteral("Qt Deploy Tool ") + QLatin1String(QT_VERSION_STR)
diff --git a/src/winrtrunner/runner.cpp b/src/winrtrunner/runner.cpp
index e816d9baa..d115b584b 100644
--- a/src/winrtrunner/runner.cpp
+++ b/src/winrtrunner/runner.cpp
@@ -73,7 +73,7 @@ public:
// final output location. Might be equal to localOutputFile or stdout (-)
QString finalOutputFile;
};
- QVector<TestPaths> testPaths;
+ QList<TestPaths> testPaths;
QString profile;
QScopedPointer<RunnerEngine> engine;
View Lorry Controller Status