mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2025-01-12 17:00:32 +08:00
fix more compile errors (QList::emplaceback/emplace_back() did not exist in Qt 5.15
This commit is contained in:
parent
5dcd73222b
commit
83c980384c
@ -292,7 +292,7 @@ JKQTPBaseKey::KeyLayoutDescription JKQTPBaseKey::getKeyLayout(JKQTPEnhancedPaint
|
|||||||
layout.columns.append(allItems);
|
layout.columns.append(allItems);
|
||||||
} else if (keyStyle().layout==JKQTPKeyLayoutOneRow || keyStyle().layout==JKQTPKeyLayoutMultiRow) {
|
} else if (keyStyle().layout==JKQTPKeyLayoutOneRow || keyStyle().layout==JKQTPKeyLayoutMultiRow) {
|
||||||
for (const auto& r: allItems.rows) {
|
for (const auto& r: allItems.rows) {
|
||||||
layout.columns.emplaceBack(r);
|
layout.columns.push_back(KeyColumnDescription(r));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -460,7 +460,7 @@ void JKQTPBaseKey::KeyLayoutDescription::redistributeOverRows(int rowCnt)
|
|||||||
|
|
||||||
int i=0;
|
int i=0;
|
||||||
for (int c=0; c<colCnt; c++) {
|
for (int c=0; c<colCnt; c++) {
|
||||||
columns.emplace_back();
|
columns.push_back(KeyColumnDescription());
|
||||||
}
|
}
|
||||||
for (int r=0; r<rowCnt; r++) {
|
for (int r=0; r<rowCnt; r++) {
|
||||||
for (int c=0; c<colCnt; c++) {
|
for (int c=0; c<colCnt; c++) {
|
||||||
@ -483,7 +483,7 @@ void JKQTPBaseKey::KeyLayoutDescription::redistributeOverColumns(int colCnt)
|
|||||||
columns.clear();
|
columns.clear();
|
||||||
int i=0;
|
int i=0;
|
||||||
for (int c=0; c<colCnt; c++) {
|
for (int c=0; c<colCnt; c++) {
|
||||||
columns.emplace_back();
|
columns.push_back(KeyColumnDescription());
|
||||||
for (int r=0; r<rowCnt; r++) {
|
for (int r=0; r<rowCnt; r++) {
|
||||||
if (i<itemCnt) columns[c].rows.append(items[i]);
|
if (i<itemCnt) columns[c].rows.append(items[i]);
|
||||||
i++;
|
i++;
|
||||||
|
Loading…
Reference in New Issue
Block a user