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

Bugfix: existing project files could end up saving application-wide default template properties.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1889 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-07-01 21:54:03 +00:00
parent 8ebdfbc5a4
commit 47ea8fef37
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/diagramcontext.cpp
View File

@@ -65,6 +65,13 @@ bool DiagramContext::addValue(const QString &key, const QVariant &value) {
return(false); return(false);
} }
/**
Clear the content of this diagram context.
*/
void DiagramContext::clear() {
content_.clear();
}
bool DiagramContext::operator==(const DiagramContext &dc) const { bool DiagramContext::operator==(const DiagramContext &dc) const {
return(content_ == dc.content_); return(content_ == dc.content_);
} }

1
sources/diagramcontext.h
View File

@@ -36,6 +36,7 @@ class DiagramContext {
bool contains(const QString &) const; bool contains(const QString &) const;
const QVariant operator[](const QString &) const; const QVariant operator[](const QString &) const;
bool addValue(const QString &, const QVariant &); bool addValue(const QString &, const QVariant &);
void clear();
bool operator==(const DiagramContext &) const; bool operator==(const DiagramContext &) const;
bool operator!=(const DiagramContext &) const; bool operator!=(const DiagramContext &) const;

1
sources/titleblockproperties.cpp
View File

@@ -102,6 +102,7 @@ void TitleBlockProperties::fromXml(const QDomElement &e) {
if (e.hasAttribute("titleblocktemplate")) template_name = e.attribute("titleblocktemplate"); if (e.hasAttribute("titleblocktemplate")) template_name = e.attribute("titleblocktemplate");
// reads the additional fields used to fill the title block // reads the additional fields used to fill the title block
context.clear();
foreach (QDomElement property, QET::findInDomElement(e, "properties", "property")) { foreach (QDomElement property, QET::findInDomElement(e, "properties", "property")) {
if (!property.hasAttribute("name")) continue; if (!property.hasAttribute("name")) continue;
context.addValue(property.attribute("name"), QVariant(property.text())); context.addValue(property.attribute("name"), QVariant(property.text()));