Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Moved Merge subsystem into merge namespace.

Browse Source
This commit is contained in:
Jim Evins
2016-05-22 14:38:59 -04:00
parent b1e7a6507c
commit c7f02f027a
34 changed files with 1434 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/XmlLabelParser.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
//#include "LabelObjectLine.h"
//#include "LabelObjectImage.h"
//#include "LabelObjectBarcode.h"
#include "Merge/MergeFactory.h"
#include "Merge/Factory.h"
#include "libglabels/XmlTemplateParser.h"
#include "libglabels/XmlUtil.h"
@@ -441,7 +441,7 @@ XmlLabelParser::parseMergeNode( const QDomElement &node, LabelModel* label )
QString type = XmlUtil::getStringAttr( node, "type", "None" );
QString src = XmlUtil::getStringAttr( node, "src", "" );
Merge* merge = MergeFactory::createMerge( type );
merge::Merge* merge = merge::Factory::createMerge( type );
merge->setSource( src );
label->setMerge( merge );