Skip to content

Commit 6728d79

Browse files
AhmadSamirAhmadSamir
committed
tests/auto/widgets/*: port away from QPair
Pick-to: 6.10 6.8 6.5 Task-number: QTBUG-115841 Change-Id: Iecfa2232f9e555ed4094f2303b672bf483d9f440 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
1 parent f033292 commit 6728d79

File tree

5 files changed

+75
-75
lines changed

5 files changed

+75
-75
lines changed

‎tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ void tst_QTableView::headerSections()
702702
QCOMPARE(view.columnWidth(column), columnWidth);
703703
}
704704

705-
typedef QPair<int,int> IntPair;
705+
using IntPair = std::pair<int,int>;
706706

707707
void tst_QTableView::moveCursor_data()
708708
{

‎tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private slots:
9595
std::unique_ptr<QTableWidget> testWidget;
9696
};
9797

98-
using IntPair = QPair<int, int>;
98+
using IntPair = std::pair<int, int>;
9999
using IntList = QList<int>;
100100
using IntIntList = QList<IntPair>;
101101

@@ -1815,7 +1815,7 @@ void tst_QTableWidget::search()
18151815
Qt::Key key;
18161816
QString text;
18171817
};
1818-
auto checkSeries = [](TestTableWidget &tw, const QList<QPair<KeyPress, int>> &series) {
1818+
auto checkSeries = [](TestTableWidget &tw, const QList<std::pair<KeyPress, int>> &series) {
18191819
for (const auto &p : series) {
18201820
QKeyEvent e(QEvent::KeyPress, p.first.key, Qt::NoModifier, p.first.text);
18211821
tw.keyPressEvent(&e);

‎tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7678,7 +7678,7 @@ class EventRecorder : public QObject
76787678
Q_OBJECT
76797679

76807680
public:
7681-
typedef QPair<QWidget *, QEvent::Type> WidgetEventTypePair;
7681+
using WidgetEventTypePair = std::pair<QWidget *, QEvent::Type>;
76827682
typedef QList<WidgetEventTypePair> EventList;
76837683

76847684
using QObject::QObject;
@@ -7705,7 +7705,7 @@ class EventRecorder : public QObject
77057705
case QEvent::InputMethodQuery:
77067706
break;
77077707
default:
7708-
events.append(qMakePair(widget, event->type()));
7708+
events.append(std::pair(widget, event->type()));
77097709
break;
77107710
}
77117711
}
@@ -7763,9 +7763,9 @@ void tst_QWidget::childEvents()
77637763

77647764
expected =
77657765
EventRecorder::EventList()
7766-
<< qMakePair(&widget, QEvent::PolishRequest)
7767-
<< qMakePair(&widget, QEvent::Polish)
7768-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1));
7766+
<< std::pair(&widget, QEvent::PolishRequest)
7767+
<< std::pair(&widget, QEvent::Polish)
7768+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1));
77697769
QVERIFY2(spy.eventList() == expected,
77707770
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
77717771
}
@@ -7782,17 +7782,17 @@ void tst_QWidget::childEvents()
77827782
widget.showNormal();
77837783
expected =
77847784
EventRecorder::EventList()
7785-
<< qMakePair(&widget, QEvent::Polish)
7786-
<< qMakePair(&widget, QEvent::PlatformSurface)
7787-
<< qMakePair(&widget, QEvent::WinIdChange)
7788-
<< qMakePair(&widget, QEvent::WindowIconChange)
7789-
<< qMakePair(&widget, QEvent::Move)
7790-
<< qMakePair(&widget, QEvent::Resize)
7791-
<< qMakePair(&widget, QEvent::Show)
7785+
<< std::pair(&widget, QEvent::Polish)
7786+
<< std::pair(&widget, QEvent::PlatformSurface)
7787+
<< std::pair(&widget, QEvent::WinIdChange)
7788+
<< std::pair(&widget, QEvent::WindowIconChange)
7789+
<< std::pair(&widget, QEvent::Move)
7790+
<< std::pair(&widget, QEvent::Resize)
7791+
<< std::pair(&widget, QEvent::Show)
77927792
#ifndef Q_OS_ANDROID
7793-
<< qMakePair(&widget, QEvent::CursorChange)
7793+
<< std::pair(&widget, QEvent::CursorChange)
77947794
#endif
7795-
<< qMakePair(&widget, QEvent::ShowToParent);
7795+
<< std::pair(&widget, QEvent::ShowToParent);
77967796

77977797
QVERIFY2(spy.eventList() == expected,
77987798
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7801,10 +7801,10 @@ void tst_QWidget::childEvents()
78017801
QCoreApplication::sendPostedEvents();
78027802
expected =
78037803
EventRecorder::EventList()
7804-
<< qMakePair(&widget, QEvent::PolishRequest)
7805-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1))
7806-
<< qMakePair(&widget, QEvent::UpdateLater)
7807-
<< qMakePair(&widget, QEvent::UpdateRequest);
7804+
<< std::pair(&widget, QEvent::PolishRequest)
7805+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1))
7806+
<< std::pair(&widget, QEvent::UpdateLater)
7807+
<< std::pair(&widget, QEvent::UpdateRequest);
78087808

78097809
QVERIFY2(spy.eventList() == expected,
78107810
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7827,21 +7827,21 @@ void tst_QWidget::childEvents()
78277827

78287828
expected =
78297829
EventRecorder::EventList()
7830-
<< qMakePair(&widget, QEvent::ChildAdded)
7831-
<< qMakePair(&widget, QEvent::ChildAdded);
7830+
<< std::pair(&widget, QEvent::ChildAdded)
7831+
<< std::pair(&widget, QEvent::ChildAdded);
78327832
QVERIFY2(spy.eventList() == expected,
78337833
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
78347834
spy.clear();
78357835

78367836
QCoreApplication::sendPostedEvents();
78377837
expected =
78387838
EventRecorder::EventList()
7839-
<< qMakePair(&widget, QEvent::PolishRequest)
7840-
<< qMakePair(&widget, QEvent::Polish)
7841-
<< qMakePair(&widget, QEvent::ChildPolished)
7842-
<< qMakePair(&widget, QEvent::ChildPolished)
7843-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1))
7844-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 2));
7839+
<< std::pair(&widget, QEvent::PolishRequest)
7840+
<< std::pair(&widget, QEvent::Polish)
7841+
<< std::pair(&widget, QEvent::ChildPolished)
7842+
<< std::pair(&widget, QEvent::ChildPolished)
7843+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1))
7844+
<< std::pair(&widget, QEvent::Type(QEvent::User + 2));
78457845
QVERIFY2(spy.eventList() == expected,
78467846
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
78477847
}
@@ -7863,27 +7863,27 @@ void tst_QWidget::childEvents()
78637863

78647864
expected =
78657865
EventRecorder::EventList()
7866-
<< qMakePair(&widget, QEvent::ChildAdded)
7867-
<< qMakePair(&widget, QEvent::ChildAdded);
7866+
<< std::pair(&widget, QEvent::ChildAdded)
7867+
<< std::pair(&widget, QEvent::ChildAdded);
78687868
QCOMPARE(spy.eventList(), expected);
78697869
spy.clear();
78707870

78717871
widget.showNormal();
78727872
expected =
78737873
EventRecorder::EventList()
7874-
<< qMakePair(&widget, QEvent::Polish)
7875-
<< qMakePair(&widget, QEvent::ChildPolished)
7876-
<< qMakePair(&widget, QEvent::ChildPolished)
7877-
<< qMakePair(&widget, QEvent::PlatformSurface)
7878-
<< qMakePair(&widget, QEvent::WinIdChange)
7879-
<< qMakePair(&widget, QEvent::WindowIconChange)
7880-
<< qMakePair(&widget, QEvent::Move)
7881-
<< qMakePair(&widget, QEvent::Resize)
7882-
<< qMakePair(&widget, QEvent::Show)
7874+
<< std::pair(&widget, QEvent::Polish)
7875+
<< std::pair(&widget, QEvent::ChildPolished)
7876+
<< std::pair(&widget, QEvent::ChildPolished)
7877+
<< std::pair(&widget, QEvent::PlatformSurface)
7878+
<< std::pair(&widget, QEvent::WinIdChange)
7879+
<< std::pair(&widget, QEvent::WindowIconChange)
7880+
<< std::pair(&widget, QEvent::Move)
7881+
<< std::pair(&widget, QEvent::Resize)
7882+
<< std::pair(&widget, QEvent::Show)
78837883
#ifndef Q_OS_ANDROID
7884-
<< qMakePair(&widget, QEvent::CursorChange)
7884+
<< std::pair(&widget, QEvent::CursorChange)
78857885
#endif
7886-
<< qMakePair(&widget, QEvent::ShowToParent);
7886+
<< std::pair(&widget, QEvent::ShowToParent);
78877887

78887888
QVERIFY2(spy.eventList() == expected,
78897889
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7892,11 +7892,11 @@ void tst_QWidget::childEvents()
78927892
QCoreApplication::sendPostedEvents();
78937893
expected =
78947894
EventRecorder::EventList()
7895-
<< qMakePair(&widget, QEvent::PolishRequest)
7896-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1))
7897-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 2))
7898-
<< qMakePair(&widget, QEvent::UpdateLater)
7899-
<< qMakePair(&widget, QEvent::UpdateRequest);
7895+
<< std::pair(&widget, QEvent::PolishRequest)
7896+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1))
7897+
<< std::pair(&widget, QEvent::Type(QEvent::User + 2))
7898+
<< std::pair(&widget, QEvent::UpdateLater)
7899+
<< std::pair(&widget, QEvent::UpdateRequest);
79007900

79017901
QVERIFY2(spy.eventList() == expected,
79027902
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7920,20 +7920,20 @@ void tst_QWidget::childEvents()
79207920

79217921
expected =
79227922
EventRecorder::EventList()
7923-
<< qMakePair(&widget, QEvent::ChildAdded)
7924-
<< qMakePair(&widget, QEvent::ChildAdded)
7925-
<< qMakePair(&widget, QEvent::ChildRemoved);
7923+
<< std::pair(&widget, QEvent::ChildAdded)
7924+
<< std::pair(&widget, QEvent::ChildAdded)
7925+
<< std::pair(&widget, QEvent::ChildRemoved);
79267926
QCOMPARE(spy.eventList(), expected);
79277927
spy.clear();
79287928

79297929
QCoreApplication::sendPostedEvents();
79307930
expected =
79317931
EventRecorder::EventList()
7932-
<< qMakePair(&widget, QEvent::PolishRequest)
7933-
<< qMakePair(&widget, QEvent::Polish)
7934-
<< qMakePair(&widget, QEvent::ChildPolished)
7935-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1))
7936-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 2));
7932+
<< std::pair(&widget, QEvent::PolishRequest)
7933+
<< std::pair(&widget, QEvent::Polish)
7934+
<< std::pair(&widget, QEvent::ChildPolished)
7935+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1))
7936+
<< std::pair(&widget, QEvent::Type(QEvent::User + 2));
79377937

79387938
QVERIFY2(spy.eventList() == expected,
79397939
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7957,27 +7957,27 @@ void tst_QWidget::childEvents()
79577957

79587958
expected =
79597959
EventRecorder::EventList()
7960-
<< qMakePair(&widget, QEvent::ChildAdded)
7961-
<< qMakePair(&widget, QEvent::ChildAdded)
7962-
<< qMakePair(&widget, QEvent::ChildRemoved);
7960+
<< std::pair(&widget, QEvent::ChildAdded)
7961+
<< std::pair(&widget, QEvent::ChildAdded)
7962+
<< std::pair(&widget, QEvent::ChildRemoved);
79637963
QCOMPARE(spy.eventList(), expected);
79647964
spy.clear();
79657965

79667966
widget.showNormal();
79677967
expected =
79687968
EventRecorder::EventList()
7969-
<< qMakePair(&widget, QEvent::Polish)
7970-
<< qMakePair(&widget, QEvent::ChildPolished)
7971-
<< qMakePair(&widget, QEvent::PlatformSurface)
7972-
<< qMakePair(&widget, QEvent::WinIdChange)
7973-
<< qMakePair(&widget, QEvent::WindowIconChange)
7974-
<< qMakePair(&widget, QEvent::Move)
7975-
<< qMakePair(&widget, QEvent::Resize)
7976-
<< qMakePair(&widget, QEvent::Show)
7969+
<< std::pair(&widget, QEvent::Polish)
7970+
<< std::pair(&widget, QEvent::ChildPolished)
7971+
<< std::pair(&widget, QEvent::PlatformSurface)
7972+
<< std::pair(&widget, QEvent::WinIdChange)
7973+
<< std::pair(&widget, QEvent::WindowIconChange)
7974+
<< std::pair(&widget, QEvent::Move)
7975+
<< std::pair(&widget, QEvent::Resize)
7976+
<< std::pair(&widget, QEvent::Show)
79777977
#ifndef Q_OS_ANDROID
7978-
<< qMakePair(&widget, QEvent::CursorChange)
7978+
<< std::pair(&widget, QEvent::CursorChange)
79797979
#endif
7980-
<< qMakePair(&widget, QEvent::ShowToParent);
7980+
<< std::pair(&widget, QEvent::ShowToParent);
79817981

79827982
QVERIFY2(spy.eventList() == expected,
79837983
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());
@@ -7986,11 +7986,11 @@ void tst_QWidget::childEvents()
79867986
QCoreApplication::sendPostedEvents();
79877987
expected =
79887988
EventRecorder::EventList()
7989-
<< qMakePair(&widget, QEvent::PolishRequest)
7990-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 1))
7991-
<< qMakePair(&widget, QEvent::Type(QEvent::User + 2))
7992-
<< qMakePair(&widget, QEvent::UpdateLater)
7993-
<< qMakePair(&widget, QEvent::UpdateRequest);
7989+
<< std::pair(&widget, QEvent::PolishRequest)
7990+
<< std::pair(&widget, QEvent::Type(QEvent::User + 1))
7991+
<< std::pair(&widget, QEvent::Type(QEvent::User + 2))
7992+
<< std::pair(&widget, QEvent::UpdateLater)
7993+
<< std::pair(&widget, QEvent::UpdateRequest);
79947994

79957995
QVERIFY2(spy.eventList() == expected,
79967996
EventRecorder::msgEventListMismatch(expected, spy.eventList()).constData());

‎tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@ void tst_QWidget_window::tst_showhide_count()
11991199
return QObject::eventFilter(receiver, event);
12001200
}
12011201
private:
1202-
using Entry = QPair<QWidget*, QEvent::Type>;
1202+
using Entry = std::pair<QWidget*, QEvent::Type>;
12031203
QHash<Entry, int> counter;
12041204
};
12051205

‎tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3824,7 +3824,7 @@ void tst_QDateTimeEdit::setLocaleOnCalendarWidget()
38243824

38253825
#ifdef QT_BUILD_INTERNAL
38263826

3827-
typedef QPair<Qt::Key, Qt::KeyboardModifier> KeyPair;
3827+
using KeyPair = std::pair<Qt::Key, Qt::KeyboardModifier>;
38283828
typedef QList<KeyPair> KeyPairList;
38293829

38303830
Q_DECLARE_METATYPE(KeyPair)

0 commit comments

Comments
 (0)