summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp2
-rw-r--r--src/widgets/dialogs/qfiledialog_p.h2
-rw-r--r--src/widgets/dialogs/qfileinfogatherer.cpp8
-rw-r--r--src/widgets/dialogs/qfileinfogatherer_p.h5
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp15
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.h4
-rw-r--r--src/widgets/dialogs/qfilesystemmodel_p.h4
-rw-r--r--src/widgets/dialogs/qsidebar_p.h4
-rw-r--r--src/widgets/dialogs/qwizard.cpp18
9 files changed, 34 insertions, 28 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 5cecd478de..f89d60ca74 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -3634,7 +3634,7 @@ void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
const QStringList multipleFiles = typedFiles();
if (multipleFiles.count() > 0) {
QModelIndexList oldFiles = qFileDialogUi->listView->selectionModel()->selectedRows();
- QVector<QModelIndex> newFiles;
+ QList<QModelIndex> newFiles;
for (const auto &file : multipleFiles) {
QModelIndex idx = model->index(file);
if (oldFiles.removeAll(idx) == 0)
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index dcf147348f..42932bab5d 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -116,7 +116,7 @@ class Q_WIDGETS_EXPORT QFileDialogPrivate : public QDialogPrivate
Q_DECLARE_PUBLIC(QFileDialog)
public:
- using PersistentModelIndexList = QVector<QPersistentModelIndex>;
+ using PersistentModelIndexList = QList<QPersistentModelIndex>;
struct HistoryItem
{
diff --git a/src/widgets/dialogs/qfileinfogatherer.cpp b/src/widgets/dialogs/qfileinfogatherer.cpp
index b6fdac61d1..750db9a2dc 100644
--- a/src/widgets/dialogs/qfileinfogatherer.cpp
+++ b/src/widgets/dialogs/qfileinfogatherer.cpp
@@ -380,7 +380,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
}
for (int i = infoList.count() - 1; i >= 0; --i) {
QString driveName = translateDriveName(infoList.at(i));
- QVector<QPair<QString,QFileInfo> > updatedFiles;
+ QList<QPair<QString, QFileInfo>> updatedFiles;
updatedFiles.append(QPair<QString,QFileInfo>(driveName, infoList.at(i)));
emit updates(path, updatedFiles);
}
@@ -391,7 +391,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
base.start();
QFileInfo fileInfo;
bool firstTime = true;
- QVector<QPair<QString, QFileInfo> > updatedFiles;
+ QList<QPair<QString, QFileInfo>> updatedFiles;
QStringList filesToCheck = files;
QStringList allFiles;
@@ -418,7 +418,9 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
emit directoryLoaded(path);
}
-void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QElapsedTimer &base, bool &firstTime, QVector<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
+void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QElapsedTimer &base, bool &firstTime,
+ QList<QPair<QString, QFileInfo>> &updatedFiles, const QString &path)
+{
updatedFiles.append(QPair<QString, QFileInfo>(fileInfo.fileName(), fileInfo));
QElapsedTimer current;
current.start();
diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h
index 3d30a98d04..664ea74c02 100644
--- a/src/widgets/dialogs/qfileinfogatherer_p.h
+++ b/src/widgets/dialogs/qfileinfogatherer_p.h
@@ -160,7 +160,7 @@ class Q_AUTOTEST_EXPORT QFileInfoGatherer : public QThread
Q_OBJECT
Q_SIGNALS:
- void updates(const QString &directory, const QVector<QPair<QString, QFileInfo> > &updates);
+ void updates(const QString &directory, const QList<QPair<QString, QFileInfo>> &updates);
void newListOfFiles(const QString &directory, const QStringList &listOfFiles) const;
void nameResolved(const QString &fileName, const QString &resolvedName) const;
void directoryLoaded(const QString &path);
@@ -199,7 +199,8 @@ private:
void run() override;
// called by run():
void getFileInfos(const QString &path, const QStringList &files);
- void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QVector<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
+ void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime,
+ QList<QPair<QString, QFileInfo>> &updatedFiles, const QString &path);
private:
void createWatcher();
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 023f3f64fa..8aefac7343 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1106,7 +1106,7 @@ void QFileSystemModelPrivate::sortChildren(int column, const QModelIndex &parent
if (indexNode->children.count() == 0)
return;
- QVector<QFileSystemModelPrivate::QFileSystemNode*> values;
+ QList<QFileSystemModelPrivate::QFileSystemNode *> values;
for (auto iterator = indexNode->children.constBegin(), cend = indexNode->children.constEnd(); iterator != cend; ++iterator) {
if (filtersAcceptsNode(iterator.value())) {
@@ -1150,7 +1150,7 @@ void QFileSystemModel::sort(int column, Qt::SortOrder order)
emit layoutAboutToBeChanged();
QModelIndexList oldList = persistentIndexList();
- QVector<QPair<QFileSystemModelPrivate::QFileSystemNode*, int> > oldNodes;
+ QList<QPair<QFileSystemModelPrivate::QFileSystemNode *, int>> oldNodes;
const int nodeCount = oldList.count();
oldNodes.reserve(nodeCount);
for (int i = 0; i < nodeCount; ++i) {
@@ -1920,11 +1920,12 @@ void QFileSystemModelPrivate::removeVisibleFile(QFileSystemNode *parentNode, int
The thread has received new information about files,
update and emit dataChanged if it has actually changed.
*/
-void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path, const QVector<QPair<QString, QFileInfo> > &updates)
+void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path,
+ const QList<QPair<QString, QFileInfo>> &updates)
{
#if QT_CONFIG(filesystemwatcher)
Q_Q(QFileSystemModel);
- QVector<QString> rowsToUpdate;
+ QList<QString> rowsToUpdate;
QStringList newFiles;
QFileSystemModelPrivate::QFileSystemNode *parentNode = node(path, false);
QModelIndex parentIndex = index(parentNode);
@@ -2077,12 +2078,12 @@ void QFileSystemModelPrivate::init()
delayedSortTimer.setSingleShot(true);
- qRegisterMetaType<QVector<QPair<QString,QFileInfo> > >();
+ qRegisterMetaType<QList<QPair<QString, QFileInfo>>>();
#if QT_CONFIG(filesystemwatcher)
q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(QString,QStringList)),
q, SLOT(_q_directoryChanged(QString,QStringList)));
- q->connect(&fileInfoGatherer, SIGNAL(updates(QString,QVector<QPair<QString,QFileInfo> >)),
- q, SLOT(_q_fileSystemChanged(QString,QVector<QPair<QString,QFileInfo> >)));
+ q->connect(&fileInfoGatherer, SIGNAL(updates(QString, QList<QPair<QString, QFileInfo>>)), q,
+ SLOT(_q_fileSystemChanged(QString, QList<QPair<QString, QFileInfo>>)));
q->connect(&fileInfoGatherer, SIGNAL(nameResolved(QString,QString)),
q, SLOT(_q_resolvedName(QString,QString)));
q->connect(&fileInfoGatherer, SIGNAL(directoryLoaded(QString)),
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
index a2c6e2c2a0..518a45a477 100644
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@@ -170,7 +170,9 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_directoryChanged(const QString &directory, const QStringList &list))
Q_PRIVATE_SLOT(d_func(), void _q_performDelayedSort())
- Q_PRIVATE_SLOT(d_func(), void _q_fileSystemChanged(const QString &path, const QVector<QPair<QString, QFileInfo> > &))
+ Q_PRIVATE_SLOT(d_func(),
+ void _q_fileSystemChanged(const QString &path,
+ const QList<QPair<QString, QFileInfo>> &))
Q_PRIVATE_SLOT(d_func(), void _q_resolvedName(const QString &fileName, const QString &resolvedName))
friend class QFileDialogPrivate;
diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h
index ccfa40c5f7..1870b08df1 100644
--- a/src/widgets/dialogs/qfilesystemmodel_p.h
+++ b/src/widgets/dialogs/qfilesystemmodel_p.h
@@ -276,7 +276,7 @@ public:
void _q_directoryChanged(const QString &directory, const QStringList &list);
void _q_performDelayedSort();
- void _q_fileSystemChanged(const QString &path, const QVector<QPair<QString, QFileInfo> > &);
+ void _q_fileSystemChanged(const QString &path, const QList<QPair<QString, QFileInfo>> &);
void _q_resolvedName(const QString &fileName, const QString &resolvedName);
QDir rootDir;
@@ -301,7 +301,7 @@ public:
QString file;
const QFileSystemNode *node;
};
- QVector<Fetching> toFetch;
+ QList<Fetching> toFetch;
QBasicTimer fetchingTimer;
diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
index 6056f19452..8708d07297 100644
--- a/src/widgets/dialogs/qsidebar_p.h
+++ b/src/widgets/dialogs/qsidebar_p.h
@@ -52,11 +52,11 @@
//
#include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include <qlist.h>
#include <qlistview.h>
#include <qstandarditemmodel.h>
#include <qstyleditemdelegate.h>
#include <qurl.h>
-#include <qvector.h>
QT_REQUIRE_CONFIG(filedialog);
@@ -114,7 +114,7 @@ private:
};
friend class QTypeInfo<WatchItem>;
- QVector<WatchItem> watching;
+ QList<WatchItem> watching;
QList<QUrl> invalidUrls;
};
Q_DECLARE_TYPEINFO(QUrlModel::WatchItem, Q_MOVABLE_TYPE);
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 97d61a9a15..0860f9defe 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -189,7 +189,7 @@ public:
QWizardField(QWizardPage *page, const QString &spec, QObject *object, const char *property,
const char *changedSignal);
- void resolve(const QVector<QWizardDefaultProperty> &defaultPropertyTable);
+ void resolve(const QList<QWizardDefaultProperty> &defaultPropertyTable);
void findProperty(const QWizardDefaultProperty *properties, int propertyCount);
QWizardPage *page;
@@ -213,7 +213,7 @@ QWizardField::QWizardField(QWizardPage *page, const QString &spec, QObject *obje
}
}
-void QWizardField::resolve(const QVector<QWizardDefaultProperty> &defaultPropertyTable)
+void QWizardField::resolve(const QList<QWizardDefaultProperty> &defaultPropertyTable)
{
if (property.isEmpty())
findProperty(defaultPropertyTable.constData(), defaultPropertyTable.count());
@@ -491,7 +491,7 @@ public:
QString title;
QString subTitle;
QPixmap pixmaps[QWizard::NPixmaps];
- QVector<QWizardField> pendingFields;
+ QList<QWizardField> pendingFields;
mutable TriState completeState = Tri_Unknown;
bool explicitlyFinal = false;
bool commit = false;
@@ -585,9 +585,9 @@ public:
#endif
PageMap pageMap;
- QVector<QWizardField> fields;
+ QList<QWizardField> fields;
QMap<QString, int> fieldIndexMap;
- QVector<QWizardDefaultProperty> defaultPropertyTable;
+ QList<QWizardDefaultProperty> defaultPropertyTable;
QList<int> history;
int start = -1;
bool startSetByUser = false;
@@ -1707,7 +1707,7 @@ void QWizardPrivate::_q_updateButtonStates()
void QWizardPrivate::_q_handleFieldObjectDestroyed(QObject *object)
{
int destroyed_index = -1;
- QVector<QWizardField>::iterator it = fields.begin();
+ QList<QWizardField>::iterator it = fields.begin();
while (it != fields.end()) {
const QWizardField &field = *it;
if (field.object == object) {
@@ -2244,7 +2244,7 @@ void QWizard::setPage(int theid, QWizardPage *page)
page->setParent(d->pageFrame);
- QVector<QWizardField> &pendingFields = page->d_func()->pendingFields;
+ QList<QWizardField> &pendingFields = page->d_func()->pendingFields;
for (int i = 0; i < pendingFields.count(); ++i)
d->addField(pendingFields.at(i));
pendingFields.clear();
@@ -3597,7 +3597,7 @@ void QWizardPage::cleanupPage()
{
Q_D(QWizardPage);
if (d->wizard) {
- const QVector<QWizardField> &fields = d->wizard->d_func()->fields;
+ const QList<QWizardField> &fields = d->wizard->d_func()->fields;
for (const auto &field : fields) {
if (field.page == this)
field.object->setProperty(field.property, field.initialValue);
@@ -3648,7 +3648,7 @@ bool QWizardPage::isComplete() const
if (!d->wizard)
return true;
- const QVector<QWizardField> &wizardFields = d->wizard->d_func()->fields;
+ const QList<QWizardField> &wizardFields = d->wizard->d_func()->fields;
for (int i = wizardFields.count() - 1; i >= 0; --i) {
const QWizardField &field = wizardFields.at(i);
if (field.page == this && field.mandatory) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 13:21:38 +0000