kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-14 12:20:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression occurred in rev 3439

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3458 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2014-11-06 15:22:30 +00:00
parent ceea767f26
commit b311b4b195
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/qetgraphicsitem/element.h
View File

@@ -108,7 +108,13 @@ class Element : public QetGraphicsItem {
virtual void linkToElement(Element *) {} virtual void linkToElement(Element *) {}
virtual void unlinkAllElements() {} virtual void unlinkAllElements() {}
virtual void unlinkElement(Element *) {} virtual void unlinkElement(Element *) {}
#if QT_VERSION >= 0x040800
virtual void initLink(QETProject *); virtual void initLink(QETProject *);
#else
void initLink(QETProject *);
#endif
QList<Element *> linkedElements (); QList<Element *> linkedElements ();
virtual int linkType() const {return link_type_;} // @return the linkable type virtual int linkType() const {return link_type_;} // @return the linkable type
void newUuid() {uuid_ = QUuid::createUuid();} //create new uuid for this element void newUuid() {uuid_ = QUuid::createUuid();} //create new uuid for this element

4
sources/qetproject.cpp
View File

@@ -458,7 +458,11 @@ void QETProject::setDefaultXRefProperties(const QString type, const XRefProperti
} }
void QETProject::setDefaultXRefProperties(QHash<QString, XRefProperties> hash) { void QETProject::setDefaultXRefProperties(QHash<QString, XRefProperties> hash) {
#if QT_VERSION >= 0x040800
m_default_xref_properties.swap(hash);
#else
m_default_xref_properties = hash; m_default_xref_properties = hash;
#endif
emit XRefPropertiesChanged(); emit XRefPropertiesChanged();
} }