summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r--src/widgets/widgets/qdockarealayout.cpp24
-rw-r--r--src/widgets/widgets/qdockarealayout_p.h17
-rw-r--r--src/widgets/widgets/qdockwidget_p.h2
-rw-r--r--src/widgets/widgets/qlineedit.cpp1
-rw-r--r--src/widgets/widgets/qmainwindowlayout_p.h4
-rw-r--r--src/widgets/widgets/qmdiarea.cpp36
-rw-r--r--src/widgets/widgets/qmdiarea_p.h28
-rw-r--r--src/widgets/widgets/qmenu.cpp15
-rw-r--r--src/widgets/widgets/qmenu_p.h7
-rw-r--r--src/widgets/widgets/qmenubar.cpp2
-rw-r--r--src/widgets/widgets/qmenubar_p.h6
-rw-r--r--src/widgets/widgets/qplaintextedit.cpp3
-rw-r--r--src/widgets/widgets/qsplitter.cpp3
-rw-r--r--src/widgets/widgets/qtabbar.cpp2
-rw-r--r--src/widgets/widgets/qtoolbararealayout_p.h6
-rw-r--r--src/widgets/widgets/qtoolbarlayout.cpp4
-rw-r--r--src/widgets/widgets/qtoolbarlayout_p.h4
-rw-r--r--src/widgets/widgets/qwidgetlinecontrol.cpp4
-rw-r--r--src/widgets/widgets/qwidgettextcontrol.cpp8
-rw-r--r--src/widgets/widgets/qwidgettextcontrol_p_p.h2
20 files changed, 88 insertions, 90 deletions
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index eedd0725cd..238b8d22ba 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -543,7 +543,7 @@ void QDockAreaLayoutInfo::fitItems()
}
#endif
- QVector<QLayoutStruct> layout_struct_list(item_list.size()*2);
+ QList<QLayoutStruct> layout_struct_list(item_list.size() * 2);
int j = 0;
int size = pick(o, rect.size());
@@ -853,7 +853,7 @@ static inline int grow(QLayoutStruct &ls, int delta)
return ls.size - old_size;
}
-static int separatorMoveHelper(QVector<QLayoutStruct> &list, int index, int delta, int sep)
+static int separatorMoveHelper(QList<QLayoutStruct> &list, int index, int delta, int sep)
{
// adjust sizes
int pos = -1;
@@ -937,7 +937,7 @@ int QDockAreaLayoutInfo::separatorMove(int index, int delta)
Q_ASSERT(!tabbed);
#endif
- QVector<QLayoutStruct> list(item_list.size());
+ QList<QLayoutStruct> list(item_list.size());
for (int i = 0; i < list.size(); ++i) {
const QDockAreaLayoutItem &item = item_list.at(i);
QLayoutStruct &ls = list[i];
@@ -2616,8 +2616,8 @@ void QDockAreaLayout::removePlaceHolder(const QString &name)
static inline int qMax(int i1, int i2, int i3) { return qMax(i1, qMax(i2, i3)); }
-void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
- QVector<QLayoutStruct> *_hor_struct_list)
+void QDockAreaLayout::getGrid(QList<QLayoutStruct> *_ver_struct_list,
+ QList<QLayoutStruct> *_hor_struct_list)
{
QSize center_hint(0, 0);
QSize center_min(0, 0);
@@ -2670,7 +2670,7 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
bottom_hint = bottom_hint.boundedTo(bottom_max).expandedTo(bottom_min);
if (_ver_struct_list != nullptr) {
- QVector<QLayoutStruct> &ver_struct_list = *_ver_struct_list;
+ QList<QLayoutStruct> &ver_struct_list = *_ver_struct_list;
ver_struct_list.resize(3);
// top --------------------------------------------------
@@ -2732,7 +2732,7 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
}
if (_hor_struct_list != nullptr) {
- QVector<QLayoutStruct> &hor_struct_list = *_hor_struct_list;
+ QList<QLayoutStruct> &hor_struct_list = *_hor_struct_list;
hor_struct_list.resize(3);
// left --------------------------------------------------
@@ -2794,8 +2794,8 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
}
}
-void QDockAreaLayout::setGrid(QVector<QLayoutStruct> *ver_struct_list,
- QVector<QLayoutStruct> *hor_struct_list)
+void QDockAreaLayout::setGrid(QList<QLayoutStruct> *ver_struct_list,
+ QList<QLayoutStruct> *hor_struct_list)
{
// top ---------------------------------------------------
@@ -2892,8 +2892,8 @@ void QDockAreaLayout::setGrid(QVector<QLayoutStruct> *ver_struct_list,
void QDockAreaLayout::fitLayout()
{
- QVector<QLayoutStruct> ver_struct_list(3);
- QVector<QLayoutStruct> hor_struct_list(3);
+ QList<QLayoutStruct> ver_struct_list(3);
+ QList<QLayoutStruct> hor_struct_list(3);
getGrid(&ver_struct_list, &hor_struct_list);
qGeomCalc(ver_struct_list, 0, 3, rect.top(), rect.height(), sep);
@@ -3251,7 +3251,7 @@ int QDockAreaLayout::separatorMove(const QList<int> &separator, const QPoint &or
return delta;
}
- QVector<QLayoutStruct> list;
+ QList<QLayoutStruct> list;
if (index == QInternal::LeftDock || index == QInternal::RightDock)
getGrid(nullptr, &list);
diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
index 81384bd1b7..171147c254 100644
--- a/src/widgets/widgets/qdockarealayout_p.h
+++ b/src/widgets/widgets/qdockarealayout_p.h
@@ -52,11 +52,10 @@
//
#include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include "QtCore/qrect.h"
-#include "QtCore/qpair.h"
-#include "QtCore/qlist.h"
-#include "QtCore/qvector.h"
#include "QtWidgets/qlayout.h"
+#include "QtCore/qlist.h"
+#include "QtCore/qpair.h"
+#include "QtCore/qrect.h"
QT_REQUIRE_CONFIG(dockwidget);
@@ -193,7 +192,7 @@ public:
QMainWindowLayout *mainWindowLayout() const;
const int *sep;
- mutable QVector<QWidget*> separatorWidgets;
+ mutable QList<QWidget *> separatorWidgets;
QInternal::DockPosition dockPos;
Qt::Orientation o;
QRect rect;
@@ -238,7 +237,7 @@ public:
QDockAreaLayoutInfo docks[4];
int sep; // separator extent
bool fallbackToSizeHints; //determines if we should use the sizehint for the dock areas (true until the layout is restored or the separator is moved by user)
- mutable QVector<QWidget*> separatorWidgets;
+ mutable QList<QWidget *> separatorWidgets;
bool isValid() const;
@@ -296,10 +295,8 @@ public:
QLayoutItem *takeAt(int *x, int index);
void deleteAllLayoutItems();
- void getGrid(QVector<QLayoutStruct> *ver_struct_list,
- QVector<QLayoutStruct> *hor_struct_list);
- void setGrid(QVector<QLayoutStruct> *ver_struct_list,
- QVector<QLayoutStruct> *hor_struct_list);
+ void getGrid(QList<QLayoutStruct> *ver_struct_list, QList<QLayoutStruct> *hor_struct_list);
+ void setGrid(QList<QLayoutStruct> *ver_struct_list, QList<QLayoutStruct> *hor_struct_list);
QRect gapRect(const QList<int> &path) const;
diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
index d5d321519e..ca9bf9dfcc 100644
--- a/src/widgets/widgets/qdockwidget_p.h
+++ b/src/widgets/widgets/qdockwidget_p.h
@@ -172,7 +172,7 @@ public:
bool verticalTitleBar;
private:
- QVector<QLayoutItem*> item_list;
+ QList<QLayoutItem *> item_list;
QRect _titleArea;
};
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index cd9a8c4eec..d95c004c8c 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -64,7 +64,6 @@
#include "qtimer.h"
#include "qvalidator.h"
#include "qvariant.h"
-#include "qvector.h"
#include "qdebug.h"
#if QT_CONFIG(textedit)
#include "qtextedit.h"
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 16d1145b7e..0c840d7ac7 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -60,9 +60,9 @@
#include "QtGui/qpainter.h"
#include "QtGui/qevent.h"
#endif
-#include "QtCore/qvector.h"
-#include "QtCore/qset.h"
#include "QtCore/qbasictimer.h"
+#include "QtCore/qlist.h"
+#include "QtCore/qset.h"
#include "private/qlayoutengine_p.h"
#include "private/qwidgetanimator_p.h"
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 953d25088e..f2613bf5dd 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -409,7 +409,7 @@ void IconTiler::rearrange(QList<QWidget *> &widgets, const QRect &domain) const
\internal
Calculates the accumulated overlap (intersection area) between 'source' and 'rects'.
*/
-int MinOverlapPlacer::accumulatedOverlap(const QRect &source, const QVector<QRect> &rects)
+int MinOverlapPlacer::accumulatedOverlap(const QRect &source, const QList<QRect> &rects)
{
int accOverlap = 0;
for (const QRect &rect : rects) {
@@ -425,7 +425,7 @@ int MinOverlapPlacer::accumulatedOverlap(const QRect &source, const QVector<QRec
Finds among 'source' the rectangle with the minimum accumulated overlap with the
rectangles in 'rects'.
*/
-QRect MinOverlapPlacer::findMinOverlapRect(const QVector<QRect> &source, const QVector<QRect> &rects)
+QRect MinOverlapPlacer::findMinOverlapRect(const QList<QRect> &source, const QList<QRect> &rects)
{
int minAccOverlap = -1;
QRect minAccOverlapRect;
@@ -443,16 +443,16 @@ QRect MinOverlapPlacer::findMinOverlapRect(const QVector<QRect> &source, const Q
\internal
Gets candidates for the final placement.
*/
-QVector<QRect> MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QVector<QRect> &rects,
- const QRect &domain)
+QList<QRect> MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QList<QRect> &rects,
+ const QRect &domain)
{
- QVector<QRect> result;
+ QList<QRect> result;
- QVector<int> xlist;
+ QList<int> xlist;
xlist.reserve(2 + rects.size());
xlist << domain.left() << domain.right() - size.width() + 1;
- QVector<int> ylist;
+ QList<int> ylist;
ylist.reserve(2 + rects.size());
ylist << domain.top();
if (domain.bottom() - size.height() + 1 >= 0)
@@ -481,14 +481,14 @@ QVector<QRect> MinOverlapPlacer::getCandidatePlacements(const QSize &size, const
Finds all rectangles in 'source' not completely inside 'domain'. The result is stored
in 'result' and also removed from 'source'.
*/
-QVector<QRect> MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QRect> &source)
+QList<QRect> MinOverlapPlacer::findNonInsiders(const QRect &domain, QList<QRect> &source)
{
const auto containedInDomain =
[domain](const QRect &srcRect) { return domain.contains(srcRect); };
const auto firstOut = std::stable_partition(source.begin(), source.end(), containedInDomain);
- QVector<QRect> result;
+ QList<QRect> result;
result.reserve(source.end() - firstOut);
std::copy(firstOut, source.end(), std::back_inserter(result));
@@ -502,9 +502,9 @@ QVector<QRect> MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QR
Finds all rectangles in 'source' that overlaps 'domain' by the maximum overlap area
between 'domain' and any rectangle in 'source'. The result is stored in 'result'.
*/
-QVector<QRect> MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QVector<QRect> &source)
+QList<QRect> MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QList<QRect> &source)
{
- QVector<QRect> result;
+ QList<QRect> result;
result.reserve(source.size());
int maxOverlap = -1;
@@ -529,15 +529,15 @@ QVector<QRect> MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const Q
placement that overlaps the rectangles in 'rects' as little as possible while at the
same time being as much as possible inside 'domain'.
*/
-QPoint MinOverlapPlacer::findBestPlacement(const QRect &domain, const QVector<QRect> &rects,
- QVector<QRect> &source)
+QPoint MinOverlapPlacer::findBestPlacement(const QRect &domain, const QList<QRect> &rects,
+ QList<QRect> &source)
{
- const QVector<QRect> nonInsiders = findNonInsiders(domain, source);
+ const QList<QRect> nonInsiders = findNonInsiders(domain, source);
if (!source.empty())
return findMinOverlapRect(source, rects).topLeft();
- QVector<QRect> maxOverlappers = findMaxOverlappers(domain, nonInsiders);
+ QList<QRect> maxOverlappers = findMaxOverlappers(domain, nonInsiders);
return findMinOverlapRect(maxOverlappers, rects).topLeft();
}
@@ -548,7 +548,7 @@ QPoint MinOverlapPlacer::findBestPlacement(const QRect &domain, const QVector<QR
overlaps 'rects' as little as possible and 'domain' as much as possible.
Returns the position of the resulting rectangle.
*/
-QPoint MinOverlapPlacer::place(const QSize &size, const QVector<QRect> &rects,
+QPoint MinOverlapPlacer::place(const QSize &size, const QList<QRect> &rects,
const QRect &domain) const
{
if (size.isEmpty() || !domain.isValid())
@@ -558,7 +558,7 @@ QPoint MinOverlapPlacer::place(const QSize &size, const QVector<QRect> &rects,
return QPoint();
}
- QVector<QRect> candidates = getCandidatePlacements(size, rects, domain);
+ QList<QRect> candidates = getCandidatePlacements(size, rects, domain);
return findBestPlacement(domain, rects, candidates);
}
@@ -891,7 +891,7 @@ void QMdiAreaPrivate::place(Placer *placer, QMdiSubWindow *child)
return;
}
- QVector<QRect> rects;
+ QList<QRect> rects;
rects.reserve(childWindows.size());
QRect parentRect = q->rect();
foreach (QMdiSubWindow *window, childWindows) {
diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h
index 0a6368044a..1c39d1a378 100644
--- a/src/widgets/widgets/qmdiarea_p.h
+++ b/src/widgets/widgets/qmdiarea_p.h
@@ -58,7 +58,7 @@
QT_REQUIRE_CONFIG(mdiarea);
#include <QList>
-#include <QVector>
+#include <QList>
#include <QRect>
#include <QPoint>
#include <QtWidgets/qapplication.h>
@@ -115,20 +115,22 @@ class Placer
public:
// Places the rectangle defined by 'size' relative to 'rects' and 'domain'.
// Returns the position of the resulting rectangle.
- virtual QPoint place(
- const QSize &size, const QVector<QRect> &rects, const QRect &domain) const = 0;
+ virtual QPoint place(const QSize &size, const QList<QRect> &rects,
+ const QRect &domain) const = 0;
virtual ~Placer() {}
};
class MinOverlapPlacer : public Placer
{
- QPoint place(const QSize &size, const QVector<QRect> &rects, const QRect &domain) const override;
- static int accumulatedOverlap(const QRect &source, const QVector<QRect> &rects);
- static QRect findMinOverlapRect(const QVector<QRect> &source, const QVector<QRect> &rects);
- static QVector<QRect> getCandidatePlacements(const QSize &size, const QVector<QRect> &rects, const QRect &domain);
- static QPoint findBestPlacement(const QRect &domain, const QVector<QRect> &rects, QVector<QRect> &source);
- static QVector<QRect> findNonInsiders(const QRect &domain, QVector<QRect> &source);
- static QVector<QRect> findMaxOverlappers(const QRect &domain, const QVector<QRect> &source);
+ QPoint place(const QSize &size, const QList<QRect> &rects, const QRect &domain) const override;
+ static int accumulatedOverlap(const QRect &source, const QList<QRect> &rects);
+ static QRect findMinOverlapRect(const QList<QRect> &source, const QList<QRect> &rects);
+ static QList<QRect> getCandidatePlacements(const QSize &size, const QList<QRect> &rects,
+ const QRect &domain);
+ static QPoint findBestPlacement(const QRect &domain, const QList<QRect> &rects,
+ QList<QRect> &source);
+ static QList<QRect> findNonInsiders(const QRect &domain, QList<QRect> &source);
+ static QList<QRect> findMaxOverlappers(const QRect &domain, const QList<QRect> &source);
};
} // namespace QMdi
@@ -149,9 +151,9 @@ public:
#endif
QMdiAreaTabBar *tabBar;
QList<QMdi::Rearranger *> pendingRearrangements;
- QVector< QPointer<QMdiSubWindow> > pendingPlacements;
- QVector< QPointer<QMdiSubWindow> > childWindows;
- QVector<int> indicesToActivatedChildren;
+ QList<QPointer<QMdiSubWindow>> pendingPlacements;
+ QList<QPointer<QMdiSubWindow>> childWindows;
+ QList<int> indicesToActivatedChildren;
QPointer<QMdiSubWindow> active;
QPointer<QMdiSubWindow> aboutToBecomeActive;
QBrush background;
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 0aed6edfd7..96945fe756 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -121,9 +121,9 @@ class QTornOffMenu : public QMenu
q->setFixedSize(size);
}
- QVector<QPointer<QWidget> > calcCausedStack() const override { return causedStack; }
+ QList<QPointer<QWidget>> calcCausedStack() const override { return causedStack; }
QPointer<QMenu> causedMenu;
- QVector<QPointer<QWidget> > causedStack;
+ QList<QPointer<QWidget>> causedStack;
bool initialized;
};
@@ -334,9 +334,9 @@ QRect QMenuPrivate::popupGeometry(int screen) const
: QDesktopWidgetPrivate::availableGeometry(screen);
}
-QVector<QPointer<QWidget> > QMenuPrivate::calcCausedStack() const
+QList<QPointer<QWidget>> QMenuPrivate::calcCausedStack() const
{
- QVector<QPointer<QWidget> > ret;
+ QList<QPointer<QWidget>> ret;
for(QWidget *widget = causedPopup.widget; widget; ) {
ret.append(widget);
if (QTornOffMenu *qtmenu = qobject_cast<QTornOffMenu*>(widget))
@@ -1387,7 +1387,8 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e)
return false;
}
-void QMenuPrivate::activateCausedStack(const QVector<QPointer<QWidget> > &causedStack, QAction *action, QAction::ActionEvent action_e, bool self)
+void QMenuPrivate::activateCausedStack(const QList<QPointer<QWidget>> &causedStack, QAction *action,
+ QAction::ActionEvent action_e, bool self)
{
QBoolBlocker guard(activationRecursionGuard);
if(self)
@@ -1435,7 +1436,7 @@ void QMenuPrivate::activateAction(QAction *action, QAction::ActionEvent action_e
/* I have to save the caused stack here because it will be undone after popup execution (ie in the hide).
Then I iterate over the list to actually send the events. --Sam
*/
- const QVector<QPointer<QWidget> > causedStack = calcCausedStack();
+ const QList<QPointer<QWidget>> causedStack = calcCausedStack();
if (action_e == QAction::Trigger) {
#if QT_CONFIG(whatsthis)
if (!inWhatsThisMode)
@@ -1497,7 +1498,7 @@ void QMenuPrivate::_q_actionTriggered()
if (!activationRecursionGuard && actionGuard) {
//in case the action has not been activated by the mouse
//we check the parent hierarchy
- QVector< QPointer<QWidget> > list;
+ QList<QPointer<QWidget>> list;
for(QWidget *widget = q->parentWidget(); widget; ) {
if (qobject_cast<QMenu*>(widget)
#if QT_CONFIG(menubar)
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index 3e49f0780d..4814fcaad9 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -348,7 +348,7 @@ public:
//item calculations
QRect actionRect(QAction *) const;
- mutable QVector<QRect> actionRects;
+ mutable QList<QRect> actionRects;
mutable QHash<QAction *, QWidget *> widgetItems;
void updateActionRects() const;
void updateActionRects(const QRect &screen) const;
@@ -437,7 +437,7 @@ public:
QPointer<QWidget> widget;
QPointer<QAction> action;
};
- virtual QVector<QPointer<QWidget> > calcCausedStack() const;
+ virtual QList<QPointer<QWidget>> calcCausedStack() const;
QMenuCaused causedPopup;
void hideUpToMenuBar();
void hideMenu(QMenu *menu);
@@ -462,7 +462,8 @@ public:
//firing of events
void activateAction(QAction *, QAction::ActionEvent, bool self=true);
- void activateCausedStack(const QVector<QPointer<QWidget> > &, QAction *, QAction::ActionEvent, bool);
+ void activateCausedStack(const QList<QPointer<QWidget>> &, QAction *, QAction::ActionEvent,
+ bool);
void _q_actionTriggered();
void _q_actionHovered();
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 9cffdc4ac1..10c44e4203 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1383,7 +1383,7 @@ void QMenuBarPrivate::handleReparent()
// also a window (for shortcuts)
QWidget *newWindow = newParent ? newParent->window() : nullptr;
- QVector<QPointer<QWidget> > newParents;
+ QList<QPointer<QWidget>> newParents;
// Remove event filters on ex-parents, keep them on still-parents
// The parents are always ordered in the vector
foreach (const QPointer<QWidget> &w, oldParents) {
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
index e3db16d190..20a69e0818 100644
--- a/src/widgets/widgets/qmenubar_p.h
+++ b/src/widgets/widgets/qmenubar_p.h
@@ -81,8 +81,8 @@ public:
//item calculations
uint itemsDirty : 1;
- QVector<int> shortcutIndexMap;
- mutable QVector<QRect> actionRects;
+ QList<int> shortcutIndexMap;
+ mutable QList<QRect> actionRects;
void calcActionRects(int max_width, int start) const;
QRect actionRect(QAction *) const;
void updateGeometries();
@@ -124,7 +124,7 @@ public:
// reparenting
void handleReparent();
- QVector<QPointer<QWidget> > oldParents;
+ QList<QPointer<QWidget>> oldParents;
QList<QAction*> hiddenActions;
//default action
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index fb90667915..68be945f46 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -1985,8 +1985,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e)
fillBackground(&painter, contentsRect, bg);
}
-
- QVector<QTextLayout::FormatRange> selections;
+ QList<QTextLayout::FormatRange> selections;
int blpos = block.position();
int bllen = block.length();
for (int i = 0; i < context.selections.size(); ++i) {
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index a91fcda446..d80d211051 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -53,7 +53,6 @@
#include "qstyleoption.h"
#include "qtextstream.h"
#include "qvarlengtharray.h"
-#include "qvector.h"
#include "private/qlayoutengine_p.h"
#include "private/qsplitter_p.h"
#include "qtimer.h"
@@ -484,7 +483,7 @@ void QSplitterPrivate::doResize()
Q_Q(QSplitter);
QRect r = q->contentsRect();
int n = list.count();
- QVector<QLayoutStruct> a(n*2);
+ QList<QLayoutStruct> a(n * 2);
int i;
bool noStretchFactorsSet = true;
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index a3914dccfe..149fbefd9d 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -467,7 +467,7 @@ void QTabBarPrivate::layoutTabs()
int hiddenTabs = 0;
Qt::Alignment tabAlignment = Qt::Alignment(q->style()->styleHint(QStyle::SH_TabBar_Alignment, nullptr, q));
- QVector<QLayoutStruct> tabChain(tabList.count() + 2);
+ QList<QLayoutStruct> tabChain(tabList.count() + 2);
// We put an empty item at the front and back and set its expansive attribute
// depending on tabAlignment and expanding.
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
index 5df95a3038..336b746144 100644
--- a/src/widgets/widgets/qtoolbararealayout_p.h
+++ b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -112,7 +112,7 @@ Q_DECLARE_TYPEINFO(QToolBarAreaLayoutItem, Q_PRIMITIVE_TYPE);
class QToolBarAreaLayoutLine
{
public:
- QToolBarAreaLayoutLine() {} // for QVector, don't use
+ QToolBarAreaLayoutLine() { } // for QList, don't use
QToolBarAreaLayoutLine(Qt::Orientation orientation);
QSize sizeHint() const;
@@ -124,7 +124,7 @@ public:
QRect rect;
Qt::Orientation o;
- QVector<QToolBarAreaLayoutItem> toolBarItems;
+ QList<QToolBarAreaLayoutItem> toolBarItems;
};
Q_DECLARE_TYPEINFO(QToolBarAreaLayoutLine, Q_MOVABLE_TYPE);
@@ -151,7 +151,7 @@ public:
QRect itemRect(const QList<int> &path) const;
int distance(const QPoint &pos) const;
- QVector<QToolBarAreaLayoutLine> lines;
+ QList<QToolBarAreaLayoutLine> lines;
QRect rect;
Qt::Orientation o;
QInternal::DockPosition dockPos;
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index e1c0df31d1..3d1ed5dedf 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -282,7 +282,7 @@ void QToolBarLayout::updateGeomArray() const
that->expanding = false;
that->empty = false;
- QVector<QLayoutStruct> a(items.count() + 1); // + 1 for the stretch
+ QList<QLayoutStruct> a(items.count() + 1); // + 1 for the stretch
int count = 0;
for (int i = 0; i < items.count(); ++i) {
@@ -468,7 +468,7 @@ bool QToolBarLayout::layoutActions(const QSize &size)
int rowPos = perp(o, rect.topLeft()) + perp(o, QSize(margins.top(), margins.left()));
int i = 0;
while (i < items.count()) {
- QVector<QLayoutStruct> a = geomArray;
+ QList<QLayoutStruct> a = geomArray;
int start = i;
int size = 0;
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
index 13763840e2..a8535d1a9b 100644
--- a/src/widgets/widgets/qtoolbarlayout_p.h
+++ b/src/widgets/widgets/qtoolbarlayout_p.h
@@ -54,7 +54,7 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <QtWidgets/qlayout.h>
#include <private/qlayoutengine_p.h>
-#include <QVector>
+#include <QList>
QT_REQUIRE_CONFIG(toolbar);
@@ -118,7 +118,7 @@ private:
QList<QToolBarItem*> items;
QSize hint, minSize;
bool dirty, expanding, empty, expandFlag;
- QVector<QLayoutStruct> geomArray;
+ QList<QLayoutStruct> geomArray;
QRect handRect;
QToolBarExtension *extension;
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 79b36d0a8d..3fb419c7a5 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -578,7 +578,7 @@ void QWidgetLineControl::processInputMethodEvent(QInputMethodEvent *event)
const int oldPreeditCursor = m_preeditCursor;
m_preeditCursor = event->preeditString().length();
m_hideCursor = false;
- QVector<QTextLayout::FormatRange> formats;
+ QList<QTextLayout::FormatRange> formats;
formats.reserve(event->attributes().size());
for (int i = 0; i < event->attributes().size(); ++i) {
const QInputMethodEvent::Attribute &a = event->attributes().at(i);
@@ -627,7 +627,7 @@ void QWidgetLineControl::processInputMethodEvent(QInputMethodEvent *event)
*/
void QWidgetLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &clip, int flags)
{
- QVector<QTextLayout::FormatRange> selections;
+ QList<QTextLayout::FormatRange> selections;
if (flags & DrawSelections) {
QTextLayout::FormatRange o;
if (m_selstart < m_selend) {
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index bfcbd6cd18..7a175b4b06 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -2067,7 +2067,7 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
QTextLayout *layout = block.layout();
if (isGettingInput)
layout->setPreeditArea(cursor.position() - block.position(), e->preeditString());
- QVector<QTextLayout::FormatRange> overrides;
+ QList<QTextLayout::FormatRange> overrides;
overrides.reserve(e->attributes().size());
const int oldPreeditCursor = preeditCursor;
preeditCursor = e->preeditString().length();
@@ -2087,9 +2087,9 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
o.format = f;
// Make sure list is sorted by start index
- QVector<QTextLayout::FormatRange>::iterator it = overrides.end();
+ QList<QTextLayout::FormatRange>::iterator it = overrides.end();
while (it != overrides.begin()) {
- QVector<QTextLayout::FormatRange>::iterator previous = it - 1;
+ QList<QTextLayout::FormatRange>::iterator previous = it - 1;
if (o.start >= previous->start) {
overrides.insert(it, o);
break;
@@ -2107,7 +2107,7 @@ void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e)
int start = cursor.position() - block.position();
int end = start + e->preeditString().length();
- QVector<QTextLayout::FormatRange>::iterator it = overrides.begin();
+ QList<QTextLayout::FormatRange>::iterator it = overrides.begin();
while (it != overrides.end()) {
QTextLayout::FormatRange range = *it;
int rangeStart = range.start;
diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h
index 7304b15106..cc4f867e8e 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h
@@ -217,7 +217,7 @@ public:
int preeditCursor;
bool hideCursor; // used to hide the cursor in the preedit area
- QVector<QAbstractTextDocumentLayout::Selection> extraSelections;
+ QList<QAbstractTextDocumentLayout::Selection> extraSelections;
QPalette palette;
bool hasFocus;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 08:27:41 +0000