From 70f0541e06a5e5b2448554f1b124159a30dbafe8 Mon Sep 17 00:00:00 2001
From: Simon De Backer <simondebacker@msn.com>
Date: Thu, 28 May 2020 18:07:52 +0200
Subject: [PATCH] fix deprecated warning qVariantFromValue

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).
---
 sources/genericpanel.cpp                  | 8 ++++----
 sources/titleblock/templatecellwidget.cpp | 2 +-
 sources/titleblockcell.cpp                | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sources/genericpanel.cpp b/sources/genericpanel.cpp
index 80a5fd0b6..c0920a806 100644
--- a/sources/genericpanel.cpp
+++ b/sources/genericpanel.cpp
@@ -155,7 +155,7 @@ QTreeWidgetItem *GenericPanel::updateProjectItem(QTreeWidgetItem *project_qtwi,
 	if (!project_qtwi || !project) return(nullptr);
 	
 	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);
 		
 		connect(
@@ -317,7 +317,7 @@ QTreeWidgetItem *GenericPanel::updateDiagramItem(QTreeWidgetItem *diagram_qtwi,
 	}
 	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);
 		
 		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());
 	
 	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);
 	}
 	
@@ -485,7 +485,7 @@ QTreeWidgetItem *GenericPanel::updateTemplateItem(QTreeWidgetItem *tb_template_q
 	}
 	
 	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);
 	}
 	return(updateItem(tb_template_qtwi, options, freshly_created));
diff --git a/sources/titleblock/templatecellwidget.cpp b/sources/titleblock/templatecellwidget.cpp
index 6dccce7da..c4592c8b1 100644
--- a/sources/titleblock/templatecellwidget.cpp
+++ b/sources/titleblock/templatecellwidget.cpp
@@ -389,7 +389,7 @@ void TitleBlockTemplateCellWidget::editTranslatableValue(NamesList &names, const
 	nlw_->setClipboardValue(QETInformation::titleblockTranslatedKeyHashVar());
 	
 	if(dialog_.exec() == QDialog::Accepted) {
-		emitModification(attribute, qVariantFromValue(nlw_->names()));
+		emitModification(attribute, QVariant::fromValue(nlw_->names()));
 	}
 }
 
diff --git a/sources/titleblockcell.cpp b/sources/titleblockcell.cpp
index 9f22a1f7d..ebce9714f 100644
--- a/sources/titleblockcell.cpp
+++ b/sources/titleblockcell.cpp
@@ -86,11 +86,11 @@ QVariant TitleBlockCell::attribute(const QString &attribute) {
 	} else if (attribute == "logo") {
 		return(logo_reference);
 	} else if (attribute == "label") {
-		return(qVariantFromValue(label));
+		return(QVariant::fromValue(label));
 	} else if (attribute == "displaylabel") {
 		return(display_label);
 	} else if (attribute == "value") {
-		return(qVariantFromValue(value));
+		return(QVariant::fromValue(value));
 	} else if (attribute == "alignment") {
 		return(alignment);
 	} else if (attribute == "fontsize") {