Reconcile style accross all source files.
- All glabels code is in "glabels" top-level namespace. - Other assorted cleanup.
This commit is contained in:
+44
-38
@@ -25,49 +25,55 @@
|
||||
#include <QObject>
|
||||
#include <QDomElement>
|
||||
|
||||
// Forward references
|
||||
class LabelModel;
|
||||
class LabelModelObject;
|
||||
class LabelModelBoxObject;
|
||||
class LabelModelEllipseObject;
|
||||
class LabelModelLineObject;
|
||||
class LabelModelImageObject;
|
||||
class LabelModelBarcodeObject;
|
||||
class LabelModelTextObject;
|
||||
|
||||
|
||||
///
|
||||
/// XmlLabelParser
|
||||
///
|
||||
class XmlLabelParser : public QObject
|
||||
namespace glabels
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
static LabelModel* readFile( const QString& fileName );
|
||||
static LabelModel* readBuffer( const QByteArray& buffer );
|
||||
static QList<LabelModelObject*> deserializeObjects( const QByteArray& buffer );
|
||||
// Forward references
|
||||
class LabelModel;
|
||||
class LabelModelObject;
|
||||
class LabelModelBoxObject;
|
||||
class LabelModelEllipseObject;
|
||||
class LabelModelLineObject;
|
||||
class LabelModelImageObject;
|
||||
class LabelModelBarcodeObject;
|
||||
class LabelModelTextObject;
|
||||
|
||||
private:
|
||||
static void gunzip( const QByteArray& gzippedData, QByteArray& data );
|
||||
static LabelModel* parseRootNode( const QDomElement &node );
|
||||
static QList<LabelModelObject*> parseObjects( const QDomElement &node );
|
||||
static void parseObjectsNode( const QDomElement &node, LabelModel* label );
|
||||
static LabelModelBoxObject* parseObjectBoxNode( const QDomElement &node );
|
||||
static LabelModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
|
||||
static LabelModelLineObject* parseObjectLineNode( const QDomElement &node );
|
||||
static LabelModelImageObject* parseObjectImageNode( const QDomElement &node );
|
||||
static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
|
||||
static LabelModelTextObject* parseObjectTextNode( const QDomElement &node );
|
||||
static QString parsePNode( const QDomElement &node );
|
||||
static void parseAffineAttrs( const QDomElement &node, LabelModelObject* object );
|
||||
static void parseShadowAttrs( const QDomElement &node, LabelModelObject* object );
|
||||
static void parseMergeNode( const QDomElement &node, LabelModel* label );
|
||||
static void parseDataNode( const QDomElement &node, LabelModel* label );
|
||||
static void parsePixdataNode( const QDomElement &node, LabelModel* label );
|
||||
static void parseFileNode( const QDomElement &node, LabelModel* label );
|
||||
|
||||
};
|
||||
///
|
||||
/// XmlLabelParser
|
||||
///
|
||||
class XmlLabelParser : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
static LabelModel* readFile( const QString& fileName );
|
||||
static LabelModel* readBuffer( const QByteArray& buffer );
|
||||
static QList<LabelModelObject*> deserializeObjects( const QByteArray& buffer );
|
||||
|
||||
private:
|
||||
static void gunzip( const QByteArray& gzippedData, QByteArray& data );
|
||||
static LabelModel* parseRootNode( const QDomElement &node );
|
||||
static QList<LabelModelObject*> parseObjects( const QDomElement &node );
|
||||
static void parseObjectsNode( const QDomElement &node, LabelModel* label );
|
||||
static LabelModelBoxObject* parseObjectBoxNode( const QDomElement &node );
|
||||
static LabelModelEllipseObject* parseObjectEllipseNode( const QDomElement &node );
|
||||
static LabelModelLineObject* parseObjectLineNode( const QDomElement &node );
|
||||
static LabelModelImageObject* parseObjectImageNode( const QDomElement &node );
|
||||
static LabelModelBarcodeObject* parseObjectBarcodeNode( const QDomElement &node );
|
||||
static LabelModelTextObject* parseObjectTextNode( const QDomElement &node );
|
||||
static QString parsePNode( const QDomElement &node );
|
||||
static void parseAffineAttrs( const QDomElement &node, LabelModelObject* object );
|
||||
static void parseShadowAttrs( const QDomElement &node, LabelModelObject* object );
|
||||
static void parseMergeNode( const QDomElement &node, LabelModel* label );
|
||||
static void parseDataNode( const QDomElement &node, LabelModel* label );
|
||||
static void parsePixdataNode( const QDomElement &node, LabelModel* label );
|
||||
static void parseFileNode( const QDomElement &node, LabelModel* label );
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif // XmlLabelParser_h
|
||||
|
||||
Reference in New Issue
Block a user