kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix deprecated warning qVariantFromValue

Browse Source 
This function is obsolete.
Note:
This function was provided as a workaround for MSVC 6
which did not support member template functions.
It is advised to use the other form in new code.

This function is equivalent to QVariant::fromValue(value).
This commit is contained in:
Simon De Backer
2020-05-28 18:07:52 +02:00
committed by Laurent Trinques
parent 86a4701d2b
commit 70f0541e06
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/genericpanel.cpp
View File

@@ -155,7 +155,7 @@ QTreeWidgetItem *GenericPanel::updateProjectItem(QTreeWidgetItem *project_qtwi,
if (!project_qtwi || !project) return(nullptr); if (!project_qtwi || !project) return(nullptr);
if (freshly_created) { if (freshly_created) {
project_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(project)); project_qtwi -> setData(0, GenericPanel::Item, QVariant::fromValue(project));
projects_.insert(project, project_qtwi); projects_.insert(project, project_qtwi);
connect( connect(
@@ -317,7 +317,7 @@ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi,
} }
if (freshly_created) if (freshly_created)
{ {
diagram_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(diagram)); diagram_qtwi -> setData(0, GenericPanel::Item, QVariant::fromValue(diagram));
diagrams_.insert(diagram, diagram_qtwi); diagrams_.insert(diagram, diagram_qtwi);
connect(diagram, &Diagram::diagramTitleChanged, this, &GenericPanel::diagramTitleChanged); connect(diagram, &Diagram::diagramTitleChanged, this, &GenericPanel::diagramTitleChanged);
@@ -389,7 +389,7 @@ QTreeWidgetItem *GenericPanel::updateTemplatesCollectionItem(QTreeWidgetItem *tb
tbt_collection_qtwi -> setToolTip(0, tbt_collection -> location().toString()); tbt_collection_qtwi -> setToolTip(0, tbt_collection -> location().toString());
if (freshly_created) { if (freshly_created) {
tbt_collection_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(tbt_collection -> location())); tbt_collection_qtwi -> setData(0, GenericPanel::Item, QVariant::fromValue(tbt_collection -> location()));
tb_templates_.insert(tbt_collection -> location(), tbt_collection_qtwi); tb_templates_.insert(tbt_collection -> location(), tbt_collection_qtwi);
} }
@@ -485,7 +485,7 @@ QTreeWidgetItem *GenericPanel::updateTemplateItem(QTreeWidgetItem *tb_template_q
} }
if (freshly_created) { if (freshly_created) {
tb_template_qtwi -> setData(0, GenericPanel::Item, qVariantFromValue(tb_template)); tb_template_qtwi -> setData(0, GenericPanel::Item, QVariant::fromValue(tb_template));
tb_templates_.insert(tb_template, tb_template_qtwi); tb_templates_.insert(tb_template, tb_template_qtwi);
} }
return(updateItem(tb_template_qtwi, options, freshly_created)); return(updateItem(tb_template_qtwi, options, freshly_created));

2
sources/titleblock/templatecellwidget.cpp
View File

@@ -389,7 +389,7 @@ void TitleBlockTemplateCellWidget::editTranslatableValue(NamesList &names, const
nlw_->setClipboardValue(QETInformation::titleblockTranslatedKeyHashVar()); nlw_->setClipboardValue(QETInformation::titleblockTranslatedKeyHashVar());
if(dialog_.exec() == QDialog::Accepted) { if(dialog_.exec() == QDialog::Accepted) {
emitModification(attribute, qVariantFromValue(nlw_->names())); emitModification(attribute, QVariant::fromValue(nlw_->names()));
} }
} }

4
sources/titleblockcell.cpp
View File

@@ -86,11 +86,11 @@ QVariant TitleBlockCell::attribute(const QString &attribute) {
} else if (attribute == "logo") { } else if (attribute == "logo") {
return(logo_reference); return(logo_reference);
} else if (attribute == "label") { } else if (attribute == "label") {
return(qVariantFromValue(label)); return(QVariant::fromValue(label));
} else if (attribute == "displaylabel") { } else if (attribute == "displaylabel") {
return(display_label); return(display_label);
} else if (attribute == "value") { } else if (attribute == "value") {
return(qVariantFromValue(value)); return(QVariant::fromValue(value));
} else if (attribute == "alignment") { } else if (attribute == "alignment") {
return(alignment); return(alignment);
} else if (attribute == "fontsize") { } else if (attribute == "fontsize") {