diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..2dca92f --- /dev/null +++ b/.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: '^' + 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 +... + diff --git a/docs/CODING-STYLE.md b/docs/CODING-STYLE.md index 24ea9a3..15baa06 100644 --- a/docs/CODING-STYLE.md +++ b/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, - e.g. \ instead of \. +2. Glabels header files. +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. \ instead of \. 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. diff --git a/glabels/AboutDialog.cpp b/glabels/AboutDialog.cpp index e2ce2c0..ad4d7fc 100644 --- a/glabels/AboutDialog.cpp +++ b/glabels/AboutDialog.cpp @@ -20,13 +20,12 @@ #include "AboutDialog.h" +#include "Version.h" #include #include #include -#include "Version.h" - namespace glabels { @@ -85,4 +84,4 @@ namespace glabels QDesktopServices::openUrl( QUrl(Version::WEBSITE) ); } -} +} // namespace glabels diff --git a/glabels/BarcodeBackends.cpp b/glabels/BarcodeBackends.cpp index 00f6f67..6a26a7e 100644 --- a/glabels/BarcodeBackends.cpp +++ b/glabels/BarcodeBackends.cpp @@ -180,4 +180,4 @@ namespace glabels mStyleNameMap.insert( fqName, style ); } -} +} // namespace glabels diff --git a/glabels/BarcodeBackends.h b/glabels/BarcodeBackends.h index 54435d3..7a028d4 100644 --- a/glabels/BarcodeBackends.h +++ b/glabels/BarcodeBackends.h @@ -22,13 +22,13 @@ #define BarcodeBackends_h +#include "BarcodeStyle.h" + #include #include #include #include -#include "BarcodeStyle.h" - namespace glabels { diff --git a/glabels/BarcodeMenu.cpp b/glabels/BarcodeMenu.cpp index 83a64f0..e8cd1dd 100644 --- a/glabels/BarcodeMenu.cpp +++ b/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 diff --git a/glabels/BarcodeMenu.h b/glabels/BarcodeMenu.h index 3d13adc..82a1fc4 100644 --- a/glabels/BarcodeMenu.h +++ b/glabels/BarcodeMenu.h @@ -22,10 +22,10 @@ #define BarcodeMenu_h -#include - #include "BarcodeStyle.h" +#include + namespace glabels { diff --git a/glabels/BarcodeMenuButton.cpp b/glabels/BarcodeMenuButton.cpp index 8ccddf2..b25582e 100644 --- a/glabels/BarcodeMenuButton.cpp +++ b/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 diff --git a/glabels/BarcodeMenuButton.h b/glabels/BarcodeMenuButton.h index 227f63a..7769af0 100644 --- a/glabels/BarcodeMenuButton.h +++ b/glabels/BarcodeMenuButton.h @@ -22,11 +22,11 @@ #define BarcodeMenuButton_h -#include - #include "BarcodeMenu.h" #include "BarcodeStyle.h" +#include + namespace glabels { diff --git a/glabels/BarcodeMenuItem.cpp b/glabels/BarcodeMenuItem.cpp index a54c4ce..f021b56 100644 --- a/glabels/BarcodeMenuItem.cpp +++ b/glabels/BarcodeMenuItem.cpp @@ -53,4 +53,4 @@ namespace glabels emit activated( mBcStyle ); } -} +} // namespace glabels diff --git a/glabels/BarcodeMenuItem.h b/glabels/BarcodeMenuItem.h index 805b940..72b0376 100644 --- a/glabels/BarcodeMenuItem.h +++ b/glabels/BarcodeMenuItem.h @@ -22,10 +22,10 @@ #define BarcodeMenuItem_h -#include - #include "BarcodeStyle.h" +#include + namespace glabels { diff --git a/glabels/BarcodeStyle.cpp b/glabels/BarcodeStyle.cpp index 8c47399..16b56b6 100644 --- a/glabels/BarcodeStyle.cpp +++ b/glabels/BarcodeStyle.cpp @@ -176,4 +176,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/BarcodeStyle.h b/glabels/BarcodeStyle.h index bf8e68d..c91d20e 100644 --- a/glabels/BarcodeStyle.h +++ b/glabels/BarcodeStyle.h @@ -21,6 +21,7 @@ #ifndef BarcodeStyle_h #define BarcodeStyle_h + #include diff --git a/glabels/Category.cpp b/glabels/Category.cpp index 6f81337..7be974e 100644 --- a/glabels/Category.cpp +++ b/glabels/Category.cpp @@ -42,6 +42,4 @@ namespace glabels return mName; } -} - - +} // namespace glabels diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp index afa81c6..253c4e4 100644 --- a/glabels/ColorButton.cpp +++ b/glabels/ColorButton.cpp @@ -20,13 +20,12 @@ #include "ColorButton.h" +#include "ColorSwatch.h" #include #include #include -#include "ColorSwatch.h" - namespace glabels { @@ -183,4 +182,4 @@ namespace glabels emit colorChanged(); } -} +} // namespace glabels diff --git a/glabels/ColorButton.h b/glabels/ColorButton.h index 0e8296c..06a9ead 100644 --- a/glabels/ColorButton.h +++ b/glabels/ColorButton.h @@ -22,11 +22,11 @@ #define ColorButton_h -#include - #include "ColorNode.h" #include "ColorPaletteDialog.h" +#include + namespace glabels { diff --git a/glabels/ColorHistory.cpp b/glabels/ColorHistory.cpp index 5198450..7169947 100644 --- a/glabels/ColorHistory.cpp +++ b/glabels/ColorHistory.cpp @@ -20,7 +20,6 @@ #include "ColorHistory.h" - #include #include @@ -116,4 +115,4 @@ namespace glabels settings.endGroup(); } -} +} // namespace glabels diff --git a/glabels/ColorNode.cpp b/glabels/ColorNode.cpp index 6a76121..7e93092 100644 --- a/glabels/ColorNode.cpp +++ b/glabels/ColorNode.cpp @@ -20,7 +20,6 @@ #include "ColorNode.h" - #include "Merge/Record.h" @@ -200,4 +199,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/ColorNode.h b/glabels/ColorNode.h index 69bf002..54cc26b 100644 --- a/glabels/ColorNode.h +++ b/glabels/ColorNode.h @@ -22,12 +22,12 @@ #define ColorNode_h -#include +#include "Merge/Record.h" #include #include -#include "Merge/Record.h" +#include namespace glabels diff --git a/glabels/ColorPaletteButtonItem.cpp b/glabels/ColorPaletteButtonItem.cpp index e7438b2..ce8d5bf 100644 --- a/glabels/ColorPaletteButtonItem.cpp +++ b/glabels/ColorPaletteButtonItem.cpp @@ -20,7 +20,6 @@ #include "ColorPaletteButtonItem.h" - #include #include @@ -122,4 +121,4 @@ namespace glabels emit activated(); } -} +} // namespace glabels diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp index 27d3729..fd04131 100644 --- a/glabels/ColorPaletteDialog.cpp +++ b/glabels/ColorPaletteDialog.cpp @@ -20,7 +20,6 @@ #include "ColorPaletteDialog.h" - #include #include #include @@ -324,4 +323,4 @@ namespace glabels QDialog::showEvent( event ); } -} +} // namespace glabels diff --git a/glabels/ColorPaletteDialog.h b/glabels/ColorPaletteDialog.h index 22d971f..ec3234a 100644 --- a/glabels/ColorPaletteDialog.h +++ b/glabels/ColorPaletteDialog.h @@ -22,14 +22,14 @@ #define ColorPaletteDialog_h -#include -#include - #include "ColorNode.h" #include "ColorHistory.h" #include "ColorPaletteItem.h" #include "ColorPaletteButtonItem.h" +#include +#include + namespace glabels { diff --git a/glabels/ColorPaletteItem.cpp b/glabels/ColorPaletteItem.cpp index d53f8fa..bd9c588 100644 --- a/glabels/ColorPaletteItem.cpp +++ b/glabels/ColorPaletteItem.cpp @@ -20,7 +20,6 @@ #include "ColorPaletteItem.h" - #include #include @@ -146,4 +145,4 @@ namespace glabels emit activated( mId ); } -} +} // namespace glabels diff --git a/glabels/ColorSwatch.cpp b/glabels/ColorSwatch.cpp index 0b97a2d..c5e6eb0 100644 --- a/glabels/ColorSwatch.cpp +++ b/glabels/ColorSwatch.cpp @@ -20,7 +20,6 @@ #include "ColorSwatch.h" - #include @@ -58,4 +57,4 @@ namespace glabels painter.drawRect( 1, 1, w-2, h-2 ); } -} +} // namespace glabels diff --git a/glabels/Cursors.cpp b/glabels/Cursors.cpp index a54703a..a26fb7f 100644 --- a/glabels/Cursors.cpp +++ b/glabels/Cursors.cpp @@ -67,4 +67,4 @@ namespace glabels // empty } -} +} // namespace glabels diff --git a/glabels/DataCache.cpp b/glabels/DataCache.cpp index 63dc0f1..6f4c93f 100644 --- a/glabels/DataCache.cpp +++ b/glabels/DataCache.cpp @@ -107,4 +107,4 @@ namespace glabels } -} +} // namespace glabels diff --git a/glabels/Db.cpp b/glabels/Db.cpp index 6d62a69..a136ac6 100644 --- a/glabels/Db.cpp +++ b/glabels/Db.cpp @@ -20,10 +20,6 @@ #include "Db.h" - -#include -#include - #include "Config.h" #include "StrUtil.h" #include "FileUtil.h" @@ -32,6 +28,9 @@ #include "XmlTemplateParser.h" #include "XmlVendorParser.h" +#include +#include + namespace glabels { @@ -686,4 +685,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/Db.h b/glabels/Db.h index 99313a9..0d47998 100644 --- a/glabels/Db.h +++ b/glabels/Db.h @@ -22,16 +22,16 @@ #define glabels_Db_h -#include -#include -#include -#include - #include "Category.h" #include "Paper.h" #include "Template.h" #include "Vendor.h" +#include +#include +#include +#include + namespace glabels { diff --git a/glabels/Distance.cpp b/glabels/Distance.cpp index 1e0f569..5d83f22 100644 --- a/glabels/Distance.cpp +++ b/glabels/Distance.cpp @@ -20,7 +20,6 @@ #include "Distance.h" - #include #include @@ -204,4 +203,5 @@ namespace glabels Units units(unitsId); return QString::number( inUnits(units) ) + units.toIdString(); } -} + +} // namespace glabels diff --git a/glabels/Distance.h b/glabels/Distance.h index b3d1712..ee6ca05 100644 --- a/glabels/Distance.h +++ b/glabels/Distance.h @@ -22,11 +22,11 @@ #define glabels_Distance_h +#include "Units.h" + #include #include -#include "Units.h" - namespace glabels { diff --git a/glabels/EnumUtil.cpp b/glabels/EnumUtil.cpp index 69d1979..a6d4e50 100644 --- a/glabels/EnumUtil.cpp +++ b/glabels/EnumUtil.cpp @@ -123,4 +123,4 @@ namespace glabels } -} +} // namespace glabels diff --git a/glabels/FieldButton.cpp b/glabels/FieldButton.cpp index b897cb7..9fe7c5c 100644 --- a/glabels/FieldButton.cpp +++ b/glabels/FieldButton.cpp @@ -20,7 +20,6 @@ #include "FieldButton.h" - #include #include @@ -106,4 +105,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/File.cpp b/glabels/File.cpp index d7e78eb..a7c6216 100644 --- a/glabels/File.cpp +++ b/glabels/File.cpp @@ -20,11 +20,6 @@ #include "File.h" - -#include -#include -#include - #include "FileUtil.h" #include "LabelModel.h" #include "MainWindow.h" @@ -32,6 +27,10 @@ #include "XmlLabelParser.h" #include "XmlLabelCreator.h" +#include +#include +#include + namespace glabels { @@ -244,4 +243,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/FileUtil.cpp b/glabels/FileUtil.cpp index b64a602..31c92ed 100644 --- a/glabels/FileUtil.cpp +++ b/glabels/FileUtil.cpp @@ -20,10 +20,10 @@ #include "FileUtil.h" -#include - #include "Config.h" +#include + namespace glabels { @@ -84,4 +84,4 @@ namespace glabels return QDir("/"); } -} +} // namespace glabels diff --git a/glabels/Frame.cpp b/glabels/Frame.cpp index 20a62d0..b4248fe 100644 --- a/glabels/Frame.cpp +++ b/glabels/Frame.cpp @@ -20,7 +20,6 @@ #include "Frame.h" - #include "Markup.h" @@ -134,4 +133,4 @@ namespace glabels mMarkups << markup; } -} +} // namespace glabels diff --git a/glabels/Frame.h b/glabels/Frame.h index e7dbd71..65521ca 100644 --- a/glabels/Frame.h +++ b/glabels/Frame.h @@ -22,16 +22,16 @@ #define glabels_Frame_h +#include "Distance.h" +#include "Layout.h" +#include "Point.h" + #include #include #include #include #include -#include "Distance.h" -#include "Layout.h" -#include "Point.h" - namespace glabels { diff --git a/glabels/FrameCd.cpp b/glabels/FrameCd.cpp index c585252..15f7ffe 100644 --- a/glabels/FrameCd.cpp +++ b/glabels/FrameCd.cpp @@ -20,12 +20,11 @@ #include "FrameCd.h" - -#include - #include "Constants.h" #include "StrUtil.h" +#include + namespace glabels { @@ -215,5 +214,4 @@ namespace glabels return path; } -} - +} // namespace glabels diff --git a/glabels/FrameEllipse.cpp b/glabels/FrameEllipse.cpp index 55be6a3..966b8fb 100644 --- a/glabels/FrameEllipse.cpp +++ b/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 diff --git a/glabels/FrameRect.cpp b/glabels/FrameRect.cpp index 207df40..ddbd2b6 100644 --- a/glabels/FrameRect.cpp +++ b/glabels/FrameRect.cpp @@ -20,7 +20,6 @@ #include "FrameRect.h" - #include "Constants.h" #include "StrUtil.h" @@ -149,5 +148,4 @@ namespace glabels } -} - +} // namespace glabels diff --git a/glabels/FrameRound.cpp b/glabels/FrameRound.cpp index 86f9dde..e5241ed 100644 --- a/glabels/FrameRound.cpp +++ b/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 diff --git a/glabels/Handles.cpp b/glabels/Handles.cpp index ab8a392..1912a14 100644 --- a/glabels/Handles.cpp +++ b/glabels/Handles.cpp @@ -20,12 +20,11 @@ #include "Handles.h" +#include "LabelModelObject.h" #include #include -#include "LabelModelObject.h" - namespace glabels { @@ -586,4 +585,4 @@ namespace glabels return pathAt( scale, mOwner->w(), mOwner->h() ); } -} +} // namespace glabels diff --git a/glabels/Handles.h b/glabels/Handles.h index 4494ddd..a1c9dd2 100644 --- a/glabels/Handles.h +++ b/glabels/Handles.h @@ -22,11 +22,11 @@ #define Handles_h +#include "Distance.h" + #include #include -#include "Distance.h" - namespace glabels { diff --git a/glabels/Help.cpp b/glabels/Help.cpp index 9cf8b87..c41ee01 100644 --- a/glabels/Help.cpp +++ b/glabels/Help.cpp @@ -20,11 +20,10 @@ #include "Help.h" +#include "AboutDialog.h" #include -#include "AboutDialog.h" - namespace glabels { @@ -47,4 +46,4 @@ namespace glabels dialog.exec(); } -} +} // namespace glabels diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index cf3ca9d..d1e39f3 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -20,11 +20,6 @@ #include "LabelEditor.h" - -#include -#include -#include - #include "Cursors.h" #include "FrameCd.h" #include "FrameEllipse.h" @@ -41,6 +36,10 @@ #include "Settings.h" #include "UndoRedoModel.h" +#include +#include +#include + namespace glabels { @@ -1250,4 +1249,4 @@ namespace glabels emit zoomChanged(); } -} +} // namespace glabels diff --git a/glabels/LabelEditor.h b/glabels/LabelEditor.h index c0bb958..e9f709d 100644 --- a/glabels/LabelEditor.h +++ b/glabels/LabelEditor.h @@ -22,12 +22,12 @@ #define LabelEditor_h +#include "Region.h" + #include #include #include -#include "Region.h" - namespace glabels { diff --git a/glabels/LabelModel.cpp b/glabels/LabelModel.cpp index 13c8e7a..d1bd9f7 100644 --- a/glabels/LabelModel.cpp +++ b/glabels/LabelModel.cpp @@ -20,13 +20,6 @@ #include "LabelModel.h" - -#include -#include -#include -#include -#include - #include "LabelModelObject.h" #include "LabelModelTextObject.h" #include "LabelModelImageObject.h" @@ -37,6 +30,12 @@ #include "Merge/None.h" +#include +#include +#include +#include +#include + namespace glabels { @@ -1442,4 +1441,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/LabelModel.h b/glabels/LabelModel.h index 45b6c3d..5cdeca9 100644 --- a/glabels/LabelModel.h +++ b/glabels/LabelModel.h @@ -22,16 +22,16 @@ #define LabelModel_h -#include -#include -#include - #include "Settings.h" #include "Template.h" #include "Merge/Merge.h" #include "Merge/Record.h" +#include +#include +#include + namespace glabels { diff --git a/glabels/LabelModelBoxObject.cpp b/glabels/LabelModelBoxObject.cpp index af3b7bd..ba64961 100644 --- a/glabels/LabelModelBoxObject.cpp +++ b/glabels/LabelModelBoxObject.cpp @@ -20,7 +20,6 @@ #include "LabelModelBoxObject.h" - #include #include @@ -167,4 +166,4 @@ namespace glabels return path; } -} +} // namespace glabels diff --git a/glabels/LabelModelEllipseObject.cpp b/glabels/LabelModelEllipseObject.cpp index d053685..56b2ffa 100644 --- a/glabels/LabelModelEllipseObject.cpp +++ b/glabels/LabelModelEllipseObject.cpp @@ -20,7 +20,6 @@ #include "LabelModelEllipseObject.h" - #include #include @@ -167,4 +166,4 @@ namespace glabels return path; } -} +} // namespace glabels diff --git a/glabels/LabelModelImageObject.cpp b/glabels/LabelModelImageObject.cpp index d3c35b8..524ad7e 100644 --- a/glabels/LabelModelImageObject.cpp +++ b/glabels/LabelModelImageObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelImageObject.h" +#include "Size.h" #include #include @@ -27,8 +28,6 @@ #include #include -#include "Size.h" - namespace glabels { @@ -440,4 +439,4 @@ namespace glabels return shadow; } -} +} // namespace glabels diff --git a/glabels/LabelModelImageObject.h b/glabels/LabelModelImageObject.h index 112aef4..a4419bd 100644 --- a/glabels/LabelModelImageObject.h +++ b/glabels/LabelModelImageObject.h @@ -22,10 +22,10 @@ #define LabelModelImageObject_h -#include - #include "LabelModelObject.h" +#include + namespace glabels { diff --git a/glabels/LabelModelLineObject.cpp b/glabels/LabelModelLineObject.cpp index a352e67..7aadcba 100644 --- a/glabels/LabelModelLineObject.cpp +++ b/glabels/LabelModelLineObject.cpp @@ -20,7 +20,6 @@ #include "LabelModelLineObject.h" - #include #include @@ -206,4 +205,4 @@ namespace glabels return path; } -} +} // namespace glabels diff --git a/glabels/LabelModelObject.cpp b/glabels/LabelModelObject.cpp index 687444e..c7e06c6 100644 --- a/glabels/LabelModelObject.cpp +++ b/glabels/LabelModelObject.cpp @@ -20,16 +20,15 @@ #include "LabelModelObject.h" - -#include -#include - #include "ColorNode.h" #include "BarcodeStyle.h" #include "Region.h" #include "Size.h" #include "TextNode.h" +#include +#include + namespace glabels { @@ -1179,4 +1178,4 @@ namespace glabels // empty } -} +} // namespace glabels diff --git a/glabels/LabelModelObject.h b/glabels/LabelModelObject.h index 49bd298..c08328a 100644 --- a/glabels/LabelModelObject.h +++ b/glabels/LabelModelObject.h @@ -22,11 +22,6 @@ #define LabelModelObject_h -#include -#include -#include -#include - #include "BarcodeStyle.h" #include "ColorNode.h" #include "Distance.h" @@ -36,6 +31,11 @@ #include "Merge/Record.h" +#include +#include +#include +#include + namespace glabels { diff --git a/glabels/LabelModelShapeObject.cpp b/glabels/LabelModelShapeObject.cpp index 3584def..d62893a 100644 --- a/glabels/LabelModelShapeObject.cpp +++ b/glabels/LabelModelShapeObject.cpp @@ -20,7 +20,6 @@ #include "LabelModelShapeObject.h" - #include #include @@ -168,4 +167,4 @@ namespace glabels return true; } -} +} // namespace glabels diff --git a/glabels/LabelModelTextObject.cpp b/glabels/LabelModelTextObject.cpp index 5b3ddd4..393e732 100644 --- a/glabels/LabelModelTextObject.cpp +++ b/glabels/LabelModelTextObject.cpp @@ -20,6 +20,7 @@ #include "LabelModelTextObject.h" +#include "Size.h" #include #include @@ -28,8 +29,6 @@ #include #include -#include "Size.h" - namespace glabels { @@ -693,4 +692,4 @@ namespace glabels return text; } -} +} // namespace glabels diff --git a/glabels/LabelModelTextObject.h b/glabels/LabelModelTextObject.h index 6c0a408..b0a5e40 100644 --- a/glabels/LabelModelTextObject.h +++ b/glabels/LabelModelTextObject.h @@ -22,10 +22,10 @@ #define LabelModelTextObject_h -#include - #include "LabelModelObject.h" +#include + namespace glabels { diff --git a/glabels/Layout.cpp b/glabels/Layout.cpp index 3c6e5ee..b219f88 100644 --- a/glabels/Layout.cpp +++ b/glabels/Layout.cpp @@ -20,11 +20,10 @@ #include "Layout.h" +#include "Constants.h" #include -#include "Constants.h" - namespace glabels { @@ -102,4 +101,4 @@ namespace glabels return other; } -} +} // namespace glabels diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index bd7c7cc..1cd67c7 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -20,23 +20,6 @@ #include "MainWindow.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "Db.h" #include "File.h" #include "Help.h" @@ -51,6 +34,13 @@ #include "StartupView.h" #include "UndoRedoModel.h" +#include +#include +#include +#include +#include +#include + namespace glabels { @@ -1544,4 +1534,4 @@ namespace glabels editRedoAction->setEnabled( mUndoRedoModel->canRedo() ); } -} +} // namespace glabels diff --git a/glabels/Markup.cpp b/glabels/Markup.cpp index e8220bc..76cabd1 100644 --- a/glabels/Markup.cpp +++ b/glabels/Markup.cpp @@ -209,4 +209,4 @@ namespace glabels return mR; } -} +} // namespace glabels diff --git a/glabels/Markup.h b/glabels/Markup.h index 749cd63..2df99bc 100644 --- a/glabels/Markup.h +++ b/glabels/Markup.h @@ -22,10 +22,10 @@ #define glabels_Markup_h -#include - #include "Frame.h" +#include + namespace glabels { diff --git a/glabels/Merge/Factory.cpp b/glabels/Merge/Factory.cpp index 5c25499..3182c06 100644 --- a/glabels/Merge/Factory.cpp +++ b/glabels/Merge/Factory.cpp @@ -219,6 +219,6 @@ namespace glabels mNameList << name; } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/Factory.h b/glabels/Merge/Factory.h index 6d1b4a8..aad6d26 100644 --- a/glabels/Merge/Factory.h +++ b/glabels/Merge/Factory.h @@ -21,6 +21,7 @@ #ifndef merge_Factory_h #define merge_Factory_h + #include #include #include diff --git a/glabels/Merge/Merge.cpp b/glabels/Merge/Merge.cpp index 51bcfa7..b377523 100644 --- a/glabels/Merge/Merge.cpp +++ b/glabels/Merge/Merge.cpp @@ -210,6 +210,6 @@ namespace glabels return list; } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/Merge.h b/glabels/Merge/Merge.h index b50e0f4..4dd6ac3 100644 --- a/glabels/Merge/Merge.h +++ b/glabels/Merge/Merge.h @@ -21,6 +21,7 @@ #ifndef merge_Merge_h #define merge_Merge_h + #include #include #include diff --git a/glabels/Merge/None.cpp b/glabels/Merge/None.cpp index bfaafa5..bdb0f4e 100644 --- a/glabels/Merge/None.cpp +++ b/glabels/Merge/None.cpp @@ -122,6 +122,6 @@ namespace glabels return nullptr; } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/Record.cpp b/glabels/Merge/Record.cpp index ec35a30..d628c3c 100644 --- a/glabels/Merge/Record.cpp +++ b/glabels/Merge/Record.cpp @@ -70,6 +70,6 @@ namespace glabels mSelected = value; } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/Record.h b/glabels/Merge/Record.h index 58b0529..6c17aaa 100644 --- a/glabels/Merge/Record.h +++ b/glabels/Merge/Record.h @@ -21,6 +21,7 @@ #ifndef merge_Record_h #define merge_Record_h + #include #include diff --git a/glabels/Merge/Text.cpp b/glabels/Merge/Text.cpp index 6125f3f..2425a03 100644 --- a/glabels/Merge/Text.cpp +++ b/glabels/Merge/Text.cpp @@ -21,6 +21,7 @@ #include "Text.h" #include "Record.h" + #include @@ -415,6 +416,6 @@ namespace glabels return fields; } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextColon.cpp b/glabels/Merge/TextColon.cpp index 0d6da02..8c4ee1d 100644 --- a/glabels/Merge/TextColon.cpp +++ b/glabels/Merge/TextColon.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextColon(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextColon.h b/glabels/Merge/TextColon.h index d58bea1..742442f 100644 --- a/glabels/Merge/TextColon.h +++ b/glabels/Merge/TextColon.h @@ -21,6 +21,7 @@ #ifndef merge_TextColon_h #define merge_TextColon_h + #include "Text.h" diff --git a/glabels/Merge/TextColonKeys.cpp b/glabels/Merge/TextColonKeys.cpp index 8f0be5d..5b227bb 100644 --- a/glabels/Merge/TextColonKeys.cpp +++ b/glabels/Merge/TextColonKeys.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextColonKeys(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextColonKeys.h b/glabels/Merge/TextColonKeys.h index 2dddfba..de0d063 100644 --- a/glabels/Merge/TextColonKeys.h +++ b/glabels/Merge/TextColonKeys.h @@ -21,6 +21,7 @@ #ifndef merge_TextColonKeys_h #define merge_TextColonKeys_h + #include "Text.h" diff --git a/glabels/Merge/TextCsv.cpp b/glabels/Merge/TextCsv.cpp index 0a5aa37..2f1e636 100644 --- a/glabels/Merge/TextCsv.cpp +++ b/glabels/Merge/TextCsv.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextCsv(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextCsv.h b/glabels/Merge/TextCsv.h index a750cb1..f48405c 100644 --- a/glabels/Merge/TextCsv.h +++ b/glabels/Merge/TextCsv.h @@ -21,6 +21,7 @@ #ifndef merge_TextCsv_h #define merge_TextCsv_h + #include "Text.h" diff --git a/glabels/Merge/TextCsvKeys.cpp b/glabels/Merge/TextCsvKeys.cpp index 5499042..cbd647a 100644 --- a/glabels/Merge/TextCsvKeys.cpp +++ b/glabels/Merge/TextCsvKeys.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextCsvKeys(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextCsvKeys.h b/glabels/Merge/TextCsvKeys.h index f8935be..8b674be 100644 --- a/glabels/Merge/TextCsvKeys.h +++ b/glabels/Merge/TextCsvKeys.h @@ -21,6 +21,7 @@ #ifndef merge_TextCsvKeys_h #define merge_TextCsvKeys_h + #include "Text.h" diff --git a/glabels/Merge/TextSemicolon.cpp b/glabels/Merge/TextSemicolon.cpp index ddcf3be..cdd8e74 100644 --- a/glabels/Merge/TextSemicolon.cpp +++ b/glabels/Merge/TextSemicolon.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextSemicolon(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextSemicolon.h b/glabels/Merge/TextSemicolon.h index 07c8d06..fde25f2 100644 --- a/glabels/Merge/TextSemicolon.h +++ b/glabels/Merge/TextSemicolon.h @@ -21,6 +21,7 @@ #ifndef merge_TextSemicolon_h #define merge_TextSemicolon_h + #include "Text.h" diff --git a/glabels/Merge/TextSemicolonKeys.cpp b/glabels/Merge/TextSemicolonKeys.cpp index b457559..760041d 100644 --- a/glabels/Merge/TextSemicolonKeys.cpp +++ b/glabels/Merge/TextSemicolonKeys.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextSemicolonKeys(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextSemicolonKeys.h b/glabels/Merge/TextSemicolonKeys.h index 993f9a7..6281e4b 100644 --- a/glabels/Merge/TextSemicolonKeys.h +++ b/glabels/Merge/TextSemicolonKeys.h @@ -21,6 +21,7 @@ #ifndef merge_TextSemicolonKeys_h #define merge_TextSemicolonKeys_h + #include "Text.h" diff --git a/glabels/Merge/TextTsv.cpp b/glabels/Merge/TextTsv.cpp index 52ace5a..4963efc 100644 --- a/glabels/Merge/TextTsv.cpp +++ b/glabels/Merge/TextTsv.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextTsv(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextTsv.h b/glabels/Merge/TextTsv.h index eab05a0..59b8e8f 100644 --- a/glabels/Merge/TextTsv.h +++ b/glabels/Merge/TextTsv.h @@ -21,6 +21,7 @@ #ifndef merge_TextTsv_h #define merge_TextTsv_h + #include "Text.h" diff --git a/glabels/Merge/TextTsvKeys.cpp b/glabels/Merge/TextTsvKeys.cpp index 41a1320..4a1967d 100644 --- a/glabels/Merge/TextTsvKeys.cpp +++ b/glabels/Merge/TextTsvKeys.cpp @@ -80,6 +80,6 @@ namespace glabels return new TextTsvKeys(); } - } + } // namespace merge -} +} // namespace glabels diff --git a/glabels/Merge/TextTsvKeys.h b/glabels/Merge/TextTsvKeys.h index c26d748..7347c88 100644 --- a/glabels/Merge/TextTsvKeys.h +++ b/glabels/Merge/TextTsvKeys.h @@ -21,6 +21,7 @@ #ifndef merge_TextTsvKeys_h #define merge_TextTsvKeys_h + #include "Text.h" diff --git a/glabels/MergeView.cpp b/glabels/MergeView.cpp index 8868e30..bcb0783 100644 --- a/glabels/MergeView.cpp +++ b/glabels/MergeView.cpp @@ -20,15 +20,14 @@ #include "MergeView.h" +#include "LabelModel.h" + +#include "Merge/Factory.h" #include #include #include -#include "LabelModel.h" - -#include "Merge/Factory.h" - namespace glabels { @@ -330,4 +329,4 @@ namespace glabels mBlock = false; } -} +} // namespace glabels diff --git a/glabels/MiniPreviewPixmap.cpp b/glabels/MiniPreviewPixmap.cpp index 11c12d1..4e77fcc 100644 --- a/glabels/MiniPreviewPixmap.cpp +++ b/glabels/MiniPreviewPixmap.cpp @@ -20,7 +20,6 @@ #include "MiniPreviewPixmap.h" - #include "Template.h" @@ -135,5 +134,4 @@ namespace glabels painter.restore(); } -} - +} // namespace glabels diff --git a/glabels/MiniPreviewPixmap.h b/glabels/MiniPreviewPixmap.h index a4061b7..684ae5a 100644 --- a/glabels/MiniPreviewPixmap.h +++ b/glabels/MiniPreviewPixmap.h @@ -22,11 +22,11 @@ #define glabels_MiniPreviewPixmap_h +#include "Point.h" + #include #include -#include "Point.h" - namespace glabels { diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp index b3d75b2..2d496a5 100644 --- a/glabels/ObjectEditor.cpp +++ b/glabels/ObjectEditor.cpp @@ -20,11 +20,6 @@ #include "ObjectEditor.h" - -#include -#include -#include - #include "LabelModel.h" #include "LabelModelObject.h" #include "LabelModelBoxObject.h" @@ -38,6 +33,10 @@ #include "Merge/Merge.h" +#include +#include +#include + namespace glabels { @@ -697,4 +696,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/ObjectEditor.h b/glabels/ObjectEditor.h index 47abb4d..c66cecc 100644 --- a/glabels/ObjectEditor.h +++ b/glabels/ObjectEditor.h @@ -22,12 +22,12 @@ #define ObjectEditor_h -#include - #include "ui_ObjectEditor.h" #include "Distance.h" +#include + namespace glabels { diff --git a/glabels/Outline.cpp b/glabels/Outline.cpp index 29b01be..6a2db20 100644 --- a/glabels/Outline.cpp +++ b/glabels/Outline.cpp @@ -20,11 +20,10 @@ #include "Outline.h" +#include "LabelModelObject.h" #include -#include "LabelModelObject.h" - namespace glabels { @@ -133,4 +132,4 @@ namespace glabels return path; } -} +} // namespace glabels diff --git a/glabels/PageRenderer.cpp b/glabels/PageRenderer.cpp index c8d7f74..37038b7 100644 --- a/glabels/PageRenderer.cpp +++ b/glabels/PageRenderer.cpp @@ -20,15 +20,14 @@ #include "PageRenderer.h" - -#include - #include "LabelModel.h" #include "Merge/Merge.h" #include "Merge/None.h" #include "Merge/Record.h" +#include + namespace glabels { @@ -396,4 +395,4 @@ namespace glabels painter->restore(); } -} +} // namespace glabels diff --git a/glabels/PageRenderer.h b/glabels/PageRenderer.h index 90bb90d..1415aee 100644 --- a/glabels/PageRenderer.h +++ b/glabels/PageRenderer.h @@ -22,15 +22,15 @@ #define PageRenderer_h -#include -#include -#include - #include "Point.h" #include "Merge/Merge.h" #include "Merge/Record.h" +#include +#include +#include + namespace glabels { diff --git a/glabels/Paper.cpp b/glabels/Paper.cpp index 001fee6..eebe081 100644 --- a/glabels/Paper.cpp +++ b/glabels/Paper.cpp @@ -76,4 +76,4 @@ namespace glabels return mPwgSize.startsWith( "na_" ); } -} +} // namespace glabels diff --git a/glabels/Paper.h b/glabels/Paper.h index 2cde61d..749e87e 100644 --- a/glabels/Paper.h +++ b/glabels/Paper.h @@ -22,10 +22,10 @@ #define glabels_Paper_h -#include - #include "Distance.h" +#include + namespace glabels { diff --git a/glabels/Point.cpp b/glabels/Point.cpp index 36ceaeb..efdc75b 100644 --- a/glabels/Point.cpp +++ b/glabels/Point.cpp @@ -61,4 +61,4 @@ namespace glabels return false; } -} +} // namespace glabels diff --git a/glabels/PreferencesDialog.cpp b/glabels/PreferencesDialog.cpp index bb31ea6..7a9e7cc 100644 --- a/glabels/PreferencesDialog.cpp +++ b/glabels/PreferencesDialog.cpp @@ -20,7 +20,6 @@ #include "PreferencesDialog.h" - #include "Settings.h" @@ -83,4 +82,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/Preview.cpp b/glabels/Preview.cpp index 5b41c05..d76f844 100644 --- a/glabels/Preview.cpp +++ b/glabels/Preview.cpp @@ -20,14 +20,13 @@ #include "Preview.h" +#include "LabelModel.h" +#include "PreviewOverlayItem.h" #include #include #include -#include "LabelModel.h" -#include "PreviewOverlayItem.h" - namespace glabels { @@ -199,4 +198,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/Preview.h b/glabels/Preview.h index db41381..b7731d7 100644 --- a/glabels/Preview.h +++ b/glabels/Preview.h @@ -22,11 +22,11 @@ #define Preview_h +#include "PageRenderer.h" + #include #include -#include "PageRenderer.h" - namespace glabels { diff --git a/glabels/PreviewOverlayItem.cpp b/glabels/PreviewOverlayItem.cpp index 0525afb..3961144 100644 --- a/glabels/PreviewOverlayItem.cpp +++ b/glabels/PreviewOverlayItem.cpp @@ -20,11 +20,10 @@ #include "PreviewOverlayItem.h" +#include "PageRenderer.h" #include -#include "PageRenderer.h" - namespace glabels { @@ -47,4 +46,4 @@ namespace glabels mRenderer->printPage( painter ); } -} +} // namespace glabels diff --git a/glabels/PrintView.cpp b/glabels/PrintView.cpp index a87584f..cdde000 100644 --- a/glabels/PrintView.cpp +++ b/glabels/PrintView.cpp @@ -20,12 +20,11 @@ #include "PrintView.h" +#include "LabelModel.h" #include #include -#include "LabelModel.h" - namespace glabels { @@ -156,4 +155,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/PrintView.h b/glabels/PrintView.h index e968964..de9fabe 100644 --- a/glabels/PrintView.h +++ b/glabels/PrintView.h @@ -22,11 +22,12 @@ #define PrintView_h -#include - #include "ui_PrintView.h" + #include "PageRenderer.h" +#include + namespace glabels { diff --git a/glabels/PropertiesView.cpp b/glabels/PropertiesView.cpp index 7683bf6..833e32d 100644 --- a/glabels/PropertiesView.cpp +++ b/glabels/PropertiesView.cpp @@ -20,16 +20,15 @@ #include "PropertiesView.h" - -#include -#include - #include "Db.h" #include "LabelModel.h" #include "SelectProductDialog.h" #include "Settings.h" #include "UndoRedoModel.h" +#include +#include + namespace glabels { @@ -233,4 +232,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/Region.cpp b/glabels/Region.cpp index c322b32..1559bd9 100644 --- a/glabels/Region.cpp +++ b/glabels/Region.cpp @@ -131,4 +131,4 @@ namespace glabels return r; } -} +} // namespace glabels diff --git a/glabels/Region.h b/glabels/Region.h index 999ea40..3af9c15 100644 --- a/glabels/Region.h +++ b/glabels/Region.h @@ -22,10 +22,10 @@ #define Region_h -#include - #include "Distance.h" +#include + namespace glabels { diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp index 72c7a7c..173bd15 100644 --- a/glabels/SelectProductDialog.cpp +++ b/glabels/SelectProductDialog.cpp @@ -20,13 +20,12 @@ #include "SelectProductDialog.h" - -#include - #include "Db.h" #include "Settings.h" #include "TemplatePickerItem.h" +#include + namespace glabels { @@ -240,4 +239,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/SelectProductDialog.h b/glabels/SelectProductDialog.h index 694bb60..a4e1aef 100644 --- a/glabels/SelectProductDialog.h +++ b/glabels/SelectProductDialog.h @@ -22,10 +22,10 @@ #define SelectProductDialog_h -#include - #include "ui_SelectProductDialog.h" +#include + namespace glabels { diff --git a/glabels/Settings.cpp b/glabels/Settings.cpp index 965f15f..36551c3 100644 --- a/glabels/Settings.cpp +++ b/glabels/Settings.cpp @@ -20,7 +20,6 @@ #include "Settings.h" - #include #include #include @@ -259,4 +258,4 @@ namespace glabels emit mInstance->changed(); } -} +} // namespace glabels diff --git a/glabels/Settings.h b/glabels/Settings.h index efb0391..55e2a90 100644 --- a/glabels/Settings.h +++ b/glabels/Settings.h @@ -22,11 +22,11 @@ #define Settings_h +#include "Distance.h" + #include #include -#include "Distance.h" - namespace glabels { diff --git a/glabels/SimplePreview.cpp b/glabels/SimplePreview.cpp index efebe6f..e4b91e6 100644 --- a/glabels/SimplePreview.cpp +++ b/glabels/SimplePreview.cpp @@ -20,7 +20,6 @@ #include "SimplePreview.h" - #include #include #include @@ -255,4 +254,4 @@ namespace glabels mScene->addItem( upItem ); } -} +} // namespace glabels diff --git a/glabels/SimplePreview.h b/glabels/SimplePreview.h index 43f24ae..d81646c 100644 --- a/glabels/SimplePreview.h +++ b/glabels/SimplePreview.h @@ -22,12 +22,12 @@ #define SimplePreview_h +#include "Template.h" + #include #include #include -#include "Template.h" - namespace glabels { diff --git a/glabels/Size.cpp b/glabels/Size.cpp index fa89b51..a567881 100644 --- a/glabels/Size.cpp +++ b/glabels/Size.cpp @@ -91,4 +91,4 @@ namespace glabels return s; } -} +} // namespace glabels diff --git a/glabels/Size.h b/glabels/Size.h index c023efa..761f856 100644 --- a/glabels/Size.h +++ b/glabels/Size.h @@ -22,10 +22,10 @@ #define Size_h -#include - #include "Distance.h" +#include + namespace glabels { diff --git a/glabels/StartupView.cpp b/glabels/StartupView.cpp index 7098bed..1dbae82 100644 --- a/glabels/StartupView.cpp +++ b/glabels/StartupView.cpp @@ -20,12 +20,11 @@ #include "StartupView.h" - -#include - #include "File.h" #include "MainWindow.h" +#include + namespace glabels { @@ -60,4 +59,4 @@ namespace glabels File::open( mWindow ); } -} +} // namespace glabels diff --git a/glabels/StrUtil.cpp b/glabels/StrUtil.cpp index 0d274b5..dd59323 100644 --- a/glabels/StrUtil.cpp +++ b/glabels/StrUtil.cpp @@ -20,7 +20,6 @@ #include "StrUtil.h" - #include @@ -209,5 +208,4 @@ namespace glabels } -} - +} // namespace glabels diff --git a/glabels/Template.cpp b/glabels/Template.cpp index 9f625e5..96b87c4 100644 --- a/glabels/Template.cpp +++ b/glabels/Template.cpp @@ -20,11 +20,10 @@ #include "Template.h" +#include "Db.h" #include -#include "Db.h" - namespace glabels { @@ -298,5 +297,4 @@ namespace glabels } -} - +} // namespace glabels diff --git a/glabels/Template.h b/glabels/Template.h index 3d61aa3..4874474 100644 --- a/glabels/Template.h +++ b/glabels/Template.h @@ -22,16 +22,16 @@ #define glabels_Template_h -#include -#include -#include -#include - #include "Distance.h" #include "Frame.h" #include "MiniPreviewPixmap.h" #include "Point.h" +#include +#include +#include +#include + namespace glabels { diff --git a/glabels/TemplatePicker.cpp b/glabels/TemplatePicker.cpp index e7e7252..852005e 100644 --- a/glabels/TemplatePicker.cpp +++ b/glabels/TemplatePicker.cpp @@ -20,11 +20,10 @@ #include "TemplatePicker.h" +#include "TemplatePickerItem.h" #include -#include "TemplatePickerItem.h" - namespace glabels { @@ -150,4 +149,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/TemplatePicker.h b/glabels/TemplatePicker.h index 71155c9..c7f9527 100644 --- a/glabels/TemplatePicker.h +++ b/glabels/TemplatePicker.h @@ -22,11 +22,11 @@ #define TemplatePicker_h +#include "Template.h" + #include #include -#include "Template.h" - namespace glabels { diff --git a/glabels/TemplatePickerItem.cpp b/glabels/TemplatePickerItem.cpp index 9b65967..a7f42d0 100644 --- a/glabels/TemplatePickerItem.cpp +++ b/glabels/TemplatePickerItem.cpp @@ -20,7 +20,6 @@ #include "TemplatePickerItem.h" - #include #include #include @@ -52,4 +51,4 @@ namespace glabels return mTmplate; } -} +} // namespace glabels diff --git a/glabels/TemplatePickerItem.h b/glabels/TemplatePickerItem.h index 64da2fb..0909b73 100644 --- a/glabels/TemplatePickerItem.h +++ b/glabels/TemplatePickerItem.h @@ -22,11 +22,11 @@ #define TemplatePickerItem_h +#include "Template.h" + #include #include -#include "Template.h" - namespace glabels { diff --git a/glabels/TextNode.cpp b/glabels/TextNode.cpp index e5d8ca4..f5c45fa 100644 --- a/glabels/TextNode.cpp +++ b/glabels/TextNode.cpp @@ -146,4 +146,4 @@ namespace glabels return false; } -} +} // namespace glabels diff --git a/glabels/TextNode.h b/glabels/TextNode.h index 522b9e4..82e52e5 100644 --- a/glabels/TextNode.h +++ b/glabels/TextNode.h @@ -22,10 +22,10 @@ #define TextNode_h -#include - #include "Merge/Record.h" +#include + namespace glabels { diff --git a/glabels/UndoRedoModel.cpp b/glabels/UndoRedoModel.cpp index 219e442..f292978 100644 --- a/glabels/UndoRedoModel.cpp +++ b/glabels/UndoRedoModel.cpp @@ -20,7 +20,6 @@ #include "UndoRedoModel.h" - #include "LabelModel.h" @@ -260,4 +259,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/Units.cpp b/glabels/Units.cpp index 572a6b4..b88757b 100644 --- a/glabels/Units.cpp +++ b/glabels/Units.cpp @@ -20,7 +20,6 @@ #include "Units.h" - #include #include @@ -257,4 +256,4 @@ namespace glabels } -} +} // namespace glabels diff --git a/glabels/Vendor.cpp b/glabels/Vendor.cpp index 9b81fff..3f9a71e 100644 --- a/glabels/Vendor.cpp +++ b/glabels/Vendor.cpp @@ -41,4 +41,4 @@ namespace glabels return mUrl; } -} +} // namespace glabels diff --git a/glabels/XmlCategoryParser.cpp b/glabels/XmlCategoryParser.cpp index 08e8c4a..838c45d 100644 --- a/glabels/XmlCategoryParser.cpp +++ b/glabels/XmlCategoryParser.cpp @@ -20,16 +20,15 @@ #include "XmlCategoryParser.h" +#include "Category.h" +#include "Db.h" +#include "XmlUtil.h" #include #include #include #include -#include "Category.h" -#include "Db.h" -#include "XmlUtil.h" - namespace glabels { @@ -101,5 +100,4 @@ namespace glabels } } -} - +} // namespace glabels diff --git a/glabels/XmlLabelCreator.cpp b/glabels/XmlLabelCreator.cpp index cab2da5..884413d 100644 --- a/glabels/XmlLabelCreator.cpp +++ b/glabels/XmlLabelCreator.cpp @@ -20,14 +20,6 @@ #include "XmlLabelCreator.h" - -#include -#include -#include -#include -#include -#include - #include "EnumUtil.h" #include "LabelModel.h" #include "LabelModelObject.h" @@ -43,6 +35,13 @@ #include "Merge/None.h" +#include +#include +#include +#include +#include +#include + namespace glabels { @@ -491,4 +490,4 @@ namespace glabels node.appendChild( doc.createCDATASection( QString( svg ) ) ); } -} +} // namespace glabels diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp index 024849a..abca531 100644 --- a/glabels/XmlLabelParser.cpp +++ b/glabels/XmlLabelParser.cpp @@ -20,15 +20,6 @@ #include "XmlLabelParser.h" - -#include -#include -#include -#include -#include - -#include - #include "EnumUtil.h" #include "LabelModel.h" #include "LabelModelObject.h" @@ -44,6 +35,14 @@ #include "Merge/Factory.h" +#include +#include +#include +#include +#include + +#include + namespace glabels { @@ -680,4 +679,4 @@ namespace glabels } } -} +} // namespace glabels diff --git a/glabels/XmlPaperParser.cpp b/glabels/XmlPaperParser.cpp index 6a962bf..5bc29c2 100644 --- a/glabels/XmlPaperParser.cpp +++ b/glabels/XmlPaperParser.cpp @@ -20,16 +20,15 @@ #include "XmlPaperParser.h" +#include "Db.h" +#include "Paper.h" +#include "XmlUtil.h" #include #include #include #include -#include "Db.h" -#include "Paper.h" -#include "XmlUtil.h" - namespace glabels { @@ -38,7 +37,7 @@ namespace glabels { QFile file( fileName ); - if ( !file.open( QFile::ReadOnly | QFile::Text) ) + if ( !file.open( QFile::ReadOnly | QFile::Text ) ) { qWarning() << "Error: Cannot read file " << fileName << ": " << file.errorString(); @@ -106,5 +105,4 @@ namespace glabels } } -} - +} // namespace glabels diff --git a/glabels/XmlTemplateCreator.cpp b/glabels/XmlTemplateCreator.cpp index 3842007..7d312a0 100644 --- a/glabels/XmlTemplateCreator.cpp +++ b/glabels/XmlTemplateCreator.cpp @@ -20,15 +20,14 @@ #include "XmlTemplateCreator.h" +#include "Db.h" +#include "Template.h" +#include "XmlUtil.h" #include #include #include -#include "Db.h" -#include "Template.h" -#include "XmlUtil.h" - namespace glabels { @@ -331,5 +330,4 @@ namespace glabels XmlUtil::setLengthAttr( node, "h", markup->h() ); } -} - +} // namespace glabels diff --git a/glabels/XmlTemplateCreator.h b/glabels/XmlTemplateCreator.h index 63948d5..688a945 100644 --- a/glabels/XmlTemplateCreator.h +++ b/glabels/XmlTemplateCreator.h @@ -22,9 +22,6 @@ #define glabels_XmlTemplateCreator_h -#include -#include - #include "FrameCd.h" #include "FrameEllipse.h" #include "FrameRect.h" @@ -33,6 +30,9 @@ #include "Markup.h" #include "Template.h" +#include +#include + namespace glabels { diff --git a/glabels/XmlTemplateParser.cpp b/glabels/XmlTemplateParser.cpp index a9768eb..900a090 100644 --- a/glabels/XmlTemplateParser.cpp +++ b/glabels/XmlTemplateParser.cpp @@ -20,12 +20,6 @@ #include "XmlTemplateParser.h" - -#include -#include -#include -#include - #include "Db.h" #include "FrameRect.h" #include "FrameCd.h" @@ -36,6 +30,11 @@ #include "Template.h" #include "XmlUtil.h" +#include +#include +#include +#include + namespace glabels { @@ -406,5 +405,4 @@ namespace glabels frame->addMarkup( new MarkupEllipse( x1, y1, w, h ) ); } -} - +} // namespace glabels diff --git a/glabels/XmlTemplateParser.h b/glabels/XmlTemplateParser.h index 3a56c35..ac02446 100644 --- a/glabels/XmlTemplateParser.h +++ b/glabels/XmlTemplateParser.h @@ -22,11 +22,11 @@ #define glabels_XmlTemplateParser_h +#include "Template.h" + #include #include -#include "Template.h" - namespace glabels { diff --git a/glabels/XmlUtil.cpp b/glabels/XmlUtil.cpp index b2339da..a332b90 100644 --- a/glabels/XmlUtil.cpp +++ b/glabels/XmlUtil.cpp @@ -20,7 +20,6 @@ #include "XmlUtil.h" - #include #include #include @@ -291,4 +290,4 @@ namespace glabels node.setAttribute( name, QString::number(value.inUnits(mUnits)) + mUnits.toIdString() ); } -} +} // namespace glabels diff --git a/glabels/XmlUtil.h b/glabels/XmlUtil.h index 2e7117c..ce472b2 100644 --- a/glabels/XmlUtil.h +++ b/glabels/XmlUtil.h @@ -22,11 +22,12 @@ #define glabels_XmlUtil_h -#include +#include "Distance.h" + #include #include -#include "Distance.h" +#include namespace glabels diff --git a/glabels/XmlVendorParser.cpp b/glabels/XmlVendorParser.cpp index ae9d069..2fbe56f 100644 --- a/glabels/XmlVendorParser.cpp +++ b/glabels/XmlVendorParser.cpp @@ -20,16 +20,15 @@ #include "XmlVendorParser.h" +#include "Db.h" +#include "Vendor.h" +#include "XmlUtil.h" #include #include #include #include -#include "Db.h" -#include "Vendor.h" -#include "XmlUtil.h" - namespace glabels { @@ -101,5 +100,4 @@ namespace glabels } } -} - +} // namespace glabels diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 1900dad..cee1b66 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -27,7 +27,7 @@ Db - + Other @@ -84,12 +84,12 @@ Frame - + %1 x %2 (%3 per sheet) - + %1 per sheet @@ -97,8 +97,8 @@ FrameCd - - + + diameter @@ -106,8 +106,8 @@ FrameRound - - + + diameter @@ -718,27 +718,27 @@ Units - + points - + inches - + mm - + cm - + picas @@ -746,22 +746,22 @@ glabels::AboutDialog - + Version - + A program to create labels and business cards. - + gLabels 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 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. @@ -832,238 +832,238 @@ glabels::ColorPaletteDialog - + Light Scarlet Red Color name - + Light Orange Color name - + Light Butter Color name - + Light Chameleon Color name - + Light Sky Blue Color name - + Light Plum Color name - + Light Chocolate Color name - + Light Aluminum 1 Color name - + Light Aluminum 2 Color name - + Scarlet Red Color name - + Orange Color name - + Butter Color name - + Chameleon Color name - + Sky Blue Color name - + Plum Color name - + Chocolate Color name - + Aluminum 1 Color name - + Aluminum 2 Color name - + Dark Scarlet Red Color name - + Dark Orange Color name - + Dark Butter Color name - + Dark Chameleon Color name - + Dark Sky Blue Color name - + Dark Plum Color name - + Dark Chocolate Color name - + Dark Aluminum 1 Color name - + Dark Aluminum 2 Color name - + Black Color name - + Very Dark Gray Color name - + Darker Gray Color name - + Dark Gray Color name - + Medium Gray Color name - + Light Gray Color name - + Lighter Gray Color name - + Very Light Gray Color name - + White Color name - + Custom color... - + Merge key... - + Custom Color - + Custom color #%1 @@ -1071,43 +1071,43 @@ glabels::File - + gLabels - Open Project - - + + glabels files (*.glabels);;All files (*) - + Unable to open " - + ". - + gLabels - Save Project As - + Save Label As - + %1 already exists. - + Do you want to replace it? @@ -1115,16 +1115,16 @@ glabels::LabelEditor - - - - - + + + + + Move - + Delete @@ -1132,7 +1132,7 @@ glabels::LabelModel - + Untitled @@ -1140,8 +1140,8 @@ glabels::LabelModelTextObject - - + + Text @@ -1149,632 +1149,632 @@ glabels::MainWindow - + Welcome - + Home - + Properties - + Merge - + Print - + &New... - + Create a new gLabels project - + &Open... - + Open an existing gLabels project - + &Save - + Save current gLabels project - + Save &As... - + Save current gLabels project to a different name - + Template &Designer... - + Create custom templates - + &Close - + Close the current window - + E&xit - + Exit glabels - - + + Undo - - + + Redo - - - + + + Cut - - + + Cut the selection - - + + &Copy - - + + Copy the selection - - + + &Paste - - + + Paste the clipboard - - + + &Delete - - + + Delete the selected objects - + Select &All - + Select all objects - + Un-select All - + Remove all selections - + Preferences - + Configure the application - + File - + Change visibility of file toolbar in current window - + Editor - + Change visibility of editor toolbar in current window - + Grid - + Change visibility of the grid in current window - + Markup - + Change visibility of markup lines in current window - + Zoom &In - + Increase magnification - + Zoom &Out - + Decrease magnification - + Zoom &1 to 1 - + Restore scale to 100% - + Zoom to &Fit - + Set scale to fit window - + Select Mode - + Select, move and modify objects - + Text - + Create text object - + Box - + Create box object - + Line - + Create line object - + Ellipse - + Create ellipse/circle object - + Image - + Create image object - + Barcode - + Create barcode object - - + + Bring To Front - + Raise selection to top - - + + Send To Back - + Lower selection to bottom - - + + Rotate Left - + Rotate object(s) 90 degrees counter-clockwise - - + + Rotate Right - + Rotate object(s) 90 degrees clockwise - - + + Flip Horizontally - + Flip object(s) horizontally - - + + Flip Vertically - + Flip object(s) vertically - - + + Align Left - + Align objects to left edges - - + + Align Center - + Align objects to horizontal centers - - + + Align Right - + Align objects to right edges - - + + Align Top - + Align objects to top edges - - + + Align Middle - + Align objects to vertical centers - - + + Align Bottom - + Align objects to bottom edges - - + + Center Horizontally - + Horizontally center objects in label - - + + Center Vertically - + Vertically center objects in label - + &Contents... - + Open gLabels manual - + &About... - + About gLabels - - + + &File - + &Edit - + &View - + Toolbars - + &Objects - + &Create - - + + &Order - - + + &Rotate/Flip - - + + &Alignment - - + + Center - + &Help - + &Editor - + (modified) - + Save changes to project "%1" before closing? - + Your changes will be lost if you don't save them. - + Save project? - + Paste - + Delete - + Create Text - + Create Box - + Create Line - + Create Ellipse - + Create Image @@ -1782,17 +1782,17 @@ glabels::MergeView - + Merge - + Select merge file - + All files (*) @@ -1800,134 +1800,134 @@ glabels::ObjectEditor - + Original size - + Box object properties - + Ellipse object properties - + Image object properties - + Line object properties - + Text object properties - + Line - + Fill - + Image files (*.png *.jpg *.jpeg *.gif *.bmp *.pbm *.pgm *.ppm *.xbm *.xpm *.svg) - + All files (*) - + PNG - Portable Network Graphics (*.png) - + BMP - Windows Bitmap (*.bmp) - + GIF - Graphics Interchange Format (*.gif) - + JPEG - Joint Photographic Experts Group (*.jpg *.jpeg) - + PBM - Portable Bitmap (*.pbm) - + PGM - Portable Graymap (*.pgm) - + PPM - Portable Pixmap (*.ppm) - + SVG - Scalable Vector Graphics (*.svg) - + XBM - X11 Bitmap (*.xbm) - + XPM - X11 Pixmap (*.xpm) - + gLabels - Select image file - - + + Set image - + Move - - + + Size - + Text - + Shadow @@ -1935,12 +1935,12 @@ glabels::PrintView - + Print - + (Will print a total of %1 items on %2 pages.) @@ -1948,17 +1948,17 @@ glabels::PropertiesView - + Properties - + Product Rotate - + Change Product @@ -1966,7 +1966,7 @@ glabels::SimplePreview - + Up