Minor code cleanup.

CMakeLists.txt

@@ -60,6 +60,16 @@ find_package (LibZint 2.6 QUIET)
 find_package (Qt5Test 5.4 QUIET)
 
 
+#=======================================
+# Global compiler options
+#=======================================
+#
+# Uncomment to compile everything with aggressively pedantic options
+# (not recommended -- only for testing -- also not portable)
+#
+#add_compile_options("-Wall" "-Werror" "-Wpedantic")
+
+
 #=======================================
 # Unit Testing
 #=======================================
@@ -67,7 +77,6 @@ if (Qt5Test_FOUND)
   enable_testing ()
 endif ()
 
-
 #=======================================
 # Subdirectories
 #=======================================

backends/merge/Merge.h

@@ -40,7 +40,7 @@ namespace glabels
 		///
 		/// Merge Object
 		///
-		struct Merge : QObject
+		class Merge : public QObject
 		{
 			Q_OBJECT
 

backends/merge/Record.h

@@ -34,7 +34,7 @@ namespace glabels
 		///
 		/// Merge Record
 		///
-		struct Record : public QMap<QString,QString>
+		class Record : public QMap<QString,QString>
 		{
 
 			/////////////////////////////////

glabels/UndoRedoModel.h

@@ -35,7 +35,7 @@ namespace glabels
 	///
 	/// UndoRedoModel
 	///
-	struct UndoRedoModel : QObject
+	class UndoRedoModel : public QObject
 	{
 		Q_OBJECT
 

glbarcode/Barcode2dBase.cpp

@@ -24,6 +24,7 @@
 #include "DrawingPrimitives.h"
 
 #include <list>
+#include <algorithm>
 
 
 using namespace glbarcode::Constants;

glbarcode/BarcodeCode39.cpp

@@ -142,12 +142,12 @@ namespace glbarcode
 		int sum = 0;
 		for ( unsigned int i=0; i < cookedData.size(); i++ )
 		{
-			int cValue = alphabet.find( toupper( cookedData[i] ) );
+			size_t cValue = alphabet.find( toupper( cookedData[i] ) );
 
 			code += symbols[cValue];
 			code += "i";
 
-			sum += cValue;
+			sum += int(cValue);
 		}
 
 		if ( checksum() )
@@ -190,7 +190,7 @@ namespace glbarcode
 	{
 
 		/* determine width and establish horizontal scale, based on original cooked data */
-		double dataSize = cookedData.size();
+		double dataSize = double( cookedData.size() );
 		double minL;
 		if ( !checksum() )
 		{

glbarcode/BarcodeDataMatrix.cpp

@@ -294,7 +294,7 @@ namespace
 			}
 		}
 
-		return codewords.size();
+		return int( codewords.size() );
 	}
 
 

glbarcode/BarcodeUpcBase.cpp

@@ -216,7 +216,7 @@ namespace glbarcode
 					double&            h )
 	{
 		/* determine width and establish horizontal scale */
-		int nModules     = 7*(cookedData.size()+1) + 11;
+		int nModules     = 7*int(cookedData.size()+1) + 11;
 
 		double scale;
 		if ( w == 0 )
@@ -256,7 +256,7 @@ namespace glbarcode
 
 
 		/* now traverse the code string and draw each bar */
-		int nBarsSpaces = codedData.size() - 1; /* coded data has dummy "0" on end. */
+		int nBarsSpaces = int( codedData.size() - 1 ); /* coded data has dummy "0" on end. */
 
 		double xModules = 0;
 		for ( int i = 0; i < nBarsSpaces; i += 2 )

model/ColorNode.h

@@ -38,7 +38,7 @@ namespace glabels
 		///
 		/// Color Node Type
 		///
-		struct ColorNode
+		class ColorNode
 		{
 
 			/////////////////////////////////

model/Region.h

@@ -35,7 +35,7 @@ namespace glabels
 		///
 		/// Label Region Type
 		///
-		struct Region
+		class Region
 		{
 
 			/////////////////////////////////

model/SubstitutionField.cpp

@@ -29,13 +29,13 @@ namespace glabels
 	{
 
 		SubstitutionField::SubstitutionField()
-			: mNewLine(false), mFormatType(0)
+			: mFormatType(0), mNewLine(false)
 		{
 		}
 
 
 		SubstitutionField::SubstitutionField( const QString& string )
-			: mNewLine(false), mFormatType(0)
+			: mFormatType(0), mNewLine(false)
 		{
 			QStringRef s(&string);
 			parse( s, *this );
@@ -197,8 +197,6 @@ namespace glabels
 	
 		bool SubstitutionField::parseFormatModifier( QStringRef& s, SubstitutionField& field )
 		{
-			bool success = false;
-		
 			field.mFormat = "%";
 
 			parseFormatFlags( s, field );