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/XmlLabelCreator.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
//#include "LabelObjectLine.h"
//#include "LabelObjectImage.h"
//#include "LabelObjectBarcode.h"
#include "Merge/MergeNone.h"
#include "Merge/None.h"
#include "libglabels/XmlTemplateCreator.h"
#include "libglabels/XmlUtil.h"
@@ -97,7 +97,7 @@ XmlLabelCreator::createDoc( QDomDocument& doc, const LabelModel* label )
createObjectsNode( root, label );
if ( label->merge() && !dynamic_cast<MergeNone*>(label->merge()) )
if ( label->merge() && !dynamic_cast<merge::None*>(label->merge()) )
{
createMergeNode( root, label );
}