Reconcile style of include directives across all source files.

libglabels/Db.cpp

@@ -20,15 +20,16 @@
 
 #include "Db.h"
 
+
 #include <QApplication>
 #include <QtDebug>
 
 #include "Config.h"
 #include "StrUtil.h"
-#include "XmlPaperParser.h"
 #include "XmlCategoryParser.h"
-#include "XmlVendorParser.h"
+#include "XmlPaperParser.h"
 #include "XmlTemplateParser.h"
+#include "XmlVendorParser.h"
 
 
 namespace

libglabels/Db.h

@@ -23,14 +23,14 @@
 
 
 #include <QCoreApplication>
-#include <QString>
 #include <QDir>
 #include <QList>
+#include <QString>
 
-#include "Paper.h"
 #include "Category.h"
-#include "Vendor.h"
+#include "Paper.h"
 #include "Template.h"
+#include "Vendor.h"
 
 
 namespace glabels

libglabels/Distance.cpp

@@ -20,6 +20,7 @@
 
 #include "Distance.h"
 
+
 #include <QTextStream>
 #include <QtDebug>
 

libglabels/Distance.h

@@ -24,6 +24,7 @@
 
 #include <QCoreApplication>
 #include <QString>
+
 #include "Units.h"
 
 

libglabels/Frame.cpp

@@ -20,6 +20,7 @@
 
 #include "Frame.h"
 
+
 #include "Markup.h"
 
 

libglabels/Frame.h

@@ -21,20 +21,23 @@
 #ifndef glabels_Frame_h
 #define glabels_Frame_h
 
+
 #include <QCoreApplication>
-#include <QString>
 #include <QList>
 #include <QPainterPath>
+#include <QString>
 #include <QVector>
 
 #include "Distance.h"
-#include "Point.h"
 #include "Layout.h"
+#include "Point.h"
 
 
 namespace glabels
 {
-	class Markup;  // Forward reference
+	
+	// Forward references
+	class Markup;
 
 
 	class Frame

libglabels/FrameCd.cpp

@@ -20,10 +20,12 @@
 
 #include "FrameCd.h"
 
-#include "StrUtil.h"
-#include "privateConstants.h"
+
 #include <QtDebug>
 
+#include "privateConstants.h"
+#include "StrUtil.h"
+
 
 namespace glabels
 {

libglabels/FrameCd.h

@@ -21,6 +21,7 @@
 #ifndef glabels_FrameCd_h
 #define glabels_FrameCd_h
 
+
 #include "Frame.h"
 
 

libglabels/FrameEllipse.cpp

@@ -20,8 +20,9 @@
 
 #include "FrameEllipse.h"
 
-#include "StrUtil.h"
+
 #include "privateConstants.h"
+#include "StrUtil.h"
 
 
 namespace glabels

libglabels/FrameEllipse.h

@@ -21,6 +21,7 @@
 #ifndef glabels_FrameEllipse_h
 #define glabels_FrameEllipse_h
 
+
 #include "Frame.h"
 
 

libglabels/FrameRect.cpp

@@ -20,8 +20,9 @@
 
 #include "FrameRect.h"
 
-#include "StrUtil.h"
+
 #include "privateConstants.h"
+#include "StrUtil.h"
 
 
 namespace glabels

libglabels/FrameRect.h

@@ -21,6 +21,7 @@
 #ifndef glabels_FrameRect_h
 #define glabels_FrameRect_h
 
+
 #include "Frame.h"
 
 

libglabels/FrameRound.cpp

@@ -20,8 +20,9 @@
 
 #include "FrameRound.h"
 
-#include "StrUtil.h"
+
 #include "privateConstants.h"
+#include "StrUtil.h"
 
 
 namespace glabels

libglabels/FrameRound.h

@@ -21,6 +21,7 @@
 #ifndef glabels_FrameRound_h
 #define glabels_FrameRound_h
 
+
 #include "Frame.h"
 
 

libglabels/Layout.cpp

@@ -20,7 +20,8 @@
 
 #include "Layout.h"
 
-#include <math.h>
+
+#include <cmath>
 
 #include "privateConstants.h"
 

libglabels/Layout.h

@@ -21,6 +21,7 @@
 #ifndef glabels_Layout_h
 #define glabels_Layout_h
 
+
 #include "Distance.h"
 
 

libglabels/Markup.h

@@ -21,6 +21,7 @@
 #ifndef glabels_Markup_h
 #define glabels_Markup_h
 
+
 #include <QPainterPath>
 
 #include "Frame.h"

libglabels/MiniPreviewPixmap.cpp

@@ -20,6 +20,7 @@
 
 #include "MiniPreviewPixmap.h"
 
+
 #include "Template.h"
 
 

libglabels/MiniPreviewPixmap.h

@@ -24,13 +24,16 @@
 
 #include <QPixmap>
 #include <QPainter>
+
 #include "Point.h"
 
 
 namespace glabels
 {
-	class Template;  // Forward reference
-	class Frame;     // Forward reference
+
+	// Forward references
+	class Template;
+	class Frame;
 
 
 	class MiniPreviewPixmap : public QPixmap

libglabels/Paper.h

@@ -23,6 +23,7 @@
 
 
 #include <QString>
+
 #include "Distance.h"
 
 

libglabels/Point.h

@@ -21,6 +21,7 @@
 #ifndef glabels_Point_h
 #define glabels_Point_h
 
+
 #include "Distance.h"
 
 

libglabels/StrUtil.cpp

@@ -20,6 +20,7 @@
 
 #include "StrUtil.h"
 
+
 #include <QtMath>
 
 

libglabels/StrUtil.h

@@ -21,6 +21,7 @@
 #ifndef glabels_StrUtil_h
 #define glabels_StrUtil_h
 
+
 #include <QString>
 
 

libglabels/Template.cpp

@@ -20,6 +20,7 @@
 
 #include "Template.h"
 
+
 #include <QtDebug>
 
 #include "Db.h"

libglabels/Template.h

@@ -21,17 +21,16 @@
 #ifndef glabels_Template_h
 #define glabels_Template_h
 
+
 #include <QCoreApplication>
 #include <QString>
 #include <QStringList>
 #include <QList>
 
-#include <vector>
-
 #include "Distance.h"
-#include "Point.h"
 #include "Frame.h"
 #include "MiniPreviewPixmap.h"
+#include "Point.h"
 
 
 namespace glabels

libglabels/Units.cpp

@@ -20,6 +20,7 @@
 
 #include "Units.h"
 
+
 #include <QTextStream>
 #include <QtDebug>
 

libglabels/XmlCategoryParser.cpp

@@ -20,14 +20,15 @@
 
 #include "XmlCategoryParser.h"
 
-#include <QFile>
+
 #include <QDomDocument>
 #include <QDomNode>
+#include <QFile>
 #include <QtDebug>
 
 #include "Category.h"
-#include "XmlUtil.h"
 #include "Db.h"
+#include "XmlUtil.h"
 
 
 namespace glabels

libglabels/XmlCategoryParser.h

@@ -22,8 +22,8 @@
 #define glabels_XmlCategoryParser_h
 
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
 
 namespace glabels

libglabels/XmlPaperParser.cpp

@@ -20,14 +20,15 @@
 
 #include "XmlPaperParser.h"
 
-#include <QFile>
+
 #include <QDomDocument>
 #include <QDomNode>
+#include <QFile>
 #include <QtDebug>
 
+#include "Db.h"
 #include "Paper.h"
 #include "XmlUtil.h"
-#include "Db.h"
 
 
 namespace glabels

libglabels/XmlTemplateCreator.cpp

@@ -20,14 +20,14 @@
 
 #include "XmlTemplateCreator.h"
 
-#include <QFile>
-#include <QDomDocument>
+
 #include <QDomNode>
+#include <QFile>
 #include <QtDebug>
 
+#include "Db.h"
 #include "Template.h"
 #include "XmlUtil.h"
-#include "Db.h"
 
 
 namespace glabels

libglabels/XmlTemplateCreator.h

@@ -22,16 +22,16 @@
 #define glabels_XmlTemplateCreator_h
 
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
-#include "Template.h"
-#include "FrameRect.h"
 #include "FrameCd.h"
-#include "FrameRound.h"
 #include "FrameEllipse.h"
+#include "FrameRect.h"
+#include "FrameRound.h"
 #include "Layout.h"
 #include "Markup.h"
+#include "Template.h"
 
 
 namespace glabels

libglabels/XmlTemplateParser.cpp

@@ -20,13 +20,12 @@
 
 #include "XmlTemplateParser.h"
 
+
 #include <QFile>
 #include <QDomDocument>
 #include <QDomNode>
 #include <QtDebug>
 
-#include "Template.h"
-#include "XmlUtil.h"
 #include "Db.h"
 #include "FrameRect.h"
 #include "FrameCd.h"
@@ -34,6 +33,8 @@
 #include "FrameEllipse.h"
 #include "Layout.h"
 #include "Markup.h"
+#include "Template.h"
+#include "XmlUtil.h"
 
 
 namespace glabels

libglabels/XmlTemplateParser.h

@@ -22,8 +22,8 @@
 #define glabels_XmlTemplateParser_h
 
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
 #include "Template.h"
 

libglabels/XmlUtil.cpp

@@ -20,6 +20,7 @@
 
 #include "XmlUtil.h"
 
+
 #include <QTextStream>
 #include <QtDebug>
 

libglabels/XmlUtil.h

@@ -21,9 +21,10 @@
 #ifndef glabels_XmlUtil_h
 #define glabels_XmlUtil_h
 
-#include <QString>
+
+#include <cstdint>
 #include <QDomElement>
-#include <stdint.h>
+#include <QString>
 
 #include "Distance.h"
 

libglabels/XmlVendorParser.cpp

@@ -20,14 +20,15 @@
 
 #include "XmlVendorParser.h"
 
-#include <QFile>
+
 #include <QDomDocument>
 #include <QDomNode>
+#include <QFile>
 #include <QtDebug>
 
+#include "Db.h"
 #include "Vendor.h"
 #include "XmlUtil.h"
-#include "Db.h"
 
 
 namespace glabels

libglabels/XmlVendorParser.h

@@ -22,8 +22,8 @@
 #define glabels_XmlVendorParser_h
 
 
-#include <QString>
 #include <QDomElement>
+#include <QString>
 
 
 namespace glabels