From 856119c5a43b4781b051b93a0713c152cfd99f85 Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 15 Apr 2022 13:27:34 +0200 Subject: Make it run with Qt6 This is a huge commit. Changes: * Obviously, make it compile * Make it run (only scarcely tested) * get rid of most of clang's warnings Let's see what surprises are in store... --- mappingtreeresultmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mappingtreeresultmodel.cpp') diff --git a/mappingtreeresultmodel.cpp b/mappingtreeresultmodel.cpp index e2ff75e..cb8d67c 100644 --- a/mappingtreeresultmodel.cpp +++ b/mappingtreeresultmodel.cpp @@ -112,7 +112,7 @@ void MappingTreeResultModel::removeItem(const QModelIndex &idx){ return; } SmTreeItem *curItem = static_cast(idx.internalPointer()); - MappingData rmData = mSourceModel->mappingDataFromItem(curItem); + const MappingData rmData = mSourceModel->mappingDataFromItem(curItem); beginResetModel(); int row = curItem->row(); SmTreeItem *parent = curItem->parent(); @@ -173,7 +173,7 @@ QList MappingTreeResultModel::columnValuesRecursive(SmTreeItem *parent for(int i = 0; i < parent->childCount(); ++i){ SmTreeItem *child = parent->child(i); QVariant value = child->data(column); - if(value.canConvert(QVariant::Int) && (value.toInt() != -1)){ + if(value.canConvert() && (value.toInt() != -1)){ retval << value; } retval << columnValuesRecursive(child, column); -- cgit v1.2.3-70-g09d2