Skip to content

Commit 67fe5e4

Browse files
committed
Fix ambiguity in inspector.cpp.
`makeItem()` exists for `const QString &` and `const std::any &` which resulted in the compiler being unsure what to call. Signed-off-by: Henner Zeller <[email protected]>
1 parent 27ac731 commit 67fe5e4

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/gui/src/inspector.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@
1818
#include <QTextDocument>
1919
#include <QVariant>
2020
#include <QWidget>
21-
#include <algorithm>
2221
#include <any>
2322
#include <cmath>
24-
#include <iterator>
25-
#include <map>
26-
#include <set>
2723
#include <stdexcept>
2824
#include <string>
29-
#include <utility>
30-
#include <vector>
3125

3226
#include "gui/gui.h"
3327
#include "gui_utils.h"
@@ -194,7 +188,7 @@ QStandardItem* SelectedItemModel::makeList(QStandardItem* name_item,
194188
name_item->appendRow({index_item, selected_item});
195189
}
196190

197-
return makeItem(QString::number(index) + " items");
191+
return makeItem(QString(QString::number(index) + " items"));
198192
}
199193

200194
template <typename Iterator>
@@ -207,7 +201,7 @@ QStandardItem* SelectedItemModel::makePropertyList(QStandardItem* name_item,
207201
name_item->appendRow({makeItem(name, true), makeItem(value)});
208202
}
209203

210-
return makeItem(QString::number(name_item->rowCount()) + " items");
204+
return makeItem(QString(QString::number(name_item->rowCount()) + " items"));
211205
}
212206

213207
QStandardItem* SelectedItemModel::makePropertyTable(QStandardItem* name_item,
@@ -250,7 +244,7 @@ QStandardItem* SelectedItemModel::makePropertyTable(QStandardItem* name_item,
250244

251245
name_item->appendRow({nullptr, table_item});
252246

253-
return makeItem(QString::number(rows * columns) + " items");
247+
return makeItem(QString(QString::number(rows * columns) + " items"));
254248
}
255249

256250
void SelectedItemModel::makeItemEditor(const std::string& name,

0 commit comments

Comments
 (0)