Reconcile style of include directives across all source files.

2017-01-06 19:00:59 -05:00
parent 602e3f9ab6
commit 9cba0d4a43
134 changed files with 408 additions and 455 deletions
@@ -20,26 +20,30 @@

 #include "XmlLabelParser.h"

+
+#include <QByteArray>
+#include <QFile>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QtDebug>
+
+#include <zlib.h>
+
+#include "EnumUtil.h"
 #include "LabelModel.h"
 #include "LabelModelObject.h"
+//#include "LabelModelBarcodeObject.h"
 #include "LabelModelBoxObject.h"
 #include "LabelModelEllipseObject.h"
-#include "LabelModelLineObject.h"
 #include "LabelModelImageObject.h"
+#include "LabelModelLineObject.h"
 #include "LabelModelTextObject.h"
-//#include "LabelModelBarcodeObject.h"
-#include "EnumUtil.h"
+
 #include "Merge/Factory.h"
+
 #include "libglabels/XmlTemplateParser.h"
 #include "libglabels/XmlUtil.h"

-#include <QFile>
-#include <QByteArray>
-#include <zlib.h>
-#include <QTextDocument>
-#include <QTextCursor>
-#include <QtDebug>
-

 LabelModel*
 XmlLabelParser::readFile( const QString& fileName )