Some coding style adjustments.

.clang-format

@@ -0,0 +1,91 @@
+---
+Language:        Cpp
+# BasedOnStyle:  Google
+AccessModifierOffset: -8
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlinesLeft: true
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:   
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit:     110
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^"[A-Z].*\.h'
+    Priority:        1
+  - Regex:           '^<Q[A-Za-z]*\>'
+    Priority:        2
+  - Regex:           '^<[a-z]*>'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        4
+IndentCaseLabels: false
+IndentWidth:     8
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: true
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          ForIndentation
+...
+

docs/CODING-STYLE.md

@@ -4,6 +4,10 @@ Glabels Coding Style
 This file describes the coding style used in all glabels source code.  Any
 patches or pull requests should adhere to this style.
 
+:bulb: **Note:** The top-level glabels source directory includes a *.clang-format* file.
+This file can be used with `clang-format` to reformat code to a reasonable approximation
+of the style described here.
+
 
 Formatting
 ----------
@@ -124,12 +128,12 @@ All header files should have an ifndef guard to prevent multiple inclusion.
 Header files should be included in the following order.
 
 1. header file for this module (e.g. this would be "Foo.h" in "Foo.cpp").
-2. C system header files (preference is for the C++ version if available,
+2. Glabels header files.
-   e.g. \<cmath> instead of \<math.h>.
+3. Qt header files
 3. C++ system header files (e.g. STL files)
-4. Qt header files
+4. C system header files (preference is for the C++ version if available,
+   e.g. \<cmath> instead of \<math.h>.
 5. Other libraries' header files
-6. Other glabels header files.
 
 Paths used in include directives should always be relative to either the
 glabels source directory or an appropriate base directory for each library.

glabels/AboutDialog.cpp

@@ -20,13 +20,12 @@
 
 #include "AboutDialog.h"
 
+#include "Version.h"
 
 #include <QDesktopServices>
 #include <QUrl>
 #include <QtDebug>
 
-#include "Version.h"
-
 
 namespace glabels
 {
@@ -85,4 +84,4 @@ namespace glabels
 		QDesktopServices::openUrl( QUrl(Version::WEBSITE) );
 	}
 
-}
+} // namespace glabels

glabels/BarcodeBackends.cpp

@@ -180,4 +180,4 @@ namespace glabels
 		mStyleNameMap.insert( fqName, style );
 	}
 
-}
+} // namespace glabels

glabels/BarcodeBackends.h

@@ -22,13 +22,13 @@
 #define BarcodeBackends_h
 
 
+#include "BarcodeStyle.h"
+
 #include <QList>
 #include <QMap>
 #include <QObject>
 #include <QString>
 
-#include "BarcodeStyle.h"
-
 
 namespace glabels
 {

glabels/BarcodeMenu.cpp

@@ -20,7 +20,6 @@
 
 #include "BarcodeMenu.h"
 
-
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
@@ -64,4 +63,4 @@ namespace glabels
 		emit styleChanged();
 	}
 
-}
+} // namespace glabels

glabels/BarcodeMenu.h

@@ -22,10 +22,10 @@
 #define BarcodeMenu_h
 
 
-#include <QMenu>
-
 #include "BarcodeStyle.h"
 
+#include <QMenu>
+
 
 namespace glabels
 {

glabels/BarcodeMenuButton.cpp

@@ -20,7 +20,6 @@
 
 #include "BarcodeMenuButton.h"
 
-
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
@@ -64,4 +63,4 @@ namespace glabels
 		emit styleChanged();
 	}
 
-}
+} // namespace glabels

glabels/BarcodeMenuButton.h

@@ -22,11 +22,11 @@
 #define BarcodeMenuButton_h
 
 
-#include <QPushButton>
-
 #include "BarcodeMenu.h"
 #include "BarcodeStyle.h"
 
+#include <QPushButton>
+
 
 namespace glabels
 {

glabels/BarcodeMenuItem.cpp

@@ -53,4 +53,4 @@ namespace glabels
 		emit activated( mBcStyle );
 	}
 
-}
+} // namespace glabels

glabels/BarcodeMenuItem.h

@@ -22,10 +22,10 @@
 #define BarcodeMenuItem_h
 
 
-#include <QAction>
-
 #include "BarcodeStyle.h"
 
+#include <QAction>
+
 
 namespace glabels
 {

glabels/BarcodeStyle.cpp

@@ -176,4 +176,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/BarcodeStyle.h

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

glabels/Category.cpp

@@ -42,6 +42,4 @@ namespace glabels
 		return mName;
 	}
 
-}
+} // namespace glabels
-
-

glabels/ColorButton.cpp

@@ -20,13 +20,12 @@
 
 #include "ColorButton.h"
 
+#include "ColorSwatch.h"
 
 #include <QHBoxLayout>
 #include <QIcon>
 #include <QtDebug>
 
-#include "ColorSwatch.h"
-
 
 namespace glabels
 {
@@ -183,4 +182,4 @@ namespace glabels
 		emit colorChanged();
 	}
 
-}
+} // namespace glabels

glabels/ColorButton.h

@@ -22,11 +22,11 @@
 #define ColorButton_h
 
 
-#include <QPushButton>
-
 #include "ColorNode.h"
 #include "ColorPaletteDialog.h"
 
+#include <QPushButton>
+
 
 namespace glabels
 {

glabels/ColorHistory.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorHistory.h"
 
-
 #include <QSettings>
 #include <QtDebug>
 
@@ -116,4 +115,4 @@ namespace glabels
 		settings.endGroup();
 	}
 
-}
+} // namespace glabels

glabels/ColorNode.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorNode.h"
 
-
 #include "Merge/Record.h"
 
 
@@ -200,4 +199,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/ColorNode.h

@@ -22,12 +22,12 @@
 #define ColorNode_h
 
 
-#include <cstdint>
+#include "Merge/Record.h"
 
 #include <QString>
 #include <QColor>
 
-#include "Merge/Record.h"
+#include <cstdint>
 
 
 namespace glabels

glabels/ColorPaletteButtonItem.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorPaletteButtonItem.h"
 
-
 #include <QMouseEvent>
 #include <QPainter>
 
@@ -122,4 +121,4 @@ namespace glabels
 		emit activated();
 	}
 
-}
+} // namespace glabels

glabels/ColorPaletteDialog.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorPaletteDialog.h"
 
-
 #include <QColorDialog>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -324,4 +323,4 @@ namespace glabels
 		QDialog::showEvent( event );
 	}
 
-}
+} // namespace glabels

glabels/ColorPaletteDialog.h

@@ -22,14 +22,14 @@
 #define ColorPaletteDialog_h
 
 
-#include <QComboBox>
-#include <QDialog>
-
 #include "ColorNode.h"
 #include "ColorHistory.h"
 #include "ColorPaletteItem.h"
 #include "ColorPaletteButtonItem.h"
 
+#include <QComboBox>
+#include <QDialog>
+
 
 namespace glabels
 {

glabels/ColorPaletteItem.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorPaletteItem.h"
 
-
 #include <QMouseEvent>
 #include <QPainter>
 
@@ -146,4 +145,4 @@ namespace glabels
 		emit activated( mId );
 	}
 
-}
+} // namespace glabels

glabels/ColorSwatch.cpp

@@ -20,7 +20,6 @@
 
 #include "ColorSwatch.h"
 
-
 #include <QPainter>
 
 
@@ -58,4 +57,4 @@ namespace glabels
 		painter.drawRect( 1, 1, w-2, h-2 );
 	}
 
-}
+} // namespace glabels

glabels/Cursors.cpp

@@ -67,4 +67,4 @@ namespace glabels
 		// empty
 	}
 
-}
+} // namespace glabels

glabels/DataCache.cpp

@@ -107,4 +107,4 @@ namespace glabels
 	}
 
 	
-}
+} // namespace glabels

glabels/Db.cpp

@@ -20,10 +20,6 @@
 
 #include "Db.h"
 
-
-#include <QtDebug>
-#include <QtGlobal>
-
 #include "Config.h"
 #include "StrUtil.h"
 #include "FileUtil.h"
@@ -32,6 +28,9 @@
 #include "XmlTemplateParser.h"
 #include "XmlVendorParser.h"
 
+#include <QtDebug>
+#include <QtGlobal>
+
 
 namespace glabels
 {
@@ -686,4 +685,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/Db.h

@@ -22,16 +22,16 @@
 #define glabels_Db_h
 
 
-#include <QCoreApplication>
-#include <QDir>
-#include <QList>
-#include <QString>
-
 #include "Category.h"
 #include "Paper.h"
 #include "Template.h"
 #include "Vendor.h"
 
+#include <QCoreApplication>
+#include <QDir>
+#include <QList>
+#include <QString>
+
 
 namespace glabels
 {

glabels/Distance.cpp

@@ -20,7 +20,6 @@
 
 #include "Distance.h"
 
-
 #include <QTextStream>
 #include <QtDebug>
 
@@ -204,4 +203,5 @@ namespace glabels
 		Units units(unitsId);
 		return QString::number( inUnits(units) ) + units.toIdString();
 	}
-}
+
+} // namespace glabels

glabels/Distance.h

@@ -22,11 +22,11 @@
 #define glabels_Distance_h
 
 
+#include "Units.h"
+
 #include <QCoreApplication>
 #include <QString>
 
-#include "Units.h"
-
 
 namespace glabels
 {

glabels/EnumUtil.cpp

@@ -123,4 +123,4 @@ namespace glabels
 
 	}
 
-}
+} // namespace glabels

glabels/FieldButton.cpp

@@ -20,7 +20,6 @@
 
 #include "FieldButton.h"
 
-
 #include <QLineEdit>
 #include <QStandardItemModel>
 
@@ -106,4 +105,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/File.cpp

@@ -20,11 +20,6 @@
 
 #include "File.h"
 
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QtDebug>
-
 #include "FileUtil.h"
 #include "LabelModel.h"
 #include "MainWindow.h"
@@ -32,6 +27,10 @@
 #include "XmlLabelParser.h"
 #include "XmlLabelCreator.h"
 
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -244,4 +243,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/FileUtil.cpp

@@ -20,10 +20,10 @@
 
 #include "FileUtil.h"
 
-#include <QApplication>
-
 #include "Config.h"
 
+#include <QApplication>
+
 
 namespace glabels
 {
@@ -84,4 +84,4 @@ namespace glabels
 		return QDir("/");
 	}
 
-}
+} // namespace glabels

glabels/Frame.cpp

@@ -20,7 +20,6 @@
 
 #include "Frame.h"
 
-
 #include "Markup.h"
 
 
@@ -134,4 +133,4 @@ namespace glabels
 		mMarkups << markup;
 	}
 
-}
+} // namespace glabels

glabels/Frame.h

@@ -22,16 +22,16 @@
 #define glabels_Frame_h
 
 
+#include "Distance.h"
+#include "Layout.h"
+#include "Point.h"
+
 #include <QCoreApplication>
 #include <QList>
 #include <QPainterPath>
 #include <QString>
 #include <QVector>
 
-#include "Distance.h"
-#include "Layout.h"
-#include "Point.h"
-
 
 namespace glabels
 {

glabels/FrameCd.cpp

@@ -20,12 +20,11 @@
 
 #include "FrameCd.h"
 
-
-#include <QtDebug>
-
 #include "Constants.h"
 #include "StrUtil.h"
 
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -215,5 +214,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels
-

glabels/FrameEllipse.cpp

@@ -20,7 +20,6 @@
 
 #include "FrameEllipse.h"
 
-
 #include "Constants.h"
 #include "StrUtil.h"
 
@@ -128,5 +127,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels
-

glabels/FrameRect.cpp

@@ -20,7 +20,6 @@
 
 #include "FrameRect.h"
 
-
 #include "Constants.h"
 #include "StrUtil.h"
 
@@ -149,5 +148,4 @@ namespace glabels
 	}
 
 
-}
+} // namespace glabels
-

glabels/FrameRound.cpp

@@ -20,7 +20,6 @@
 
 #include "FrameRound.h"
 
-
 #include "Constants.h"
 #include "StrUtil.h"
 
@@ -132,5 +131,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels
-

glabels/Handles.cpp

@@ -20,12 +20,11 @@
 
 #include "Handles.h"
 
+#include "LabelModelObject.h"
 
 #include <QColor>
 #include <QtDebug>
 
-#include "LabelModelObject.h"
-
 
 namespace glabels
 {
@@ -586,4 +585,4 @@ namespace glabels
 		return pathAt( scale, mOwner->w(), mOwner->h() );
 	}
 
-}
+} // namespace glabels

glabels/Handles.h

@@ -22,11 +22,11 @@
 #define Handles_h
 
 
+#include "Distance.h"
+
 #include <QPainter>
 #include <QPainterPath>
 
-#include "Distance.h"
-
 
 namespace glabels
 {

glabels/Help.cpp

@@ -20,11 +20,10 @@
 
 #include "Help.h"
 
+#include "AboutDialog.h"
 
 #include <QtDebug>
 
-#include "AboutDialog.h"
-
 
 namespace glabels
 {
@@ -47,4 +46,4 @@ namespace glabels
 		dialog.exec();
 	}
 
-}
+} // namespace glabels

glabels/LabelEditor.cpp

@@ -20,11 +20,6 @@
 
 #include "LabelEditor.h"
 
-
-#include <QMouseEvent>
-#include <QtMath>
-#include <QtDebug>
-
 #include "Cursors.h"
 #include "FrameCd.h"
 #include "FrameEllipse.h"
@@ -41,6 +36,10 @@
 #include "Settings.h"
 #include "UndoRedoModel.h"
 
+#include <QMouseEvent>
+#include <QtMath>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -1250,4 +1249,4 @@ namespace glabels
 		emit zoomChanged();
 	}
 
-}
+} // namespace glabels

glabels/LabelEditor.h

@@ -22,12 +22,12 @@
 #define LabelEditor_h
 
 
+#include "Region.h"
+
 #include <QPainter>
 #include <QScrollArea>
 #include <QWidget>
 
-#include "Region.h"
-
 
 namespace glabels
 {

glabels/LabelModel.cpp

@@ -20,13 +20,6 @@
 
 #include "LabelModel.h"
 
-
-#include <QApplication>
-#include <QClipboard>
-#include <QFileInfo>
-#include <QMimeData>
-#include <QtDebug>
-
 #include "LabelModelObject.h"
 #include "LabelModelTextObject.h"
 #include "LabelModelImageObject.h"
@@ -37,6 +30,12 @@
 
 #include "Merge/None.h"
 
+#include <QApplication>
+#include <QClipboard>
+#include <QFileInfo>
+#include <QMimeData>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -1442,4 +1441,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/LabelModel.h

@@ -22,16 +22,16 @@
 #define LabelModel_h
 
 
-#include <QList>
-#include <QObject>
-#include <QPainter>
-
 #include "Settings.h"
 #include "Template.h"
 
 #include "Merge/Merge.h"
 #include "Merge/Record.h"
 
+#include <QList>
+#include <QObject>
+#include <QPainter>
+
 
 namespace glabels
 {

glabels/LabelModelBoxObject.cpp

@@ -20,7 +20,6 @@
 
 #include "LabelModelBoxObject.h"
 
-
 #include <QBrush>
 #include <QPen>
 
@@ -167,4 +166,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelEllipseObject.cpp

@@ -20,7 +20,6 @@
 
 #include "LabelModelEllipseObject.h"
 
-
 #include <QBrush>
 #include <QPen>
 
@@ -167,4 +166,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelImageObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelImageObject.h"
 
+#include "Size.h"
 
 #include <QBrush>
 #include <QFileInfo>
@@ -27,8 +28,6 @@
 #include <QPen>
 #include <QtDebug>
 
-#include "Size.h"
-
 
 namespace glabels
 {
@@ -440,4 +439,4 @@ namespace glabels
 		return shadow;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelImageObject.h

@@ -22,10 +22,10 @@
 #define LabelModelImageObject_h
 
 
-#include <QSvgRenderer>
-
 #include "LabelModelObject.h"
 
+#include <QSvgRenderer>
+
 
 namespace glabels
 {

glabels/LabelModelLineObject.cpp

@@ -20,7 +20,6 @@
 
 #include "LabelModelLineObject.h"
 
-
 #include <QBrush>
 #include <QPen>
 
@@ -206,4 +205,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelObject.cpp

@@ -20,16 +20,15 @@
 
 #include "LabelModelObject.h"
 
-
-#include <QFont>
-#include <QtDebug>
-
 #include "ColorNode.h"
 #include "BarcodeStyle.h"
 #include "Region.h"
 #include "Size.h"
 #include "TextNode.h"
 
+#include <QFont>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -1179,4 +1178,4 @@ namespace glabels
 		// empty
 	}
 
-}
+} // namespace glabels

glabels/LabelModelObject.h

@@ -22,11 +22,6 @@
 #define LabelModelObject_h
 
 
-#include <QObject>
-#include <QFont>
-#include <QMatrix>
-#include <QPainter>
-
 #include "BarcodeStyle.h"
 #include "ColorNode.h"
 #include "Distance.h"
@@ -36,6 +31,11 @@
 
 #include "Merge/Record.h"
 
+#include <QObject>
+#include <QFont>
+#include <QMatrix>
+#include <QPainter>
+
 
 namespace glabels
 {

glabels/LabelModelShapeObject.cpp

@@ -20,7 +20,6 @@
 
 #include "LabelModelShapeObject.h"
 
-
 #include <QBrush>
 #include <QPen>
 
@@ -168,4 +167,4 @@ namespace glabels
 		return true;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelTextObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelTextObject.h"
 
+#include "Size.h"
 
 #include <QBrush>
 #include <QPen>
@@ -28,8 +29,6 @@
 #include <QRegularExpression>
 #include <QtDebug>
 
-#include "Size.h"
-
 
 namespace glabels
 {
@@ -693,4 +692,4 @@ namespace glabels
 		return text;
 	}
 
-}
+} // namespace glabels

glabels/LabelModelTextObject.h

@@ -22,10 +22,10 @@
 #define LabelModelTextObject_h
 
 
-#include <QTextLayout>
-
 #include "LabelModelObject.h"
 
+#include <QTextLayout>
+
 
 namespace glabels
 {

glabels/Layout.cpp

@@ -20,11 +20,10 @@
 
 #include "Layout.h"
 
+#include "Constants.h"
 
 #include <cmath>
 
-#include "Constants.h"
-
 
 namespace glabels
 {
@@ -102,4 +101,4 @@ namespace glabels
 		return other;
 	}
 
-}
+} // namespace glabels

glabels/MainWindow.cpp

@@ -20,23 +20,6 @@
 
 #include "MainWindow.h"
 
-
-#include <QAction>
-#include <QClipboard>
-#include <QCloseEvent>
-#include <QFrame>
-#include <QLabel>
-#include <QListWidget>
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QScrollArea>
-#include <QSettings>
-#include <QStackedWidget>
-#include <QStatusBar>
-#include <QToolBar>
-#include <QtDebug>
-
 #include "Db.h"
 #include "File.h"
 #include "Help.h"
@@ -51,6 +34,13 @@
 #include "StartupView.h"
 #include "UndoRedoModel.h"
 
+#include <QClipboard>
+#include <QFrame>
+#include <QMessageBox>
+#include <QSettings>
+#include <QStatusBar>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -1544,4 +1534,4 @@ namespace glabels
 		editRedoAction->setEnabled( mUndoRedoModel->canRedo() );
 	}
 
-}
+} // namespace glabels

glabels/Markup.cpp

@@ -209,4 +209,4 @@ namespace glabels
 		return mR;
 	}
 
-}
+} // namespace glabels

glabels/Markup.h

@@ -22,10 +22,10 @@
 #define glabels_Markup_h
 
 
-#include <QPainterPath>
-
 #include "Frame.h"
 
+#include <QPainterPath>
+
 
 namespace glabels
 {

glabels/Merge/Factory.cpp

@@ -219,6 +219,6 @@ namespace glabels
 			mNameList << name;
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/Factory.h

@@ -21,6 +21,7 @@
 #ifndef merge_Factory_h
 #define merge_Factory_h
 
+
 #include <QCoreApplication>
 #include <QStringList>
 #include <QMap>

glabels/Merge/Merge.cpp

@@ -210,6 +210,6 @@ namespace glabels
 			return list;
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/Merge.h

@@ -21,6 +21,7 @@
 #ifndef merge_Merge_h
 #define merge_Merge_h
 
+
 #include <QObject>
 #include <QString>
 #include <QStringList>

glabels/Merge/None.cpp

@@ -122,6 +122,6 @@ namespace glabels
 			return nullptr;
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/Record.cpp

@@ -70,6 +70,6 @@ namespace glabels
 			mSelected = value;
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/Record.h

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

glabels/Merge/Text.cpp

@@ -21,6 +21,7 @@
 #include "Text.h"
 
 #include "Record.h"
+
 #include <QtDebug>
 
 
@@ -415,6 +416,6 @@ namespace glabels
 			return fields;
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextColon.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextColon();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextColon.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextColon_h
 #define merge_TextColon_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextColonKeys.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextColonKeys();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextColonKeys.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextColonKeys_h
 #define merge_TextColonKeys_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextCsv.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextCsv();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextCsv.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextCsv_h
 #define merge_TextCsv_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextCsvKeys.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextCsvKeys();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextCsvKeys.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextCsvKeys_h
 #define merge_TextCsvKeys_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextSemicolon.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextSemicolon();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextSemicolon.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextSemicolon_h
 #define merge_TextSemicolon_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextSemicolonKeys.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextSemicolonKeys();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextSemicolonKeys.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextSemicolonKeys_h
 #define merge_TextSemicolonKeys_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextTsv.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextTsv();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextTsv.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextTsv_h
 #define merge_TextTsv_h
 
+
 #include "Text.h"
 
 

glabels/Merge/TextTsvKeys.cpp

@@ -80,6 +80,6 @@ namespace glabels
 			return new TextTsvKeys();
 		}
 
-	}
+	} // namespace merge
 
-}
+} // namespace glabels

glabels/Merge/TextTsvKeys.h

@@ -21,6 +21,7 @@
 #ifndef merge_TextTsvKeys_h
 #define merge_TextTsvKeys_h
 
+
 #include "Text.h"
 
 

glabels/MergeView.cpp

@@ -20,15 +20,14 @@
 
 #include "MergeView.h"
 
+#include "LabelModel.h"
+
+#include "Merge/Factory.h"
 
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QtDebug>
 
-#include "LabelModel.h"
-
-#include "Merge/Factory.h"
-
 
 namespace glabels
 {
@@ -330,4 +329,4 @@ namespace glabels
 		mBlock = false;
 	}
 
-}
+} // namespace glabels

glabels/MiniPreviewPixmap.cpp

@@ -20,7 +20,6 @@
 
 #include "MiniPreviewPixmap.h"
 
-
 #include "Template.h"
 
 
@@ -135,5 +134,4 @@ namespace glabels
 		painter.restore();
 	}
 
-}
+} // namespace glabels
-

glabels/MiniPreviewPixmap.h

@@ -22,11 +22,11 @@
 #define glabels_MiniPreviewPixmap_h
 
 
+#include "Point.h"
+
 #include <QPixmap>
 #include <QPainter>
 
-#include "Point.h"
-
 
 namespace glabels
 {

glabels/ObjectEditor.cpp

@@ -20,11 +20,6 @@
 
 #include "ObjectEditor.h"
 
-
-#include <QFileDialog>
-#include <QtMath>
-#include <QtDebug>
-
 #include "LabelModel.h"
 #include "LabelModelObject.h"
 #include "LabelModelBoxObject.h"
@@ -38,6 +33,10 @@
 
 #include "Merge/Merge.h"
 
+#include <QFileDialog>
+#include <QtMath>
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -697,4 +696,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/ObjectEditor.h

@@ -22,12 +22,12 @@
 #define ObjectEditor_h
 
 
-#include <QButtonGroup>
-
 #include "ui_ObjectEditor.h"
 
 #include "Distance.h"
 
+#include <QButtonGroup>
+
 
 namespace glabels
 {

glabels/Outline.cpp

@@ -20,11 +20,10 @@
 
 #include "Outline.h"
 
+#include "LabelModelObject.h"
 
 #include <QColor>
 
-#include "LabelModelObject.h"
-
 
 namespace glabels
 {
@@ -133,4 +132,4 @@ namespace glabels
 		return path;
 	}
 
-}
+} // namespace glabels

glabels/PageRenderer.cpp

@@ -20,15 +20,14 @@
 
 #include "PageRenderer.h"
 
-
-#include <QtDebug>
-
 #include "LabelModel.h"
 
 #include "Merge/Merge.h"
 #include "Merge/None.h"
 #include "Merge/Record.h"
 
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -396,4 +395,4 @@ namespace glabels
 		painter->restore();
 	}
 
-}
+} // namespace glabels

glabels/PageRenderer.h

@@ -22,15 +22,15 @@
 #define PageRenderer_h
 
 
-#include <QPainter>
-#include <QRect>
-#include <QVector>
-
 #include "Point.h"
 
 #include "Merge/Merge.h"
 #include "Merge/Record.h"
 
+#include <QPainter>
+#include <QRect>
+#include <QVector>
+
 
 namespace glabels
 {

glabels/Paper.cpp

@@ -76,4 +76,4 @@ namespace glabels
 		return mPwgSize.startsWith( "na_" );
 	}
 
-}
+} // namespace glabels

glabels/Paper.h

@@ -22,10 +22,10 @@
 #define glabels_Paper_h
 
 
-#include <QString>
-
 #include "Distance.h"
 
+#include <QString>
+
 
 namespace glabels
 {

glabels/Point.cpp

@@ -61,4 +61,4 @@ namespace glabels
 		return false;
 	}
 
-}
+} // namespace glabels

glabels/PreferencesDialog.cpp

@@ -20,7 +20,6 @@
 
 #include "PreferencesDialog.h"
 
-
 #include "Settings.h"
 
 
@@ -83,4 +82,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/Preview.cpp

@@ -20,14 +20,13 @@
 
 #include "Preview.h"
 
+#include "LabelModel.h"
+#include "PreviewOverlayItem.h"
 
 #include <QGraphicsDropShadowEffect>
 #include <QGraphicsRectItem>
 #include <QtDebug>
 
-#include "LabelModel.h"
-#include "PreviewOverlayItem.h"
-
 
 namespace glabels
 {
@@ -199,4 +198,4 @@ namespace glabels
 		}
 	}
 
-}
+} // namespace glabels

glabels/Preview.h

@@ -22,11 +22,11 @@
 #define Preview_h
 
 
+#include "PageRenderer.h"
+
 #include <QGraphicsView>
 #include <QGraphicsScene>
 
-#include "PageRenderer.h"
-
 
 namespace glabels
 {

glabels/PreviewOverlayItem.cpp

@@ -20,11 +20,10 @@
 
 #include "PreviewOverlayItem.h"
 
+#include "PageRenderer.h"
 
 #include <QtDebug>
 
-#include "PageRenderer.h"
-
 
 namespace glabels
 {
@@ -47,4 +46,4 @@ namespace glabels
 		mRenderer->printPage( painter );
 	}
 
-}
+} // namespace glabels