Skip to content

Commit 626371a

Browse files
Quentin WeberLeonMatthesKDAB
Quentin Weber
authored andcommitted
replaced old generic qlist/qvector/qset headers where possible
1 parent dc1354d commit 626371a

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

crates/cxx-qt-lib/src/core/qcoreapplication.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod ffi {
1616
type QString = crate::QString;
1717
include!("cxx-qt-lib/qstringlist.h");
1818
type QStringList = crate::QStringList;
19-
include!("cxx-qt-lib/qvector.h");
19+
include!("cxx-qt-lib/qvector_QByteArray.h");
2020
type QVector_QByteArray = crate::QVector<QByteArray>;
2121

2222
include!("cxx-qt-lib/qcoreapplication.h");

crates/cxx-qt-lib/src/core/qstringlist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod ffi {
2222
include!("cxx-qt-lib/qstring.h");
2323
type QString = crate::QString;
2424

25-
include!("cxx-qt-lib/qlist.h");
25+
include!("cxx-qt-lib/qlist_QString.h");
2626
type QList_QString = crate::QList<QString>;
2727

2828
include!("cxx-qt-lib/qstringlist.h");

crates/cxx-qt-lib/src/core/qtimezone.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mod ffi {
4141
type QByteArray = crate::QByteArray;
4242
include!("cxx-qt-lib/qdatetime.h");
4343
type QDateTime = crate::QDateTime;
44-
include!("cxx-qt-lib/qlist.h");
44+
include!("cxx-qt-lib/qlist_QByteArray.h");
4545
type QList_QByteArray = crate::QList<crate::QByteArray>;
4646
include!("cxx-qt-lib/qstring.h");
4747
type QString = crate::QString;

crates/cxx-qt-lib/src/gui/qguiapplication.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod ffi {
1616
type QString = crate::QString;
1717
include!("cxx-qt-lib/qstringlist.h");
1818
type QStringList = crate::QStringList;
19-
include!("cxx-qt-lib/qvector.h");
19+
include!("cxx-qt-lib/qvector_QByteArray.h");
2020
type QVector_QByteArray = crate::QVector<QByteArray>;
2121
include!("cxx-qt-lib/qfont.h");
2222
type QFont = crate::QFont;

crates/cxx-qt-lib/src/gui/qpainter.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ mod ffi {
177177
type QPolygon = crate::QPolygon;
178178
include!("cxx-qt-lib/qregion.h");
179179
type QRegion = crate::QRegion;
180-
include!("cxx-qt-lib/qvector.h");
180+
include!("cxx-qt-lib/qvector_QLine.h");
181+
include!("cxx-qt-lib/qvector_QLineF.h");
181182
type QVector_QLine = crate::QVector<QLine>;
182183
type QVector_QLineF = crate::QVector<QLineF>;
183184

crates/cxx-qt-lib/src/gui/qpolygon.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod ffi {
1717
}
1818

1919
unsafe extern "C++" {
20-
include!("cxx-qt-lib/qvector.h");
20+
include!("cxx-qt-lib/qvector_QPoint.h");
2121
type QVector_QPoint = crate::QVector<QPoint>;
2222

2323
include!("cxx-qt-lib/qpoint.h");

crates/cxx-qt-lib/src/gui/qpolygonf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mod ffi {
1818
}
1919

2020
unsafe extern "C++" {
21-
include!("cxx-qt-lib/qvector.h");
21+
include!("cxx-qt-lib/qvector_QPointF.h");
2222
type QVector_QPointF = crate::QVector<QPointF>;
2323

2424
include!("cxx-qt-lib/qpointf.h");

0 commit comments

Comments
 (0)