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
+43 -40
View File
@@ -26,52 +26,55 @@
#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;
class DataCache;
///
/// XmlLabelParser
///
class XmlLabelParser : public QObject
namespace model
{
Q_OBJECT
public:
static Model* readFile( const QString& fileName );
static Model* readBuffer( const QByteArray& buffer );
static QList<ModelObject*> deserializeObjects( const QByteArray& buffer );
// Forward references
class Model;
class ModelObject;
class ModelBoxObject;
class ModelEllipseObject;
class ModelLineObject;
class ModelImageObject;
class ModelBarcodeObject;
class ModelTextObject;
class DataCache;
private:
static void gunzip( const QByteArray& gzippedData, QByteArray& data );
static Model* parseRootNode( const QDomElement &node );
static QList<ModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
static ModelBoxObject* parseObjectBoxNode( const QDomElement &node );
static ModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
static ModelLineObject* parseObjectLineNode( const QDomElement &node );
static ModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
static ModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
static ModelTextObject* parseObjectTextNode( const QDomElement &node );
static QString parsePNode( const QDomElement &node );
static bool parseRotateAttr( const QDomElement &node );
static void parseMergeNode( const QDomElement &node, Model* label );
static void parseDataNode( const QDomElement &node, DataCache& data );
static void parsePixdataNode( const QDomElement &node, DataCache& data );
static void parseFileNode( const QDomElement &node, DataCache& data );
};
///
/// XmlLabelParser
///
class XmlLabelParser : public QObject
{
Q_OBJECT
public:
static Model* readFile( const QString& fileName );
static Model* readBuffer( const QByteArray& buffer );
static QList<ModelObject*> deserializeObjects( const QByteArray& buffer );
private:
static void gunzip( const QByteArray& gzippedData, QByteArray& data );
static Model* parseRootNode( const QDomElement &node );
static QList<ModelObject*> parseObjectsNode( const QDomElement &node, const DataCache& data );
static ModelBoxObject* parseObjectBoxNode( const QDomElement &node );
static ModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
static ModelLineObject* parseObjectLineNode( const QDomElement &node );
static ModelImageObject* parseObjectImageNode( const QDomElement &node, const DataCache& data );
static ModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
static ModelTextObject* parseObjectTextNode( const QDomElement &node );
static QString parsePNode( const QDomElement &node );
static bool parseRotateAttr( const QDomElement &node );
static void parseMergeNode( const QDomElement &node, Model* label );
static void parseDataNode( const QDomElement &node, DataCache& data );
static void parsePixdataNode( const QDomElement &node, DataCache& data );
static void parseFileNode( const QDomElement &node, DataCache& data );
};
}
}