diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-04-27 09:41:18 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-02 11:06:11 +0000 |
commit | 804261e2808878baf657efacb0fb42408853629e (patch) | |
tree | 475baaa5649b89875c32e37cd00d934a74abb708 /src/designer/src/lib/shared/qdesigner_promotiondialog.cpp | |
parent | 9d65b056d92902917fe8d4aebda3a2e10b99ca58 (diff) |
Qt Designer: Refactor PromotionModel.
The model used a QVariantList as user data storing the widget database
index and the bool 'referenced' flag. Replace that by a struct ModelData.
Task-number: QTBUG-52963
Change-Id: Ieb9fa4efb5705367f71139e99768794240e6ca4a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_promotiondialog.cpp')
-rw-r--r-- | src/designer/src/lib/shared/qdesigner_promotiondialog.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index c0997a058..193f39565 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -360,12 +360,11 @@ namespace qdesigner_internal { const QModelIndexList indexes = selected.indexes(); if (indexes.empty()) return 0; - - bool referenced; - QDesignerWidgetDataBaseItemInterface *dbItem = m_model->databaseItemAt(indexes.front(), &referenced); + const PromotionModel::ModelData data = m_model->modelData(indexes.constFirst()); + QDesignerWidgetDataBaseItemInterface *dbItem = data.promotedItem; if (dbItem) { - if (referenced) + if (data.referenced) flags |= Referenced; // In choose mode, can we promote to the class? if (m_mode == ModeEditChooseClass && dbItem && dbItem->isPromoted() && dbItem->extends() == m_promotableWidgetClassName) |