Removed C++17 nested namespace definitions. Should build on trusty again.

This commit is contained in:
Jim Evins
2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
+47 -44
View File
@@ -26,56 +26,59 @@
#include <QDomElement>
namespace glabels::model
namespace glabels
{
// Forward references
class Model;
class ModelObject;
class ModelBoxObject;
class ModelEllipseObject;
class ModelLineObject;
class ModelImageObject;
class ModelBarcodeObject;
class ModelTextObject;
///
/// XmlLabelCreator
///
class XmlLabelCreator : public QObject
namespace model
{
Q_OBJECT
public:
static void writeFile( const Model* label, const QString& fileName );
static void writeBuffer( const Model* label, QByteArray& buffer );
static void serializeObjects( const QList<ModelObject*>& objects, QByteArray& buffer );
// Forward references
class Model;
class ModelObject;
class ModelBoxObject;
class ModelEllipseObject;
class ModelLineObject;
class ModelImageObject;
class ModelBarcodeObject;
class ModelTextObject;
private:
static void createDoc( QDomDocument& doc, const Model* label );
static void createRootNode( const Model* label );
static void createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate );
static void createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object );
static void createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object );
static void createObjectLineNode( QDomElement &parent, const ModelLineObject* object );
static void createObjectImageNode( QDomElement &parent, const ModelImageObject* object );
static void createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object );
static void createObjectTextNode( QDomElement &parent, const ModelTextObject* object );
static void createPNode( QDomElement &parent, const QString& blockText );
static void createPositionAttrs( QDomElement &node, const ModelObject* object );
static void createSizeAttrs( QDomElement &node, const ModelObject* object );
static void createLineAttrs( QDomElement &node, const ModelObject* object );
static void createFillAttrs( QDomElement &node, const ModelObject* object );
static void createAffineAttrs( QDomElement &node, const ModelObject* object );
static void createShadowAttrs( QDomElement &node, const ModelObject* object );
static void createMergeNode( QDomElement &parent, const Model* label );
static void createDataNode( QDomElement &parent, const QList<ModelObject*>& objects );
static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
};
///
/// XmlLabelCreator
///
class XmlLabelCreator : public QObject
{
Q_OBJECT
public:
static void writeFile( const Model* label, const QString& fileName );
static void writeBuffer( const Model* label, QByteArray& buffer );
static void serializeObjects( const QList<ModelObject*>& objects, QByteArray& buffer );
private:
static void createDoc( QDomDocument& doc, const Model* label );
static void createRootNode( const Model* label );
static void createObjectsNode( QDomElement &parent, const QList<ModelObject*>& objects, bool rotate );
static void createObjectBoxNode( QDomElement &parent, const ModelBoxObject* object );
static void createObjectEllipseNode( QDomElement &parent, const ModelEllipseObject* object );
static void createObjectLineNode( QDomElement &parent, const ModelLineObject* object );
static void createObjectImageNode( QDomElement &parent, const ModelImageObject* object );
static void createObjectBarcodeNode( QDomElement &parent, const ModelBarcodeObject* object );
static void createObjectTextNode( QDomElement &parent, const ModelTextObject* object );
static void createPNode( QDomElement &parent, const QString& blockText );
static void createPositionAttrs( QDomElement &node, const ModelObject* object );
static void createSizeAttrs( QDomElement &node, const ModelObject* object );
static void createLineAttrs( QDomElement &node, const ModelObject* object );
static void createFillAttrs( QDomElement &node, const ModelObject* object );
static void createAffineAttrs( QDomElement &node, const ModelObject* object );
static void createShadowAttrs( QDomElement &node, const ModelObject* object );
static void createMergeNode( QDomElement &parent, const Model* label );
static void createDataNode( QDomElement &parent, const QList<ModelObject*>& objects );
static void createPngFileNode( QDomElement &parent, const QString& name, const QImage& image );
static void createSvgFileNode( QDomElement &parent, const QString& name, const QByteArray& svg );
};
}
}