Reconcile style of include directives across all source files.

CODING-STYLE.md

@@ -1,6 +1,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.
+
+
 Tabs vs. Spaces
 ---------------
 
@@ -40,3 +44,53 @@ else
 Also applies to class and namespace declaration statements.
 
 See https://en.wikipedia.org/wiki/Indent_style#Allman_style for more information.
+
+
+File Organization
+-----------------
+
+Generally code is organized into modules.  Usually a module defines a single class or a small namespace of
+functions/constants/etc.  A module is defined by two files: a header file (its specification) and an
+implementation file.  Header filenames have a ".h" extension and implementation filenames have a ".cpp"
+extension.
+
+
+### Self-contained Headers
+
+Header files should be self-contained.  I.e. they should not require any prerequisite includes.  To enforce
+this requirement, an implementation file shall include its header file before any other includes.
+
+
+### Multiple Inclusion Guards
+
+All header files should have an ifndef guard to prevent multiple inclusion.
+
+```
+#ifndef ns_Module_h
+#define ns_Module_h
+
+...
+
+#endif // ns_Module_h
+```
+
+### Include Directives
+
+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, e.g. <cmath> instead of <math.h>.
+3. C++ system header files (e.g. STL files)
+4. Qt header files
+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.  They should NEVER include UNIX directory shortcuts such as "."
+(the current directory) or ".." (the parent directory).
+
+Angle brackets ("<>") should be used for inclusion of all external header files (such as C/C++ and Qt
+header files). Double quotes should be used for all glabels header files.
+
+Do not use forward declarations to any external entities.  Use the appropriate include directive instead.
+

glabels/AboutDialog.cpp

@@ -20,11 +20,13 @@
 
 #include "AboutDialog.h"
 
-#include "Version.h"
+
-#include <QUrl>
 #include <QDesktopServices>
+#include <QUrl>
 #include <QtDebug>
 
+#include "Version.h"
+
 
 ///
 /// Constructor

glabels/AboutDialog.h

@@ -21,6 +21,7 @@
 #ifndef AboutDialog_h
 #define AboutDialog_h
 
+
 #include "ui_AboutDialog.h"
 
 

glabels/BarcodeBackends.h

@@ -21,12 +21,13 @@
 #ifndef BarcodeBackends_h
 #define BarcodeBackends_h
 
-#include "BarcodeStyle.h"
 
+#include <QList>
+#include <QMap>
 #include <QObject>
 #include <QString>
-#include <QMap>
+
-#include <QList>
+#include "BarcodeStyle.h"
 
 
 ///

glabels/BarcodeMenu.cpp

@@ -20,6 +20,7 @@
 
 #include "BarcodeMenu.h"
 
+
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 

glabels/BarcodeMenu.h

@@ -21,7 +21,9 @@
 #ifndef BarcodeMenu_h
 #define BarcodeMenu_h
 
+
 #include <QMenu>
+
 #include "BarcodeStyle.h"
 
 

glabels/BarcodeMenuButton.cpp

@@ -20,6 +20,7 @@
 
 #include "BarcodeMenuButton.h"
 
+
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 

glabels/BarcodeMenuButton.h

@@ -21,7 +21,9 @@
 #ifndef BarcodeMenuButton_h
 #define BarcodeMenuButton_h
 
+
 #include <QPushButton>
+
 #include "BarcodeMenu.h"
 #include "BarcodeStyle.h"
 

glabels/BarcodeMenuItem.h

@@ -21,7 +21,9 @@
 #ifndef BarcodeMenuItem_h
 #define BarcodeMenuItem_h
 
+
 #include <QAction>
+
 #include "BarcodeStyle.h"
 
 

glabels/CMakeLists.txt

@@ -33,12 +33,11 @@ set (glabels_sources
   Cursors.cpp
   EnumUtil.cpp
   FieldButton.cpp
-  FieldMenu.cpp
-  FieldMenuItem.cpp
   File.cpp
   FileUtil.cpp
   Handles.cpp
   Help.cpp
+  Icons.cpp
   LabelEditor.cpp
   LabelModel.cpp
   LabelModelObject.cpp
@@ -83,8 +82,6 @@ set (glabels_qobject_headers
   ColorPaletteItem.h
   ColorPaletteButtonItem.h
   FieldButton.h
-  FieldMenu.h
-  FieldMenuItem.h
   File.h
   LabelEditor.h
   LabelModel.h

glabels/ColorButton.cpp

@@ -20,11 +20,13 @@
 
 #include "ColorButton.h"
 
-#include "ColorSwatch.h"
+
-#include <QIcon>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QtDebug>
 
+#include "ColorSwatch.h"
+
 
 namespace
 {

glabels/ColorButton.h

@@ -21,6 +21,7 @@
 #ifndef ColorButton_h
 #define ColorButton_h
 
+
 #include <QPushButton>
 
 #include "ColorNode.h"

glabels/ColorHistory.cpp

@@ -20,6 +20,7 @@
 
 #include "ColorHistory.h"
 
+
 #include <QSettings>
 #include <QtDebug>
 

glabels/ColorHistory.h

@@ -21,8 +21,9 @@
 #ifndef ColorHistory_h
 #define ColorHistory_h
 
-#include <QObject>
+
 #include <QColor>
+#include <QObject>
 
 
 ///

glabels/ColorNode.cpp

@@ -20,6 +20,7 @@
 
 #include "ColorNode.h"
 
+
 #include "Merge/Record.h"
 
 

glabels/ColorNode.h

@@ -21,9 +21,12 @@
 #ifndef ColorNode_h
 #define ColorNode_h
 
+
+#include <cstdint>
+
 #include <QString>
 #include <QColor>
-#include <cstdint>
+
 #include "Merge/Record.h"
 
 

glabels/ColorPaletteButtonItem.cpp

@@ -21,8 +21,8 @@
 #include "ColorPaletteButtonItem.h"
 
 
-#include <QPainter>
 #include <QMouseEvent>
+#include <QPainter>
 
 
 //

glabels/ColorPaletteButtonItem.h

@@ -21,8 +21,9 @@
 #ifndef ColorPaletteButtonItem_h
 #define ColorPaletteButtonItem_h
 
-#include <QWidget>
+
 #include <QColor>
+#include <QWidget>
 
 
 ///

glabels/ColorPaletteDialog.cpp

@@ -20,12 +20,12 @@
 
 #include "ColorPaletteDialog.h"
 
+
+#include <QColorDialog>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QGridLayout>
 #include <QFrame>
-#include <QColorDialog>
+#include <QGridLayout>
-#include <QComboBox>
 #include <QStandardItemModel>
 #include <QtDebug>
 

glabels/ColorPaletteDialog.h

@@ -21,16 +21,14 @@
 #ifndef ColorPaletteDialog_h
 #define ColorPaletteDialog_h
 
-#include <QObject>
+
+#include <QComboBox>
 #include <QDialog>
 
 #include "ColorNode.h"
 #include "ColorHistory.h"
 #include "ColorPaletteItem.h"
 #include "ColorPaletteButtonItem.h"
-#include "FieldMenu.h"
-
-class QComboBox; // Forward reference
 
 
 ///

glabels/ColorPaletteItem.cpp

@@ -21,8 +21,8 @@
 #include "ColorPaletteItem.h"
 
 
-#include <QPainter>
 #include <QMouseEvent>
+#include <QPainter>
 
 
 //

glabels/ColorPaletteItem.h

@@ -21,8 +21,9 @@
 #ifndef ColorPaletteItem_h
 #define ColorPaletteItem_h
 
-#include <QWidget>
+
 #include <QColor>
+#include <QWidget>
 
 
 ///

glabels/ColorSwatch.cpp

@@ -20,6 +20,7 @@
 
 #include "ColorSwatch.h"
 
+
 #include <QPainter>
 
 

glabels/ColorSwatch.h

@@ -21,6 +21,7 @@
 #ifndef ColorSwatch_h
 #define ColorSwatch_h
 
+
 #include <QPixmap>
 
 

glabels/Cursors.cpp

@@ -20,7 +20,6 @@
 
 #include "Cursors.h"
 
-
 #include <QPixmap>
 
 

glabels/EnumUtil.h

@@ -21,8 +21,9 @@
 #ifndef EnumUtil_h
 #define EnumUtil_h
 
-#include <QString>
+
 #include <QFont>
+#include <QString>
 #include <Qt>
 
 

glabels/FieldButton.cpp

@@ -20,8 +20,9 @@
 
 #include "FieldButton.h"
 
-#include <QStandardItemModel>
+
 #include <QLineEdit>
+#include <QStandardItemModel>
 
 
 ///

glabels/FieldButton.h

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

glabels/FieldMenu.cpp

@@ -1,57 +0,0 @@
-/*  FieldMenu.cpp
- *
- *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "FieldMenu.h"
-
-#include "FieldMenuItem.h"
-
-
-///
-/// Constructor
-///
-FieldMenu::FieldMenu()
-{
-}
-
-
-///
-/// set keys
-///
-void FieldMenu::setKeys( const QStringList& keyList )
-{
-	clear();
-
-	foreach ( QString key, keyList )
-	{
-		FieldMenuItem* menuItem = new FieldMenuItem( key );
-		connect( menuItem, SIGNAL(activated(QString)), this, SLOT(onMenuItemActivated(QString)) );
-
-		addAction( menuItem );
-	}
-}
-
-
-///
-/// onMenuItemActivated slot
-///
-void FieldMenu::onMenuItemActivated( QString key )
-{
-	emit keySelected( key );
-}

glabels/FieldMenu.h

@@ -1,71 +0,0 @@
-/*  FieldMenu.h
- *
- *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FieldMenu_h
-#define FieldMenu_h
-
-#include <QMenu>
-#include <QString>
-
-
-///
-/// Field Menu
-///
-class FieldMenu : public QMenu
-{
-	Q_OBJECT
-
-	/////////////////////////////////
-	// Life Cycle
-	/////////////////////////////////
-public:
-	FieldMenu();
-
-
-	/////////////////////////////////
-	// Signals
-	/////////////////////////////////
-signals:
-	void keySelected( QString key );
-
-
-	/////////////////////////////////
-	// Public Methods
-	/////////////////////////////////
-public:
-	void setKeys( const QStringList& keyList );
-
-
-	/////////////////////////////////
-	// Slots
-	/////////////////////////////////
-private slots:
-	void onMenuItemActivated( QString key );
-
-
-	/////////////////////////////////
-	// Private Data
-	/////////////////////////////////
-private:
-
-};
-
-
-#endif // FieldMenu_h

glabels/FieldMenuItem.h

@@ -1,72 +0,0 @@
-/*  FieldMenuItem.h
- *
- *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
- *
- *  This file is part of gLabels-qt.
- *
- *  gLabels-qt is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  gLabels-qt is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef FieldMenuItem_h
-#define FieldMenuItem_h
-
-#include <QAction>
-#include <QString>
-
-
-///
-/// Field Menu Item
-///
-class FieldMenuItem : public QAction
-{
-	Q_OBJECT
-
-	/////////////////////////////////
-	// Life Cycle
-	/////////////////////////////////
-public:
-	FieldMenuItem( const QString& key, QObject* parent = 0 );
-
-
-	/////////////////////////////////
-	// Signals
-	/////////////////////////////////
-signals:
-	void activated( QString key );
-
-
-	/////////////////////////////////
-	// Properties
-	/////////////////////////////////
-public:
-	QString key() const;
-
-
-	/////////////////////////////////
-	// Slots
-	/////////////////////////////////
-private slots:
-	void onTriggered();
-
-
-	/////////////////////////////////
-	// Private Data
-	/////////////////////////////////
-private:
-	const QString mKey;
-
-};
-
-
-#endif // FieldMenuItem_h

glabels/File.cpp

@@ -20,15 +20,17 @@
 
 #include "File.h"
 
-#include "MainWindow.h"
+
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QtDebug>
+
+#include "FileUtil.h"
 #include "LabelModel.h"
+#include "MainWindow.h"
 #include "SelectProductDialog.h"
 #include "XmlLabelParser.h"
 #include "XmlLabelCreator.h"
-#include "FileUtil.h"
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QDebug>
 
 
 ///

glabels/File.h

@@ -24,7 +24,7 @@
 
 #include <QObject>
 
-
+// Forward References
 class MainWindow;
 
 

glabels/FileUtil.h

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

glabels/Handles.cpp

@@ -21,11 +21,11 @@
 #include "Handles.h"
 
 
-#include "LabelModelObject.h"
-
 #include <QColor>
 #include <QtDebug>
 
+#include "LabelModelObject.h"
+
 
 namespace
 {

glabels/Handles.h

@@ -24,9 +24,10 @@
 
 #include <QPainter>
 #include <QPainterPath>
+
 #include "libglabels/Distance.h"
 
-
+// Forward References
 class LabelModelObject;
 
 

glabels/Help.cpp

@@ -20,9 +20,10 @@
 
 #include "Help.h"
 
-#include "AboutDialog.h"
 
-#include <iostream>
+#include <QtDebug>
+
+#include "AboutDialog.h"
 
 
 ///
@@ -30,7 +31,7 @@
 ///
 void Help::displayContents( QWidget *parent )
 {
-	std::cout << "TODO: Help::displayContents" << std::endl;
+	qDebug() << "TODO: Help::displayContents";
 }
 
 

glabels/Icons.cpp

@@ -1,6 +1,6 @@
-/*  FieldMenuItem.cpp
+/*  Icons.cpp
  *
- *  Copyright (C) 2014  Jim Evins <evins@snaught.com>
+ *  Copyright (C) 2017  Jim Evins <evins@snaught.com>
  *
  *  This file is part of gLabels-qt.
  *
@@ -18,34 +18,4 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "FieldMenuItem.h"
+#include "Icons.h"
-
-
-///
-/// Constructor From Data
-///
-FieldMenuItem::FieldMenuItem( const QString& key, QObject* parent )
-	: QAction(parent), mKey(key)
-{
-	setText( key );
-
-	connect( this, SIGNAL(triggered()), this, SLOT(onTriggered()) );
-}
-
-
-///
-/// key Property Getter
-///
-QString FieldMenuItem::key() const
-{
-	return mKey;
-}
-
-
-///
-/// onTriggered slot
-///
-void FieldMenuItem::onTriggered()
-{
-	emit activated( mKey );
-}

glabels/Icons.h

@@ -21,6 +21,7 @@
 #ifndef Icons_h
 #define Icons_h
 
+
 #include <QIcon>
 
 

glabels/LabelEditor.cpp

@@ -20,10 +20,12 @@
 
 #include "LabelEditor.h"
 
-#include <QtMath>
+
 #include <QMouseEvent>
+#include <QtMath>
 #include <QtDebug>
 
+#include "Cursors.h"
 #include "LabelModel.h"
 #include "LabelModelObject.h"
 #include "LabelModelBoxObject.h"
@@ -31,9 +33,8 @@
 #include "LabelModelImageObject.h"
 #include "LabelModelLineObject.h"
 #include "LabelModelTextObject.h"
-#include "UndoRedoModel.h"
 #include "Settings.h"
-#include "Cursors.h"
+#include "UndoRedoModel.h"
 
 #include "libglabels/Markup.h"
 #include "libglabels/FrameRect.h"

glabels/LabelEditor.h

@@ -21,13 +21,13 @@
 #ifndef LabelEditor_h
 #define LabelEditor_h
 
-#include <QWidget>
+
-#include <QScrollArea>
 #include <QPainter>
+#include <QScrollArea>
+#include <QWidget>
 
 #include "Region.h"
 
-
 // Forward References
 class LabelModel;
 class LabelModelObject;

glabels/LabelModel.cpp

@@ -20,18 +20,20 @@
 
 #include "LabelModel.h"
 
-#include <QFileInfo>
+
 #include <QApplication>
 #include <QClipboard>
+#include <QFileInfo>
 #include <QMimeData>
 #include <QtDebug>
 
-#include "Merge/None.h"
 #include "LabelModelObject.h"
 #include "Region.h"
 #include "XmlLabelCreator.h"
 #include "XmlLabelParser.h"
 
+#include "Merge/None.h"
+
 
 namespace
 {

glabels/LabelModel.h

@@ -21,22 +21,23 @@
 #ifndef LabelModel_h
 #define LabelModel_h
 
-#include <QObject>
-#include <QList>
-#include <QPainter>
 
-#include "libglabels/Template.h"
+#include <QList>
-#include "Merge/Merge.h"
+#include <QObject>
-#include "Merge/Record.h"
+#include <QPainter>
 
 #include "Settings.h"
 
+#include "Merge/Merge.h"
+#include "Merge/Record.h"
+
+#include "libglabels/Template.h"
 
 // Forward References
-class LabelModelObject;
-class Handle;
-class Region;
 class ColorNode;
+class Handle;
+class LabelModelObject;
+class Region;
 
 
 //////////////////////////////////////////////

glabels/LabelModelBoxObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelBoxObject.h"
 
+
 #include <QBrush>
 #include <QPen>
 

glabels/LabelModelEllipseObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelEllipseObject.h"
 
+
 #include <QBrush>
 #include <QPen>
 

glabels/LabelModelImageObject.cpp

@@ -20,13 +20,15 @@
 
 #include "LabelModelImageObject.h"
 
-#include "Size.h"
+
 #include <QBrush>
-#include <QPen>
-#include <QImage>
 #include <QFileInfo>
+#include <QImage>
+#include <QPen>
 #include <QtDebug>
 
+#include "Size.h"
+
 
 namespace
 {

glabels/LabelModelImageObject.h

@@ -21,10 +21,11 @@
 #ifndef LabelModelImageObject_h
 #define LabelModelImageObject_h
 
-#include "LabelModelObject.h"
 
 #include <QSvgRenderer>
 
+#include "LabelModelObject.h"
+
 
 ///
 /// Label Model Image Object

glabels/LabelModelLineObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelLineObject.h"
 
+
 #include <QBrush>
 #include <QPen>
 

glabels/LabelModelLineObject.h

@@ -21,6 +21,7 @@
 #ifndef LabelModelLineObject_h
 #define LabelModelLineObject_h
 
+
 #include "LabelModelObject.h"
 
 

glabels/LabelModelObject.cpp

@@ -20,14 +20,15 @@
 
 #include "LabelModelObject.h"
 
+
 #include <QFont>
 #include <QtDebug>
 
 #include "ColorNode.h"
-#include "TextNode.h"
 #include "BarcodeStyle.h"
 #include "Region.h"
 #include "Size.h"
+#include "TextNode.h"
 
 
 ///

glabels/LabelModelObject.h

@@ -21,19 +21,21 @@
 #ifndef LabelModelObject_h
 #define LabelModelObject_h
 
+
 #include <QObject>
 #include <QFont>
 #include <QMatrix>
 #include <QPainter>
 
-#include "libglabels/Distance.h"
-#include "Merge/Record.h"
 #include "ColorNode.h"
 #include "TextNode.h"
 #include "BarcodeStyle.h"
 #include "Handles.h"
 #include "Outline.h"
 
+#include "Merge/Record.h"
+
+#include "libglabels/Distance.h"
 
 // Forward References
 class Region;

glabels/LabelModelShapeObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelShapeObject.h"
 
+
 #include <QBrush>
 #include <QPen>
 

glabels/LabelModelShapeObject.h

@@ -21,6 +21,7 @@
 #ifndef LabelModelShapeObject_h
 #define LabelModelShapeObject_h
 
+
 #include "LabelModelObject.h"
 
 

glabels/LabelModelTextObject.cpp

@@ -20,6 +20,7 @@
 
 #include "LabelModelTextObject.h"
 
+
 #include <QBrush>
 #include <QPen>
 #include <QTextDocument>

glabels/LabelModelTextObject.h

@@ -21,10 +21,11 @@
 #ifndef LabelModelTextObject_h
 #define LabelModelTextObject_h
 
-#include "LabelModelObject.h"
 
 #include <QTextLayout>
 
+#include "LabelModelObject.h"
+
 
 ///
 /// Label Model Line Object

glabels/MainWindow.cpp

@@ -20,35 +20,37 @@
 
 #include "MainWindow.h"
 
-#include <QClipboard>
-#include <QSettings>
-#include <QStatusBar>
-#include <QFrame>
-#include <QScrollArea>
-#include <QAction>
-#include <QCloseEvent>
-#include <QMenuBar>
-#include <QMenu>
-#include <QToolBar>
-#include <QListWidget>
-#include <QStackedWidget>
-#include <QLabel>
-#include <QMessageBox>
-#include <QDebug>
 
-#include "libglabels/Db.h"
+#include <QAction>
-#include "PreferencesDialog.h"
+#include <QClipboard>
-#include "StartupView.h"
+#include <QCloseEvent>
-#include "PropertiesView.h"
+#include <QFrame>
-#include "LabelEditor.h"
+#include <QLabel>
-#include "ObjectEditor.h"
+#include <QListWidget>
-#include "MergeView.h"
+#include <QMenu>
-#include "PrintView.h"
+#include <QMenuBar>
-#include "LabelModel.h"
+#include <QMessageBox>
-#include "UndoRedoModel.h"
+#include <QScrollArea>
-#include "Icons.h"
+#include <QSettings>
+#include <QStackedWidget>
+#include <QStatusBar>
+#include <QToolBar>
+#include <QtDebug>
+
 #include "File.h"
 #include "Help.h"
+#include "Icons.h"
+#include "LabelEditor.h"
+#include "LabelModel.h"
+#include "MergeView.h"
+#include "ObjectEditor.h"
+#include "PreferencesDialog.h"
+#include "PrintView.h"
+#include "PropertiesView.h"
+#include "StartupView.h"
+#include "UndoRedoModel.h"
+
+#include "libglabels/Db.h"
 
 
 ///

glabels/MainWindow.h

@@ -21,29 +21,27 @@
 #ifndef MainWindow_h
 #define MainWindow_h
 
+
+#include <QAction>
+#include <QCloseEvent>
+#include <QLabel>
+#include <QListWidget>
 #include <QMainWindow>
-
+#include <QMenu>
-class QAction;
+#include <QMenuBar>
-class QCloseEvent;
+#include <QScrollArea>
-class QMenuBar;
+#include <QStackedWidget>
-class QMenu;
+#include <QToolBar>
-class QToolBar;
-class QLabel;
-class QListWidget;
-class QListWidgetItem;
-class QStackedWidget;
-class QScrollArea;
-
 
 // Forward References
-class LabelModel;
-class UndoRedoModel;
-class StartupView;
-class PropertiesView;
 class LabelEditor;
-class ObjectEditor;
+class LabelModel;
 class MergeView;
+class ObjectEditor;
 class PrintView;
+class PropertiesView;
+class StartupView;
+class UndoRedoModel;
 
 
 ///

glabels/MergeView.cpp

@@ -20,12 +20,15 @@
 
 #include "MergeView.h"
 
-#include "LabelModel.h"
+
-#include "Merge/Factory.h"
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QtDebug>
 
+#include "LabelModel.h"
+
+#include "Merge/Factory.h"
+
 
 ///
 /// Constructor

glabels/MergeView.h

@@ -21,9 +21,10 @@
 #ifndef MergeView_h
 #define MergeView_h
 
-#include "ui_MergeView.h"
-#include "Merge/Merge.h"
 
+#include "ui_MergeView.h"
+
+#include "Merge/Merge.h"
 
 // Forward references
 class LabelModel;

glabels/ObjectEditor.cpp

@@ -21,6 +21,10 @@
 #include "ObjectEditor.h"
 
 
+#include <QFileDialog>
+#include <QtMath>
+#include <QtDebug>
+
 #include "LabelModel.h"
 #include "LabelModelObject.h"
 #include "LabelModelBoxObject.h"
@@ -28,17 +32,12 @@
 #include "LabelModelImageObject.h"
 #include "LabelModelLineObject.h"
 #include "LabelModelTextObject.h"
-#include "UndoRedoModel.h"
+#include "Settings.h"
 #include "Size.h"
+#include "UndoRedoModel.h"
 
 #include "Merge/Merge.h"
 
-#include "Settings.h"
-
-#include <QFileDialog>
-#include <QtMath>
-#include <QtDebug>
-
 
 ///
 /// Constructor

glabels/ObjectEditor.h

@@ -21,10 +21,12 @@
 #ifndef ObjectEditor_h
 #define ObjectEditor_h
 
-#include "ui_ObjectEditor.h"
+
-#include "libglabels/Distance.h"
 #include <QButtonGroup>
 
+#include "ui_ObjectEditor.h"
+
+#include "libglabels/Distance.h"
 
 // Forward references
 class LabelModel;

glabels/Outline.cpp

@@ -21,10 +21,10 @@
 #include "Outline.h"
 
 
-#include "LabelModelObject.h"
-
 #include <QColor>
 
+#include "LabelModelObject.h"
+
 
 namespace
 {

glabels/Outline.h

@@ -25,7 +25,7 @@
 #include <QPainter>
 #include <QPainterPath>
 
-
+// Forward references
 class LabelModelObject;
 
 

glabels/PageRenderer.cpp

@@ -20,14 +20,15 @@
 
 #include "PageRenderer.h"
 
+
+#include <QtDebug>
+
 #include "LabelModel.h"
+
 #include "Merge/Merge.h"
 #include "Merge/None.h"
 #include "Merge/Record.h"
 
-#include <QPainter>
-#include <QtDebug>
-
 
 namespace
 {

glabels/PageRenderer.h

@@ -22,16 +22,16 @@
 #define PageRenderer_h
 
 
-#include "libglabels/Point.h"
+#include <QPainter>
+#include <QRect>
+#include <QVector>
 
 #include "Merge/Merge.h"
 #include "Merge/Record.h"
 
-#include <QVector>
+#include "libglabels/Point.h"
-#include <QRect>
 
 // Forward references
-class QPainter;
 class LabelModel;
 
 

glabels/PreferencesDialog.cpp

@@ -20,6 +20,7 @@
 
 #include "PreferencesDialog.h"
 
+
 #include "Settings.h"
 
 

glabels/PreferencesDialog.h

@@ -21,6 +21,7 @@
 #ifndef PreferencesDialog_h
 #define PreferencesDialog_h
 
+
 #include "ui_PreferencesDialog.h"
 
 
@@ -31,7 +32,6 @@ class PreferencesDialog : public QDialog, public Ui_PreferencesDialog
 {
 	Q_OBJECT
 
-
 	/////////////////////////////////
 	// Life Cycle
 	/////////////////////////////////

glabels/Preview.cpp

@@ -20,13 +20,14 @@
 
 #include "Preview.h"
 
+
+#include <QGraphicsDropShadowEffect>
+#include <QGraphicsRectItem>
+#include <QtDebug>
+
 #include "LabelModel.h"
 #include "PreviewOverlayItem.h"
 
-#include <QGraphicsRectItem>
-#include <QGraphicsDropShadowEffect>
-#include <QtDebug>
-
 
 //
 // Private Configuration Data

glabels/Preview.h

@@ -21,13 +21,14 @@
 #ifndef Preview_h
 #define Preview_h
 
+
 #include <QGraphicsView>
 #include <QGraphicsScene>
 
 #include "PageRenderer.h"
 
-
+// Forward references
-class LabelModel; // Forward reference
+class LabelModel;
 
 
 ///

glabels/PreviewOverlayItem.cpp

@@ -20,9 +20,11 @@
 
 #include "PreviewOverlayItem.h"
 
-#include "PageRenderer.h"
+
 #include <QtDebug>
 
+#include "PageRenderer.h"
+
 
 PreviewOverlayItem::PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent )
 	: QGraphicsItem(parent), mRenderer(renderer)

glabels/PreviewOverlayItem.h

@@ -21,10 +21,11 @@
 #ifndef PreviewOverlayItem_h
 #define PreviewOverlayItem_h
 
+
 #include <QGraphicsItem>
 
-
+// Forward references
-class PageRenderer; // Forward reference
+class PageRenderer;
 
 
 ///

glabels/PrintView.cpp

@@ -20,11 +20,12 @@
 
 #include "PrintView.h"
 
-#include "LabelModel.h"
 
 #include <QPrintDialog>
 #include <QtDebug>
 
+#include "LabelModel.h"
+
 
 ///
 /// Constructor

glabels/PrintView.h

@@ -21,13 +21,14 @@
 #ifndef PrintView_h
 #define PrintView_h
 
-#include "ui_PrintView.h"
-#include "PageRenderer.h"
 
 #include <QPrinter>
 
+#include "ui_PrintView.h"
+#include "PageRenderer.h"
 
-class LabelModel;  // Forward reference
+// Forward references
+class LabelModel;
 	
 
 ///

glabels/PropertiesView.cpp

@@ -20,15 +20,17 @@
 
 #include "PropertiesView.h"
 
-#include "LabelModel.h"
-#include "UndoRedoModel.h"
-#include "Settings.h"
 
-#include "libglabels/Db.h"
-#include "SelectProductDialog.h"
 #include <QStyledItemDelegate>
 #include <QtDebug>
 
+#include "LabelModel.h"
+#include "SelectProductDialog.h"
+#include "Settings.h"
+#include "UndoRedoModel.h"
+
+#include "libglabels/Db.h"
+
 
 ///
 /// Constructor

glabels/PropertiesView.h

@@ -21,6 +21,7 @@
 #ifndef PropertiesView_h
 #define PropertiesView_h
 
+
 #include "ui_PropertiesView.h"
 
 #include "libglabels/Units.h"

glabels/Region.h

@@ -21,7 +21,9 @@
 #ifndef Region_h
 #define Region_h
 
+
 #include <QRectF>
+
 #include "libglabels/Distance.h"
 
 

glabels/SelectProductDialog.cpp

@@ -20,12 +20,14 @@
 
 #include "SelectProductDialog.h"
 
-#include "libglabels/Db.h"
-#include "TemplatePickerItem.h"
-#include "Settings.h"
 
 #include <QtDebug>
 
+#include "Settings.h"
+#include "TemplatePickerItem.h"
+
+#include "libglabels/Db.h"
+
 
 ///
 /// Constructor

glabels/SelectProductDialog.h

@@ -21,9 +21,11 @@
 #ifndef SelectProductDialog_h
 #define SelectProductDialog_h
 
-#include "ui_SelectProductDialog.h"
+
 #include <QBasicTimer>
 
+#include "ui_SelectProductDialog.h"
+
 
 ///
 /// New Label Dialog Widget

glabels/Settings.cpp

@@ -20,6 +20,7 @@
 
 #include "Settings.h"
 
+
 #include <QLocale>
 #include <QString>
 #include <QtDebug>

glabels/Settings.h

@@ -23,9 +23,10 @@
 
 
 #include <QSettings>
-#include "libglabels/Distance.h"
 #include <QStringList>
 
+#include "libglabels/Distance.h"
+
 
 ///
 /// Settings Singleton Class

glabels/SimplePreview.cpp

@@ -20,6 +20,7 @@
 
 #include "SimplePreview.h"
 
+
 #include <QGraphicsRectItem>
 #include <QGraphicsDropShadowEffect>
 #include <QtDebug>

glabels/SimplePreview.h

@@ -21,9 +21,9 @@
 #ifndef SimplePreview_h
 #define SimplePreview_h
 
+
 #include <QGraphicsView>
 #include <QGraphicsScene>
-
 #include <QList>
 
 #include "libglabels/Template.h"

glabels/Size.h

@@ -21,7 +21,9 @@
 #ifndef Size_h
 #define Size_h
 
+
 #include <QSizeF>
+
 #include "libglabels/Distance.h"
 
 

glabels/StartupView.cpp

@@ -20,9 +20,11 @@
 
 #include "StartupView.h"
 
+
+#include <QtDebug>
+
 #include "File.h"
 #include "MainWindow.h"
-#include <QtDebug>
 
 
 ///

glabels/StartupView.h

@@ -21,9 +21,11 @@
 #ifndef StartupView_h
 #define StartupView_h
 
+
 #include "ui_StartupView.h"
 
-class MainWindow; // Forward reference
+// Forward references
+class MainWindow;
 
 
 ///

glabels/TemplatePicker.cpp

@@ -20,6 +20,7 @@
 
 #include "TemplatePicker.h"
 
+
 #include <QIcon>
 
 #include "TemplatePickerItem.h"

glabels/TemplatePicker.h

@@ -21,9 +21,9 @@
 #ifndef TemplatePicker_h
 #define TemplatePicker_h
 
-#include <QListWidget>
 
 #include <QList>
+#include <QListWidget>
 
 #include "libglabels/Template.h"
 

glabels/TemplatePickerItem.cpp

@@ -20,9 +20,10 @@
 
 #include "TemplatePickerItem.h"
 
-#include <QListWidgetItem>
+
-#include <QIcon>
 #include <QHBoxLayout>
+#include <QIcon>
+#include <QListWidgetItem>
 
 
 ///

glabels/TemplatePickerItem.h

@@ -21,9 +21,9 @@
 #ifndef TemplatePickerItem_h
 #define TemplatePickerItem_h
 
-#include <QListWidget>
 
 #include <QLabel>
+#include <QListWidget>
 
 #include "libglabels/Template.h"
 

glabels/TextNode.h

@@ -21,7 +21,9 @@
 #ifndef TextNode_h
 #define TextNode_h
 
+
 #include <QString>
+
 #include "Merge/Record.h"
 
 

glabels/UndoRedoModel.cpp

@@ -20,6 +20,7 @@
 
 #include "UndoRedoModel.h"
 
+
 #include "LabelModel.h"
 
 

glabels/UndoRedoModel.h

@@ -21,10 +21,12 @@
 #ifndef UndoRedoModel_h
 #define UndoRedoModel_h
 
+
+#include <QList>
 #include <QObject>
 #include <QString>
-#include <QList>
 
+// Forward references
 class LabelModel;
 
 

glabels/XmlLabelCreator.cpp

@@ -20,24 +20,28 @@
 
 #include "XmlLabelCreator.h"
 
+
+#include <QByteArray>
+#include <QFile>
+#include <QTextBlock>
+#include <QTextDocument>
+#include <QtDebug>
+
+#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 "LabelModelTextObject.h"
-//#include "LabelModelBarcodeObject.h"
+
-#include "EnumUtil.h"
 #include "Merge/None.h"
+
 #include "libglabels/XmlTemplateCreator.h"
 #include "libglabels/XmlUtil.h"
 
-#include <QFile>
-#include <QByteArray>
-#include <QTextDocument>
-#include <QTextBlock>
-#include <QtDebug>
 
 
 void

glabels/XmlLabelCreator.h

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QDomElement>
 
-
+// Forward references
 class LabelModel;
 class LabelModelObject;
 class LabelModelBoxObject;

glabels/XmlLabelParser.cpp

@@ -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 )

glabels/XmlLabelParser.h

@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QDomElement>
 
-
+// Forward references
 class LabelModel;
 class LabelModelObject;
 class LabelModelBoxObject;

glabels/glabels_main.cpp

@@ -21,11 +21,13 @@
 
 #include <QApplication>
 
-#include "libglabels/Db.h"
-#include "Merge/Factory.h"
 #include "Settings.h"
 #include "MainWindow.h"
 
+#include "Merge/Factory.h"
+
+#include "libglabels/Db.h"
+
 
 int main( int argc, char **argv )
 {

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>