[qet] qet/qet: [5023] Fix ftbfs for ubuntu 14.04

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 5023
Author:   blacksun
Date:     2017-08-22 19:24:51 +0200 (Tue, 22 Aug 2017)
Log Message:
-----------
Fix ftbfs for ubuntu 14.04

Modified Paths:
--------------
    trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp
    trunk/sources/ui/elementinfowidget.cpp
    trunk/sources/ui/linksingleelementwidget.cpp
    trunk/sources/ui/masterpropertieswidget.cpp

Modified: trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp	2017-08-16 14:32:34 UTC (rev 5022)
+++ trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp	2017-08-22 17:24:51 UTC (rev 5023)
@@ -135,7 +135,7 @@
 	if(m_text_from == ElementInfo)
 	{
 		setNoEditable(true);
-		connect(m_parent_element, &Element::elementInfoChange, this, &DynamicElementTextItem::elementInfoChanged);
+		connect(m_parent_element.data(), &Element::elementInfoChange, this, &DynamicElementTextItem::elementInfoChanged);
 	}
 	else {
 		setNoEditable(false);

Modified: trunk/sources/ui/elementinfowidget.cpp
===================================================================
--- trunk/sources/ui/elementinfowidget.cpp	2017-08-16 14:32:34 UTC (rev 5022)
+++ trunk/sources/ui/elementinfowidget.cpp	2017-08-22 17:24:51 UTC (rev 5023)
@@ -59,7 +59,7 @@
 	if (m_element == element) return;
 
 	if (m_element)
-		disconnect(m_element, &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
+		disconnect(m_element.data(), &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
 
 	m_element = element;
 	updateUi();
@@ -80,7 +80,7 @@
 		});
 	}
 
-	connect(m_element, &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
+	connect(m_element.data(), &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
 }
 
 /**

Modified: trunk/sources/ui/linksingleelementwidget.cpp
===================================================================
--- trunk/sources/ui/linksingleelementwidget.cpp	2017-08-16 14:32:34 UTC (rev 5022)
+++ trunk/sources/ui/linksingleelementwidget.cpp	2017-08-22 17:24:51 UTC (rev 5023)
@@ -104,7 +104,7 @@
 	if (m_element)
 	{
 		disconnect(m_element->diagram()->project(), &QETProject::diagramRemoved, this, &LinkSingleElementWidget::diagramWasRemovedFromProject);
-		disconnect(m_element, &Element::linkedElementChanged, this, &LinkSingleElementWidget::updateUi);
+		disconnect(m_element.data(), &Element::linkedElementChanged, this, &LinkSingleElementWidget::updateUi);
 		m_element->setHighlighted(false);
 	}
 	
@@ -127,7 +127,7 @@
 		m_filter = Element::Simple;
 
 	connect(m_element->diagram()->project(), &QETProject::diagramRemoved, this, &LinkSingleElementWidget::diagramWasRemovedFromProject);
-	connect(m_element, &Element::linkedElementChanged, this, &LinkSingleElementWidget::updateUi, Qt::QueuedConnection);
+	connect(m_element.data(), &Element::linkedElementChanged, this, &LinkSingleElementWidget::updateUi, Qt::QueuedConnection);
 
 	updateUi();
 }

Modified: trunk/sources/ui/masterpropertieswidget.cpp
===================================================================
--- trunk/sources/ui/masterpropertieswidget.cpp	2017-08-16 14:32:34 UTC (rev 5022)
+++ trunk/sources/ui/masterpropertieswidget.cpp	2017-08-22 17:24:51 UTC (rev 5023)
@@ -135,10 +135,10 @@
 
 		//Keep up to date this widget when the linked elements of m_element change
 	if (m_element)
-		disconnect(m_element, &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
+		disconnect(m_element.data(), &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
 	
 	m_element = element;
-	connect(m_element, &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
+	connect(m_element.data(), &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
 
 	updateUi();
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/