diff --git a/CODING-STYLE.md b/CODING-STYLE.md index ec07ead..c7e3cbd 100644 --- a/CODING-STYLE.md +++ b/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. instead of . +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. + diff --git a/glabels/AboutDialog.cpp b/glabels/AboutDialog.cpp index 3f861f5..cdeca04 100644 --- a/glabels/AboutDialog.cpp +++ b/glabels/AboutDialog.cpp @@ -20,11 +20,13 @@ #include "AboutDialog.h" -#include "Version.h" -#include + #include +#include #include +#include "Version.h" + /// /// Constructor diff --git a/glabels/AboutDialog.h b/glabels/AboutDialog.h index bf44d05..ab6d7af 100644 --- a/glabels/AboutDialog.h +++ b/glabels/AboutDialog.h @@ -21,6 +21,7 @@ #ifndef AboutDialog_h #define AboutDialog_h + #include "ui_AboutDialog.h" diff --git a/glabels/BarcodeBackends.h b/glabels/BarcodeBackends.h index 81d39ab..1057a72 100644 --- a/glabels/BarcodeBackends.h +++ b/glabels/BarcodeBackends.h @@ -21,12 +21,13 @@ #ifndef BarcodeBackends_h #define BarcodeBackends_h -#include "BarcodeStyle.h" +#include +#include #include #include -#include -#include + +#include "BarcodeStyle.h" /// diff --git a/glabels/BarcodeMenu.cpp b/glabels/BarcodeMenu.cpp index 712cd2b..9b226ec 100644 --- a/glabels/BarcodeMenu.cpp +++ b/glabels/BarcodeMenu.cpp @@ -20,6 +20,7 @@ #include "BarcodeMenu.h" + #include "BarcodeBackends.h" #include "BarcodeMenuItem.h" diff --git a/glabels/BarcodeMenu.h b/glabels/BarcodeMenu.h index 14c98d3..4e92ebe 100644 --- a/glabels/BarcodeMenu.h +++ b/glabels/BarcodeMenu.h @@ -21,7 +21,9 @@ #ifndef BarcodeMenu_h #define BarcodeMenu_h + #include + #include "BarcodeStyle.h" diff --git a/glabels/BarcodeMenuButton.cpp b/glabels/BarcodeMenuButton.cpp index 89011b3..04700c9 100644 --- a/glabels/BarcodeMenuButton.cpp +++ b/glabels/BarcodeMenuButton.cpp @@ -20,6 +20,7 @@ #include "BarcodeMenuButton.h" + #include "BarcodeBackends.h" #include "BarcodeMenuItem.h" diff --git a/glabels/BarcodeMenuButton.h b/glabels/BarcodeMenuButton.h index 4b7a7f8..07c9b24 100644 --- a/glabels/BarcodeMenuButton.h +++ b/glabels/BarcodeMenuButton.h @@ -21,7 +21,9 @@ #ifndef BarcodeMenuButton_h #define BarcodeMenuButton_h + #include + #include "BarcodeMenu.h" #include "BarcodeStyle.h" diff --git a/glabels/BarcodeMenuItem.h b/glabels/BarcodeMenuItem.h index b6b93d4..13be99d 100644 --- a/glabels/BarcodeMenuItem.h +++ b/glabels/BarcodeMenuItem.h @@ -21,7 +21,9 @@ #ifndef BarcodeMenuItem_h #define BarcodeMenuItem_h + #include + #include "BarcodeStyle.h" diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index 4f7534a..ab20e09 100644 --- a/glabels/CMakeLists.txt +++ b/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 diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp index 6525ccd..668a6f1 100644 --- a/glabels/ColorButton.cpp +++ b/glabels/ColorButton.cpp @@ -20,11 +20,13 @@ #include "ColorButton.h" -#include "ColorSwatch.h" -#include + #include +#include #include +#include "ColorSwatch.h" + namespace { diff --git a/glabels/ColorButton.h b/glabels/ColorButton.h index 7be311d..1719eed 100644 --- a/glabels/ColorButton.h +++ b/glabels/ColorButton.h @@ -21,6 +21,7 @@ #ifndef ColorButton_h #define ColorButton_h + #include #include "ColorNode.h" diff --git a/glabels/ColorHistory.cpp b/glabels/ColorHistory.cpp index 3fe5e36..00c8a28 100644 --- a/glabels/ColorHistory.cpp +++ b/glabels/ColorHistory.cpp @@ -20,6 +20,7 @@ #include "ColorHistory.h" + #include #include diff --git a/glabels/ColorHistory.h b/glabels/ColorHistory.h index ed17b52..845cd78 100644 --- a/glabels/ColorHistory.h +++ b/glabels/ColorHistory.h @@ -21,8 +21,9 @@ #ifndef ColorHistory_h #define ColorHistory_h -#include + #include +#include /// diff --git a/glabels/ColorNode.cpp b/glabels/ColorNode.cpp index c9288f2..d45310b 100644 --- a/glabels/ColorNode.cpp +++ b/glabels/ColorNode.cpp @@ -20,6 +20,7 @@ #include "ColorNode.h" + #include "Merge/Record.h" diff --git a/glabels/ColorNode.h b/glabels/ColorNode.h index a1ac3aa..3350c7d 100644 --- a/glabels/ColorNode.h +++ b/glabels/ColorNode.h @@ -21,9 +21,12 @@ #ifndef ColorNode_h #define ColorNode_h + +#include + #include #include -#include + #include "Merge/Record.h" diff --git a/glabels/ColorPaletteButtonItem.cpp b/glabels/ColorPaletteButtonItem.cpp index 4e1ed5a..fd0f324 100644 --- a/glabels/ColorPaletteButtonItem.cpp +++ b/glabels/ColorPaletteButtonItem.cpp @@ -21,8 +21,8 @@ #include "ColorPaletteButtonItem.h" -#include #include +#include // diff --git a/glabels/ColorPaletteButtonItem.h b/glabels/ColorPaletteButtonItem.h index 3e7af47..640c04f 100644 --- a/glabels/ColorPaletteButtonItem.h +++ b/glabels/ColorPaletteButtonItem.h @@ -21,8 +21,9 @@ #ifndef ColorPaletteButtonItem_h #define ColorPaletteButtonItem_h -#include + #include +#include /// diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp index fd10620..5773bad 100644 --- a/glabels/ColorPaletteDialog.cpp +++ b/glabels/ColorPaletteDialog.cpp @@ -20,12 +20,12 @@ #include "ColorPaletteDialog.h" + +#include #include #include -#include #include -#include -#include +#include #include #include diff --git a/glabels/ColorPaletteDialog.h b/glabels/ColorPaletteDialog.h index 39292c6..012b953 100644 --- a/glabels/ColorPaletteDialog.h +++ b/glabels/ColorPaletteDialog.h @@ -21,16 +21,14 @@ #ifndef ColorPaletteDialog_h #define ColorPaletteDialog_h -#include + +#include #include #include "ColorNode.h" #include "ColorHistory.h" #include "ColorPaletteItem.h" #include "ColorPaletteButtonItem.h" -#include "FieldMenu.h" - -class QComboBox; // Forward reference /// diff --git a/glabels/ColorPaletteItem.cpp b/glabels/ColorPaletteItem.cpp index 5ea45b6..c2c518a 100644 --- a/glabels/ColorPaletteItem.cpp +++ b/glabels/ColorPaletteItem.cpp @@ -21,8 +21,8 @@ #include "ColorPaletteItem.h" -#include #include +#include // diff --git a/glabels/ColorPaletteItem.h b/glabels/ColorPaletteItem.h index 93c63de..b61e0d4 100644 --- a/glabels/ColorPaletteItem.h +++ b/glabels/ColorPaletteItem.h @@ -21,8 +21,9 @@ #ifndef ColorPaletteItem_h #define ColorPaletteItem_h -#include + #include +#include /// diff --git a/glabels/ColorSwatch.cpp b/glabels/ColorSwatch.cpp index dc2c75c..64a38d2 100644 --- a/glabels/ColorSwatch.cpp +++ b/glabels/ColorSwatch.cpp @@ -20,6 +20,7 @@ #include "ColorSwatch.h" + #include diff --git a/glabels/ColorSwatch.h b/glabels/ColorSwatch.h index 19f42e0..03e51f2 100644 --- a/glabels/ColorSwatch.h +++ b/glabels/ColorSwatch.h @@ -21,6 +21,7 @@ #ifndef ColorSwatch_h #define ColorSwatch_h + #include diff --git a/glabels/Cursors.cpp b/glabels/Cursors.cpp index 34556d9..d4a4783 100644 --- a/glabels/Cursors.cpp +++ b/glabels/Cursors.cpp @@ -20,7 +20,6 @@ #include "Cursors.h" - #include diff --git a/glabels/EnumUtil.h b/glabels/EnumUtil.h index 8e729fb..8d78513 100644 --- a/glabels/EnumUtil.h +++ b/glabels/EnumUtil.h @@ -21,8 +21,9 @@ #ifndef EnumUtil_h #define EnumUtil_h -#include + #include +#include #include diff --git a/glabels/FieldButton.cpp b/glabels/FieldButton.cpp index 2b345a2..5a89c52 100644 --- a/glabels/FieldButton.cpp +++ b/glabels/FieldButton.cpp @@ -20,8 +20,9 @@ #include "FieldButton.h" -#include + #include +#include /// diff --git a/glabels/FieldButton.h b/glabels/FieldButton.h index 61abf82..7de9a20 100644 --- a/glabels/FieldButton.h +++ b/glabels/FieldButton.h @@ -21,6 +21,7 @@ #ifndef FieldButton_h #define FieldButton_h + #include #include diff --git a/glabels/FieldMenu.cpp b/glabels/FieldMenu.cpp deleted file mode 100644 index 9d51390..0000000 --- a/glabels/FieldMenu.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* FieldMenu.cpp - * - * Copyright (C) 2014 Jim Evins - * - * 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 . - */ - -#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 ); -} diff --git a/glabels/FieldMenu.h b/glabels/FieldMenu.h deleted file mode 100644 index 640c4b1..0000000 --- a/glabels/FieldMenu.h +++ /dev/null @@ -1,71 +0,0 @@ -/* FieldMenu.h - * - * Copyright (C) 2014 Jim Evins - * - * 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 . - */ - -#ifndef FieldMenu_h -#define FieldMenu_h - -#include -#include - - -/// -/// 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 diff --git a/glabels/FieldMenuItem.h b/glabels/FieldMenuItem.h deleted file mode 100644 index 166a806..0000000 --- a/glabels/FieldMenuItem.h +++ /dev/null @@ -1,72 +0,0 @@ -/* FieldMenuItem.h - * - * Copyright (C) 2014 Jim Evins - * - * 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 . - */ - -#ifndef FieldMenuItem_h -#define FieldMenuItem_h - -#include -#include - - -/// -/// 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 diff --git a/glabels/File.cpp b/glabels/File.cpp index ead2b38..b9dfac7 100644 --- a/glabels/File.cpp +++ b/glabels/File.cpp @@ -20,15 +20,17 @@ #include "File.h" -#include "MainWindow.h" + +#include +#include +#include + +#include "FileUtil.h" #include "LabelModel.h" +#include "MainWindow.h" #include "SelectProductDialog.h" #include "XmlLabelParser.h" #include "XmlLabelCreator.h" -#include "FileUtil.h" -#include -#include -#include /// diff --git a/glabels/File.h b/glabels/File.h index f913141..aa2ce3b 100644 --- a/glabels/File.h +++ b/glabels/File.h @@ -24,7 +24,7 @@ #include - +// Forward References class MainWindow; diff --git a/glabels/FileUtil.h b/glabels/FileUtil.h index e704f3e..236eacb 100644 --- a/glabels/FileUtil.h +++ b/glabels/FileUtil.h @@ -21,6 +21,7 @@ #ifndef FileUtil_h #define FileUtil_h + #include diff --git a/glabels/Handles.cpp b/glabels/Handles.cpp index bd4b0f5..2746154 100644 --- a/glabels/Handles.cpp +++ b/glabels/Handles.cpp @@ -21,11 +21,11 @@ #include "Handles.h" -#include "LabelModelObject.h" - #include #include +#include "LabelModelObject.h" + namespace { diff --git a/glabels/Handles.h b/glabels/Handles.h index 3769efa..07c84f7 100644 --- a/glabels/Handles.h +++ b/glabels/Handles.h @@ -24,9 +24,10 @@ #include #include + #include "libglabels/Distance.h" - +// Forward References class LabelModelObject; diff --git a/glabels/Help.cpp b/glabels/Help.cpp index 5d5c299..f418066 100644 --- a/glabels/Help.cpp +++ b/glabels/Help.cpp @@ -20,9 +20,10 @@ #include "Help.h" -#include "AboutDialog.h" -#include +#include + +#include "AboutDialog.h" /// @@ -30,7 +31,7 @@ /// void Help::displayContents( QWidget *parent ) { - std::cout << "TODO: Help::displayContents" << std::endl; + qDebug() << "TODO: Help::displayContents"; } diff --git a/glabels/FieldMenuItem.cpp b/glabels/Icons.cpp similarity index 58% rename from glabels/FieldMenuItem.cpp rename to glabels/Icons.cpp index d1e342a..d19b9a1 100644 --- a/glabels/FieldMenuItem.cpp +++ b/glabels/Icons.cpp @@ -1,6 +1,6 @@ -/* FieldMenuItem.cpp +/* Icons.cpp * - * Copyright (C) 2014 Jim Evins + * Copyright (C) 2017 Jim Evins * * This file is part of gLabels-qt. * @@ -18,34 +18,4 @@ * along with gLabels-qt. If not, see . */ -#include "FieldMenuItem.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 ); -} +#include "Icons.h" diff --git a/glabels/Icons.h b/glabels/Icons.h index 63c489d..be9561d 100644 --- a/glabels/Icons.h +++ b/glabels/Icons.h @@ -21,6 +21,7 @@ #ifndef Icons_h #define Icons_h + #include diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index af2fc96..d647a4a 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -20,10 +20,12 @@ #include "LabelEditor.h" -#include + #include +#include #include +#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" diff --git a/glabels/LabelEditor.h b/glabels/LabelEditor.h index ca17071..28cb7cb 100644 --- a/glabels/LabelEditor.h +++ b/glabels/LabelEditor.h @@ -21,13 +21,13 @@ #ifndef LabelEditor_h #define LabelEditor_h -#include -#include + #include +#include +#include #include "Region.h" - // Forward References class LabelModel; class LabelModelObject; diff --git a/glabels/LabelModel.cpp b/glabels/LabelModel.cpp index 5d398ab..14ac265 100644 --- a/glabels/LabelModel.cpp +++ b/glabels/LabelModel.cpp @@ -20,18 +20,20 @@ #include "LabelModel.h" -#include + #include #include +#include #include #include -#include "Merge/None.h" #include "LabelModelObject.h" #include "Region.h" #include "XmlLabelCreator.h" #include "XmlLabelParser.h" +#include "Merge/None.h" + namespace { diff --git a/glabels/LabelModel.h b/glabels/LabelModel.h index b7c1e10..9a4e1f9 100644 --- a/glabels/LabelModel.h +++ b/glabels/LabelModel.h @@ -21,22 +21,23 @@ #ifndef LabelModel_h #define LabelModel_h -#include -#include -#include -#include "libglabels/Template.h" -#include "Merge/Merge.h" -#include "Merge/Record.h" +#include +#include +#include #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; ////////////////////////////////////////////// diff --git a/glabels/LabelModelBoxObject.cpp b/glabels/LabelModelBoxObject.cpp index 589bffa..cbc5889 100644 --- a/glabels/LabelModelBoxObject.cpp +++ b/glabels/LabelModelBoxObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelBoxObject.h" + #include #include diff --git a/glabels/LabelModelEllipseObject.cpp b/glabels/LabelModelEllipseObject.cpp index e8be8ac..bbbceb1 100644 --- a/glabels/LabelModelEllipseObject.cpp +++ b/glabels/LabelModelEllipseObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelEllipseObject.h" + #include #include diff --git a/glabels/LabelModelImageObject.cpp b/glabels/LabelModelImageObject.cpp index 9b3f03c..ce14c42 100644 --- a/glabels/LabelModelImageObject.cpp +++ b/glabels/LabelModelImageObject.cpp @@ -20,13 +20,15 @@ #include "LabelModelImageObject.h" -#include "Size.h" + #include -#include -#include #include +#include +#include #include +#include "Size.h" + namespace { diff --git a/glabels/LabelModelImageObject.h b/glabels/LabelModelImageObject.h index efbc904..38e1f9e 100644 --- a/glabels/LabelModelImageObject.h +++ b/glabels/LabelModelImageObject.h @@ -21,10 +21,11 @@ #ifndef LabelModelImageObject_h #define LabelModelImageObject_h -#include "LabelModelObject.h" #include +#include "LabelModelObject.h" + /// /// Label Model Image Object diff --git a/glabels/LabelModelLineObject.cpp b/glabels/LabelModelLineObject.cpp index eb14288..3bdec37 100644 --- a/glabels/LabelModelLineObject.cpp +++ b/glabels/LabelModelLineObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelLineObject.h" + #include #include diff --git a/glabels/LabelModelLineObject.h b/glabels/LabelModelLineObject.h index 412033d..e43c485 100644 --- a/glabels/LabelModelLineObject.h +++ b/glabels/LabelModelLineObject.h @@ -21,6 +21,7 @@ #ifndef LabelModelLineObject_h #define LabelModelLineObject_h + #include "LabelModelObject.h" diff --git a/glabels/LabelModelObject.cpp b/glabels/LabelModelObject.cpp index 9962e04..43db1c2 100644 --- a/glabels/LabelModelObject.cpp +++ b/glabels/LabelModelObject.cpp @@ -20,14 +20,15 @@ #include "LabelModelObject.h" + #include #include #include "ColorNode.h" -#include "TextNode.h" #include "BarcodeStyle.h" #include "Region.h" #include "Size.h" +#include "TextNode.h" /// diff --git a/glabels/LabelModelObject.h b/glabels/LabelModelObject.h index ef93cd3..cd4cb79 100644 --- a/glabels/LabelModelObject.h +++ b/glabels/LabelModelObject.h @@ -21,19 +21,21 @@ #ifndef LabelModelObject_h #define LabelModelObject_h + #include #include #include #include -#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; diff --git a/glabels/LabelModelShapeObject.cpp b/glabels/LabelModelShapeObject.cpp index b4f6730..62c0f8e 100644 --- a/glabels/LabelModelShapeObject.cpp +++ b/glabels/LabelModelShapeObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelShapeObject.h" + #include #include diff --git a/glabels/LabelModelShapeObject.h b/glabels/LabelModelShapeObject.h index 588e7c4..aba634d 100644 --- a/glabels/LabelModelShapeObject.h +++ b/glabels/LabelModelShapeObject.h @@ -21,6 +21,7 @@ #ifndef LabelModelShapeObject_h #define LabelModelShapeObject_h + #include "LabelModelObject.h" diff --git a/glabels/LabelModelTextObject.cpp b/glabels/LabelModelTextObject.cpp index 9960c5d..8ef3a9d 100644 --- a/glabels/LabelModelTextObject.cpp +++ b/glabels/LabelModelTextObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelTextObject.h" + #include #include #include diff --git a/glabels/LabelModelTextObject.h b/glabels/LabelModelTextObject.h index 7324964..e0f1b26 100644 --- a/glabels/LabelModelTextObject.h +++ b/glabels/LabelModelTextObject.h @@ -21,10 +21,11 @@ #ifndef LabelModelTextObject_h #define LabelModelTextObject_h -#include "LabelModelObject.h" #include +#include "LabelModelObject.h" + /// /// Label Model Line Object diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index 964808c..2006681 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -20,35 +20,37 @@ #include "MainWindow.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "libglabels/Db.h" -#include "PreferencesDialog.h" -#include "StartupView.h" -#include "PropertiesView.h" -#include "LabelEditor.h" -#include "ObjectEditor.h" -#include "MergeView.h" -#include "PrintView.h" -#include "LabelModel.h" -#include "UndoRedoModel.h" -#include "Icons.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #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" /// diff --git a/glabels/MainWindow.h b/glabels/MainWindow.h index 023df73..1d11164 100644 --- a/glabels/MainWindow.h +++ b/glabels/MainWindow.h @@ -21,29 +21,27 @@ #ifndef MainWindow_h #define MainWindow_h + +#include +#include +#include +#include #include - -class QAction; -class QCloseEvent; -class QMenuBar; -class QMenu; -class QToolBar; -class QLabel; -class QListWidget; -class QListWidgetItem; -class QStackedWidget; -class QScrollArea; - +#include +#include +#include +#include +#include // 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; /// diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp index 769c83e..f06c491 100644 --- a/glabels/MergeView.cpp +++ b/glabels/MergeView.cpp @@ -20,12 +20,15 @@ #include "MergeView.h" -#include "LabelModel.h" -#include "Merge/Factory.h" + #include #include #include +#include "LabelModel.h" + +#include "Merge/Factory.h" + /// /// Constructor diff --git a/glabels/MergeView.h b/glabels/MergeView.h index df33c72..e67cd26 100644 --- a/glabels/MergeView.h +++ b/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; diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index c2fdb93..074c7af 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -21,6 +21,10 @@ #include "ObjectEditor.h" +#include +#include +#include + #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 -#include -#include - /// /// Constructor diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h index 8ead622..4451850 100644 --- a/glabels/ObjectEditor.h +++ b/glabels/ObjectEditor.h @@ -21,10 +21,12 @@ #ifndef ObjectEditor_h #define ObjectEditor_h -#include "ui_ObjectEditor.h" -#include "libglabels/Distance.h" + #include +#include "ui_ObjectEditor.h" + +#include "libglabels/Distance.h" // Forward references class LabelModel; diff --git a/glabels/Outline.cpp b/glabels/Outline.cpp index 6338345..cc58a34 100644 --- a/glabels/Outline.cpp +++ b/glabels/Outline.cpp @@ -21,10 +21,10 @@ #include "Outline.h" -#include "LabelModelObject.h" - #include +#include "LabelModelObject.h" + namespace { diff --git a/glabels/Outline.h b/glabels/Outline.h index f331ddb..260c14d 100644 --- a/glabels/Outline.h +++ b/glabels/Outline.h @@ -25,7 +25,7 @@ #include #include - +// Forward references class LabelModelObject; diff --git a/glabels/PageRenderer.cpp b/glabels/PageRenderer.cpp index b89d22d..5367dbc 100644 --- a/glabels/PageRenderer.cpp +++ b/glabels/PageRenderer.cpp @@ -20,14 +20,15 @@ #include "PageRenderer.h" + +#include + #include "LabelModel.h" + #include "Merge/Merge.h" #include "Merge/None.h" #include "Merge/Record.h" -#include -#include - namespace { diff --git a/glabels/PageRenderer.h b/glabels/PageRenderer.h index 2fff48f..726f307 100644 --- a/glabels/PageRenderer.h +++ b/glabels/PageRenderer.h @@ -22,16 +22,16 @@ #define PageRenderer_h -#include "libglabels/Point.h" +#include +#include +#include #include "Merge/Merge.h" #include "Merge/Record.h" -#include -#include +#include "libglabels/Point.h" // Forward references -class QPainter; class LabelModel; diff --git a/glabels/PreferencesDialog.cpp b/glabels/PreferencesDialog.cpp index ab2587e..d6ab99d 100644 --- a/glabels/PreferencesDialog.cpp +++ b/glabels/PreferencesDialog.cpp @@ -20,6 +20,7 @@ #include "PreferencesDialog.h" + #include "Settings.h" diff --git a/glabels/PreferencesDialog.h b/glabels/PreferencesDialog.h index 2a0fc1f..694c7dc 100644 --- a/glabels/PreferencesDialog.h +++ b/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 ///////////////////////////////// diff --git a/glabels/Preview.cpp b/glabels/Preview.cpp index 283e869..f78b10a 100644 --- a/glabels/Preview.cpp +++ b/glabels/Preview.cpp @@ -20,13 +20,14 @@ #include "Preview.h" + +#include +#include +#include + #include "LabelModel.h" #include "PreviewOverlayItem.h" -#include -#include -#include - // // Private Configuration Data diff --git a/glabels/Preview.h b/glabels/Preview.h index 013e7b0..0afaf40 100644 --- a/glabels/Preview.h +++ b/glabels/Preview.h @@ -21,13 +21,14 @@ #ifndef Preview_h #define Preview_h + #include #include #include "PageRenderer.h" - -class LabelModel; // Forward reference +// Forward references +class LabelModel; /// diff --git a/glabels/PreviewOverlayItem.cpp b/glabels/PreviewOverlayItem.cpp index 6403f30..f522efa 100644 --- a/glabels/PreviewOverlayItem.cpp +++ b/glabels/PreviewOverlayItem.cpp @@ -20,9 +20,11 @@ #include "PreviewOverlayItem.h" -#include "PageRenderer.h" + #include +#include "PageRenderer.h" + PreviewOverlayItem::PreviewOverlayItem( const PageRenderer* renderer, QGraphicsItem* parent ) : QGraphicsItem(parent), mRenderer(renderer) diff --git a/glabels/PreviewOverlayItem.h b/glabels/PreviewOverlayItem.h index f54310b..32a0cb9 100644 --- a/glabels/PreviewOverlayItem.h +++ b/glabels/PreviewOverlayItem.h @@ -21,10 +21,11 @@ #ifndef PreviewOverlayItem_h #define PreviewOverlayItem_h + #include - -class PageRenderer; // Forward reference +// Forward references +class PageRenderer; /// diff --git a/glabels/PrintView.cpp b/glabels/PrintView.cpp index 3d65df4..b71b2e6 100644 --- a/glabels/PrintView.cpp +++ b/glabels/PrintView.cpp @@ -20,11 +20,12 @@ #include "PrintView.h" -#include "LabelModel.h" #include #include +#include "LabelModel.h" + /// /// Constructor diff --git a/glabels/PrintView.h b/glabels/PrintView.h index 26f5282..22986dd 100644 --- a/glabels/PrintView.h +++ b/glabels/PrintView.h @@ -21,13 +21,14 @@ #ifndef PrintView_h #define PrintView_h -#include "ui_PrintView.h" -#include "PageRenderer.h" #include +#include "ui_PrintView.h" +#include "PageRenderer.h" -class LabelModel; // Forward reference +// Forward references +class LabelModel; /// diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp index a61126c..b4cdcf8 100644 --- a/glabels/PropertiesView.cpp +++ b/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 #include +#include "LabelModel.h" +#include "SelectProductDialog.h" +#include "Settings.h" +#include "UndoRedoModel.h" + +#include "libglabels/Db.h" + /// /// Constructor diff --git a/glabels/PropertiesView.h b/glabels/PropertiesView.h index 91909c3..b9a42d0 100644 --- a/glabels/PropertiesView.h +++ b/glabels/PropertiesView.h @@ -21,6 +21,7 @@ #ifndef PropertiesView_h #define PropertiesView_h + #include "ui_PropertiesView.h" #include "libglabels/Units.h" diff --git a/glabels/Region.h b/glabels/Region.h index f4b4adf..763333b 100644 --- a/glabels/Region.h +++ b/glabels/Region.h @@ -21,7 +21,9 @@ #ifndef Region_h #define Region_h + #include + #include "libglabels/Distance.h" diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp index 6aff8e0..6834956 100644 --- a/glabels/SelectProductDialog.cpp +++ b/glabels/SelectProductDialog.cpp @@ -20,12 +20,14 @@ #include "SelectProductDialog.h" -#include "libglabels/Db.h" -#include "TemplatePickerItem.h" -#include "Settings.h" #include +#include "Settings.h" +#include "TemplatePickerItem.h" + +#include "libglabels/Db.h" + /// /// Constructor diff --git a/glabels/SelectProductDialog.h b/glabels/SelectProductDialog.h index 298e687..0dc7804 100644 --- a/glabels/SelectProductDialog.h +++ b/glabels/SelectProductDialog.h @@ -21,9 +21,11 @@ #ifndef SelectProductDialog_h #define SelectProductDialog_h -#include "ui_SelectProductDialog.h" + #include +#include "ui_SelectProductDialog.h" + /// /// New Label Dialog Widget diff --git a/glabels/Settings.cpp b/glabels/Settings.cpp index 9d12a92..dd96ab4 100644 --- a/glabels/Settings.cpp +++ b/glabels/Settings.cpp @@ -20,6 +20,7 @@ #include "Settings.h" + #include #include #include diff --git a/glabels/Settings.h b/glabels/Settings.h index 1cb6bc0..cd534ab 100644 --- a/glabels/Settings.h +++ b/glabels/Settings.h @@ -23,9 +23,10 @@ #include -#include "libglabels/Distance.h" #include +#include "libglabels/Distance.h" + /// /// Settings Singleton Class diff --git a/glabels/SimplePreview.cpp b/glabels/SimplePreview.cpp index 5624190..4e58537 100644 --- a/glabels/SimplePreview.cpp +++ b/glabels/SimplePreview.cpp @@ -20,6 +20,7 @@ #include "SimplePreview.h" + #include #include #include diff --git a/glabels/SimplePreview.h b/glabels/SimplePreview.h index d8a1dd8..5f7b741 100644 --- a/glabels/SimplePreview.h +++ b/glabels/SimplePreview.h @@ -21,9 +21,9 @@ #ifndef SimplePreview_h #define SimplePreview_h + #include #include - #include #include "libglabels/Template.h" diff --git a/glabels/Size.h b/glabels/Size.h index b8a7a2c..b6bebfa 100644 --- a/glabels/Size.h +++ b/glabels/Size.h @@ -21,7 +21,9 @@ #ifndef Size_h #define Size_h + #include + #include "libglabels/Distance.h" diff --git a/glabels/StartupView.cpp b/glabels/StartupView.cpp index b5c476f..efc40e9 100644 --- a/glabels/StartupView.cpp +++ b/glabels/StartupView.cpp @@ -20,9 +20,11 @@ #include "StartupView.h" + +#include + #include "File.h" #include "MainWindow.h" -#include /// diff --git a/glabels/StartupView.h b/glabels/StartupView.h index 626d798..15fbad7 100644 --- a/glabels/StartupView.h +++ b/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; /// diff --git a/glabels/TemplatePicker.cpp b/glabels/TemplatePicker.cpp index 91e5ce8..20d5344 100644 --- a/glabels/TemplatePicker.cpp +++ b/glabels/TemplatePicker.cpp @@ -20,6 +20,7 @@ #include "TemplatePicker.h" + #include #include "TemplatePickerItem.h" diff --git a/glabels/TemplatePicker.h b/glabels/TemplatePicker.h index 857ef0d..eee0dbd 100644 --- a/glabels/TemplatePicker.h +++ b/glabels/TemplatePicker.h @@ -21,9 +21,9 @@ #ifndef TemplatePicker_h #define TemplatePicker_h -#include #include +#include #include "libglabels/Template.h" diff --git a/glabels/TemplatePickerItem.cpp b/glabels/TemplatePickerItem.cpp index 63928d6..24d8187 100644 --- a/glabels/TemplatePickerItem.cpp +++ b/glabels/TemplatePickerItem.cpp @@ -20,9 +20,10 @@ #include "TemplatePickerItem.h" -#include -#include + #include +#include +#include /// diff --git a/glabels/TemplatePickerItem.h b/glabels/TemplatePickerItem.h index 5898aa2..a6c4722 100644 --- a/glabels/TemplatePickerItem.h +++ b/glabels/TemplatePickerItem.h @@ -21,9 +21,9 @@ #ifndef TemplatePickerItem_h #define TemplatePickerItem_h -#include #include +#include #include "libglabels/Template.h" diff --git a/glabels/TextNode.h b/glabels/TextNode.h index e302f8f..26b7599 100644 --- a/glabels/TextNode.h +++ b/glabels/TextNode.h @@ -21,7 +21,9 @@ #ifndef TextNode_h #define TextNode_h + #include + #include "Merge/Record.h" diff --git a/glabels/UndoRedoModel.cpp b/glabels/UndoRedoModel.cpp index d47520a..7eab0cc 100644 --- a/glabels/UndoRedoModel.cpp +++ b/glabels/UndoRedoModel.cpp @@ -20,6 +20,7 @@ #include "UndoRedoModel.h" + #include "LabelModel.h" diff --git a/glabels/UndoRedoModel.h b/glabels/UndoRedoModel.h index 975ce4e..0018d74 100644 --- a/glabels/UndoRedoModel.h +++ b/glabels/UndoRedoModel.h @@ -21,10 +21,12 @@ #ifndef UndoRedoModel_h #define UndoRedoModel_h + +#include #include #include -#include +// Forward references class LabelModel; diff --git a/glabels/XmlLabelCreator.cpp b/glabels/XmlLabelCreator.cpp index 21a8836..76e00af 100644 --- a/glabels/XmlLabelCreator.cpp +++ b/glabels/XmlLabelCreator.cpp @@ -20,24 +20,28 @@ #include "XmlLabelCreator.h" + +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include void diff --git a/glabels/XmlLabelCreator.h b/glabels/XmlLabelCreator.h index 8326d64..6879f22 100644 --- a/glabels/XmlLabelCreator.h +++ b/glabels/XmlLabelCreator.h @@ -25,7 +25,7 @@ #include #include - +// Forward references class LabelModel; class LabelModelObject; class LabelModelBoxObject; diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp index 4bbe781..6963e3f 100644 --- a/glabels/XmlLabelParser.cpp +++ b/glabels/XmlLabelParser.cpp @@ -20,26 +20,30 @@ #include "XmlLabelParser.h" + +#include +#include +#include +#include +#include + +#include + +#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 -#include -#include -#include -#include -#include - LabelModel* XmlLabelParser::readFile( const QString& fileName ) diff --git a/glabels/XmlLabelParser.h b/glabels/XmlLabelParser.h index 66ac126..6ad9449 100644 --- a/glabels/XmlLabelParser.h +++ b/glabels/XmlLabelParser.h @@ -25,7 +25,7 @@ #include #include - +// Forward references class LabelModel; class LabelModelObject; class LabelModelBoxObject; diff --git a/glabels/glabels_main.cpp b/glabels/glabels_main.cpp index 42510d6..594af78 100644 --- a/glabels/glabels_main.cpp +++ b/glabels/glabels_main.cpp @@ -21,11 +21,13 @@ #include -#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 ) { diff --git a/libglabels/Db.cpp b/libglabels/Db.cpp index 5f16816..7a472ff 100644 --- a/libglabels/Db.cpp +++ b/libglabels/Db.cpp @@ -20,15 +20,16 @@ #include "Db.h" + #include #include #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 diff --git a/libglabels/Db.h b/libglabels/Db.h index 50b0c38..35e5d88 100644 --- a/libglabels/Db.h +++ b/libglabels/Db.h @@ -23,14 +23,14 @@ #include -#include #include #include +#include -#include "Paper.h" #include "Category.h" -#include "Vendor.h" +#include "Paper.h" #include "Template.h" +#include "Vendor.h" namespace glabels diff --git a/libglabels/Distance.cpp b/libglabels/Distance.cpp index 268659f..1e0f569 100644 --- a/libglabels/Distance.cpp +++ b/libglabels/Distance.cpp @@ -20,6 +20,7 @@ #include "Distance.h" + #include #include diff --git a/libglabels/Distance.h b/libglabels/Distance.h index 505e35e..b3d1712 100644 --- a/libglabels/Distance.h +++ b/libglabels/Distance.h @@ -24,6 +24,7 @@ #include #include + #include "Units.h" diff --git a/libglabels/Frame.cpp b/libglabels/Frame.cpp index 7c17c5c..387ba89 100644 --- a/libglabels/Frame.cpp +++ b/libglabels/Frame.cpp @@ -20,6 +20,7 @@ #include "Frame.h" + #include "Markup.h" diff --git a/libglabels/Frame.h b/libglabels/Frame.h index 2d4cb6b..bc914b2 100644 --- a/libglabels/Frame.h +++ b/libglabels/Frame.h @@ -21,20 +21,23 @@ #ifndef glabels_Frame_h #define glabels_Frame_h + #include -#include #include #include +#include #include #include "Distance.h" -#include "Point.h" #include "Layout.h" +#include "Point.h" namespace glabels { - class Markup; // Forward reference + + // Forward references + class Markup; class Frame diff --git a/libglabels/FrameCd.cpp b/libglabels/FrameCd.cpp index 02401de..14b4fa8 100644 --- a/libglabels/FrameCd.cpp +++ b/libglabels/FrameCd.cpp @@ -20,10 +20,12 @@ #include "FrameCd.h" -#include "StrUtil.h" -#include "privateConstants.h" + #include +#include "privateConstants.h" +#include "StrUtil.h" + namespace glabels { diff --git a/libglabels/FrameCd.h b/libglabels/FrameCd.h index b1282bf..ac9c400 100644 --- a/libglabels/FrameCd.h +++ b/libglabels/FrameCd.h @@ -21,6 +21,7 @@ #ifndef glabels_FrameCd_h #define glabels_FrameCd_h + #include "Frame.h" diff --git a/libglabels/FrameEllipse.cpp b/libglabels/FrameEllipse.cpp index ce36037..4736e62 100644 --- a/libglabels/FrameEllipse.cpp +++ b/libglabels/FrameEllipse.cpp @@ -20,8 +20,9 @@ #include "FrameEllipse.h" -#include "StrUtil.h" + #include "privateConstants.h" +#include "StrUtil.h" namespace glabels diff --git a/libglabels/FrameEllipse.h b/libglabels/FrameEllipse.h index 9b48dda..b76f58c 100644 --- a/libglabels/FrameEllipse.h +++ b/libglabels/FrameEllipse.h @@ -21,6 +21,7 @@ #ifndef glabels_FrameEllipse_h #define glabels_FrameEllipse_h + #include "Frame.h" diff --git a/libglabels/FrameRect.cpp b/libglabels/FrameRect.cpp index eb770cd..26b1a8a 100644 --- a/libglabels/FrameRect.cpp +++ b/libglabels/FrameRect.cpp @@ -20,8 +20,9 @@ #include "FrameRect.h" -#include "StrUtil.h" + #include "privateConstants.h" +#include "StrUtil.h" namespace glabels diff --git a/libglabels/FrameRect.h b/libglabels/FrameRect.h index 6c6e29f..244cabf 100644 --- a/libglabels/FrameRect.h +++ b/libglabels/FrameRect.h @@ -21,6 +21,7 @@ #ifndef glabels_FrameRect_h #define glabels_FrameRect_h + #include "Frame.h" diff --git a/libglabels/FrameRound.cpp b/libglabels/FrameRound.cpp index 68efba0..8893399 100644 --- a/libglabels/FrameRound.cpp +++ b/libglabels/FrameRound.cpp @@ -20,8 +20,9 @@ #include "FrameRound.h" -#include "StrUtil.h" + #include "privateConstants.h" +#include "StrUtil.h" namespace glabels diff --git a/libglabels/FrameRound.h b/libglabels/FrameRound.h index 0cf209b..d6f6e38 100644 --- a/libglabels/FrameRound.h +++ b/libglabels/FrameRound.h @@ -21,6 +21,7 @@ #ifndef glabels_FrameRound_h #define glabels_FrameRound_h + #include "Frame.h" diff --git a/libglabels/Layout.cpp b/libglabels/Layout.cpp index 03e583b..aa9c190 100644 --- a/libglabels/Layout.cpp +++ b/libglabels/Layout.cpp @@ -20,7 +20,8 @@ #include "Layout.h" -#include + +#include #include "privateConstants.h" diff --git a/libglabels/Layout.h b/libglabels/Layout.h index 308717a..70ac0f1 100644 --- a/libglabels/Layout.h +++ b/libglabels/Layout.h @@ -21,6 +21,7 @@ #ifndef glabels_Layout_h #define glabels_Layout_h + #include "Distance.h" diff --git a/libglabels/Markup.h b/libglabels/Markup.h index c2dd5c4..88835a6 100644 --- a/libglabels/Markup.h +++ b/libglabels/Markup.h @@ -21,6 +21,7 @@ #ifndef glabels_Markup_h #define glabels_Markup_h + #include #include "Frame.h" diff --git a/libglabels/MiniPreviewPixmap.cpp b/libglabels/MiniPreviewPixmap.cpp index 8637f89..ce63f52 100644 --- a/libglabels/MiniPreviewPixmap.cpp +++ b/libglabels/MiniPreviewPixmap.cpp @@ -20,6 +20,7 @@ #include "MiniPreviewPixmap.h" + #include "Template.h" diff --git a/libglabels/MiniPreviewPixmap.h b/libglabels/MiniPreviewPixmap.h index 4996c64..688892c 100644 --- a/libglabels/MiniPreviewPixmap.h +++ b/libglabels/MiniPreviewPixmap.h @@ -24,13 +24,16 @@ #include #include + #include "Point.h" namespace glabels { - class Template; // Forward reference - class Frame; // Forward reference + + // Forward references + class Template; + class Frame; class MiniPreviewPixmap : public QPixmap diff --git a/libglabels/Paper.h b/libglabels/Paper.h index a19b2c7..f254a8c 100644 --- a/libglabels/Paper.h +++ b/libglabels/Paper.h @@ -23,6 +23,7 @@ #include + #include "Distance.h" diff --git a/libglabels/Point.h b/libglabels/Point.h index a597efa..8fbfd04 100644 --- a/libglabels/Point.h +++ b/libglabels/Point.h @@ -21,6 +21,7 @@ #ifndef glabels_Point_h #define glabels_Point_h + #include "Distance.h" diff --git a/libglabels/StrUtil.cpp b/libglabels/StrUtil.cpp index ea38621..b4a742e 100644 --- a/libglabels/StrUtil.cpp +++ b/libglabels/StrUtil.cpp @@ -20,6 +20,7 @@ #include "StrUtil.h" + #include diff --git a/libglabels/StrUtil.h b/libglabels/StrUtil.h index 9bc47f9..0fd4f5c 100644 --- a/libglabels/StrUtil.h +++ b/libglabels/StrUtil.h @@ -21,6 +21,7 @@ #ifndef glabels_StrUtil_h #define glabels_StrUtil_h + #include diff --git a/libglabels/Template.cpp b/libglabels/Template.cpp index 8e9ac1f..ed0ce42 100644 --- a/libglabels/Template.cpp +++ b/libglabels/Template.cpp @@ -20,6 +20,7 @@ #include "Template.h" + #include #include "Db.h" diff --git a/libglabels/Template.h b/libglabels/Template.h index 09bfa35..910d0f8 100644 --- a/libglabels/Template.h +++ b/libglabels/Template.h @@ -21,17 +21,16 @@ #ifndef glabels_Template_h #define glabels_Template_h + #include #include #include #include -#include - #include "Distance.h" -#include "Point.h" #include "Frame.h" #include "MiniPreviewPixmap.h" +#include "Point.h" namespace glabels diff --git a/libglabels/Units.cpp b/libglabels/Units.cpp index 8fb940f..bde38ff 100644 --- a/libglabels/Units.cpp +++ b/libglabels/Units.cpp @@ -20,6 +20,7 @@ #include "Units.h" + #include #include diff --git a/libglabels/XmlCategoryParser.cpp b/libglabels/XmlCategoryParser.cpp index 7c9c419..05ed9b9 100644 --- a/libglabels/XmlCategoryParser.cpp +++ b/libglabels/XmlCategoryParser.cpp @@ -20,14 +20,15 @@ #include "XmlCategoryParser.h" -#include + #include #include +#include #include #include "Category.h" -#include "XmlUtil.h" #include "Db.h" +#include "XmlUtil.h" namespace glabels diff --git a/libglabels/XmlCategoryParser.h b/libglabels/XmlCategoryParser.h index 843f10d..9292008 100644 --- a/libglabels/XmlCategoryParser.h +++ b/libglabels/XmlCategoryParser.h @@ -22,8 +22,8 @@ #define glabels_XmlCategoryParser_h -#include #include +#include namespace glabels diff --git a/libglabels/XmlPaperParser.cpp b/libglabels/XmlPaperParser.cpp index 0d09189..d94b6fe 100644 --- a/libglabels/XmlPaperParser.cpp +++ b/libglabels/XmlPaperParser.cpp @@ -20,14 +20,15 @@ #include "XmlPaperParser.h" -#include + #include #include +#include #include +#include "Db.h" #include "Paper.h" #include "XmlUtil.h" -#include "Db.h" namespace glabels diff --git a/libglabels/XmlTemplateCreator.cpp b/libglabels/XmlTemplateCreator.cpp index ee29470..3842007 100644 --- a/libglabels/XmlTemplateCreator.cpp +++ b/libglabels/XmlTemplateCreator.cpp @@ -20,14 +20,14 @@ #include "XmlTemplateCreator.h" -#include -#include + #include +#include #include +#include "Db.h" #include "Template.h" #include "XmlUtil.h" -#include "Db.h" namespace glabels diff --git a/libglabels/XmlTemplateCreator.h b/libglabels/XmlTemplateCreator.h index 2a1787b..6c34141 100644 --- a/libglabels/XmlTemplateCreator.h +++ b/libglabels/XmlTemplateCreator.h @@ -22,16 +22,16 @@ #define glabels_XmlTemplateCreator_h -#include #include +#include -#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 diff --git a/libglabels/XmlTemplateParser.cpp b/libglabels/XmlTemplateParser.cpp index 1f7a69c..61544d3 100644 --- a/libglabels/XmlTemplateParser.cpp +++ b/libglabels/XmlTemplateParser.cpp @@ -20,13 +20,12 @@ #include "XmlTemplateParser.h" + #include #include #include #include -#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 diff --git a/libglabels/XmlTemplateParser.h b/libglabels/XmlTemplateParser.h index ad6e2b6..788f7c7 100644 --- a/libglabels/XmlTemplateParser.h +++ b/libglabels/XmlTemplateParser.h @@ -22,8 +22,8 @@ #define glabels_XmlTemplateParser_h -#include #include +#include #include "Template.h" diff --git a/libglabels/XmlUtil.cpp b/libglabels/XmlUtil.cpp index 528e328..672c7de 100644 --- a/libglabels/XmlUtil.cpp +++ b/libglabels/XmlUtil.cpp @@ -20,6 +20,7 @@ #include "XmlUtil.h" + #include #include diff --git a/libglabels/XmlUtil.h b/libglabels/XmlUtil.h index 73f64d9..cfec5b8 100644 --- a/libglabels/XmlUtil.h +++ b/libglabels/XmlUtil.h @@ -21,9 +21,10 @@ #ifndef glabels_XmlUtil_h #define glabels_XmlUtil_h -#include + +#include #include -#include +#include #include "Distance.h" diff --git a/libglabels/XmlVendorParser.cpp b/libglabels/XmlVendorParser.cpp index d494996..a335d03 100644 --- a/libglabels/XmlVendorParser.cpp +++ b/libglabels/XmlVendorParser.cpp @@ -20,14 +20,15 @@ #include "XmlVendorParser.h" -#include + #include #include +#include #include +#include "Db.h" #include "Vendor.h" #include "XmlUtil.h" -#include "Db.h" namespace glabels diff --git a/libglabels/XmlVendorParser.h b/libglabels/XmlVendorParser.h index e489e38..8f45eab 100644 --- a/libglabels/XmlVendorParser.h +++ b/libglabels/XmlVendorParser.h @@ -22,8 +22,8 @@ #define glabels_XmlVendorParser_h -#include #include +#include namespace glabels