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

Fix ftbfs for ubuntu 14.04

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5023 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-08-22 17:24:51 +00:00
parent fbb07bf2b8
commit fe46dc29a6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -135,7 +135,7 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt)
if(m_text_from == ElementInfo) if(m_text_from == ElementInfo)
{ {
setNoEditable(true); setNoEditable(true);
connect(m_parent_element, &Element::elementInfoChange, this, &DynamicElementTextItem::elementInfoChanged); connect(m_parent_element.data(), &Element::elementInfoChange, this, &DynamicElementTextItem::elementInfoChanged);
} }
else { else {
setNoEditable(false); setNoEditable(false);

4
sources/ui/elementinfowidget.cpp
View File

@@ -59,7 +59,7 @@ void ElementInfoWidget::setElement(Element *element)
if (m_element == element) return; if (m_element == element) return;
if (m_element) if (m_element)
disconnect(m_element, &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange); disconnect(m_element.data(), &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
m_element = element; m_element = element;
updateUi(); updateUi();
@@ -80,7 +80,7 @@ void ElementInfoWidget::setElement(Element *element)
}); });
} }
connect(m_element, &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange); connect(m_element.data(), &Element::elementInfoChange, this, &ElementInfoWidget::elementInfoChange);
} }
/** /**

4
sources/ui/linksingleelementwidget.cpp
View File

@@ -104,7 +104,7 @@ void LinkSingleElementWidget::setElement(Element *element)
if (m_element) if (m_element)
{ {
disconnect(m_element->diagram()->project(), &QETProject::diagramRemoved, this, &LinkSingleElementWidget::diagramWasRemovedFromProject); 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); m_element->setHighlighted(false);
} }
@@ -127,7 +127,7 @@ void LinkSingleElementWidget::setElement(Element *element)
m_filter = Element::Simple; m_filter = Element::Simple;
connect(m_element->diagram()->project(), &QETProject::diagramRemoved, this, &LinkSingleElementWidget::diagramWasRemovedFromProject); 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(); updateUi();
} }

4
sources/ui/masterpropertieswidget.cpp
View File

@@ -135,10 +135,10 @@ void MasterPropertiesWidget::setElement(Element *element)
//Keep up to date this widget when the linked elements of m_element change //Keep up to date this widget when the linked elements of m_element change
if (m_element) if (m_element)
disconnect(m_element, &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi); disconnect(m_element.data(), &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
m_element = element; m_element = element;
connect(m_element, &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi); connect(m_element.data(), &Element::linkedElementChanged, this, &MasterPropertiesWidget::updateUi);
updateUi(); updateUi();
} }