Reconcile style accross all source files.

- All glabels code is in "glabels" top-level namespace. - Other assorted cleanup.
2017-01-15 22:58:53 -05:00
parent 44aa31d074
commit b797d13e40
153 changed files with 17673 additions and 16841 deletions
@@ -31,91 +31,97 @@
 #include "Merge/Merge.h"
 #include "Merge/Record.h"

-// Forward references
-class LabelModel;

-
-///
-///  PageRenderer Widget
-///
-class PageRenderer : public QObject
+namespace glabels
 {
-	Q_OBJECT
+
+	// Forward references
+	class LabelModel;
+
+
+	///
+	///  PageRenderer Widget
+	///
+	class PageRenderer : public QObject
+	{
+		Q_OBJECT
 	
-	/////////////////////////////////
-	// Life Cycle
-	/////////////////////////////////
-public:
-	PageRenderer();
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	public:
+		PageRenderer();


-	/////////////////////////////////
-	// Public Methods
-	/////////////////////////////////
-public:
-	void setModel( const LabelModel* model );
-	const LabelModel* model() const;
-	void setNCopies( int nCopies );
-	void setStartLabel( int startLabel );
-	void setPrintOutlines( bool printOutlinesFlag );
-	void setPrintCropMarks( bool printCropMarksFlag );
-	void setPrintReverse( bool printReverseFlag );
-	void setIPage( int iPage );
-	int nItems() const;
-	int nPages() const;
-	QRectF pageRect() const;
-	void printPage( QPainter* painter ) const;
-	void printPage( QPainter* painter, int iPage ) const;
+		/////////////////////////////////
+		// Public Methods
+		/////////////////////////////////
+	public:
+		void setModel( const LabelModel* model );
+		const LabelModel* model() const;
+		void setNCopies( int nCopies );
+		void setStartLabel( int startLabel );
+		void setPrintOutlines( bool printOutlinesFlag );
+		void setPrintCropMarks( bool printCropMarksFlag );
+		void setPrintReverse( bool printReverseFlag );
+		void setIPage( int iPage );
+		int nItems() const;
+		int nPages() const;
+		QRectF pageRect() const;
+		void printPage( QPainter* painter ) const;
+		void printPage( QPainter* painter, int iPage ) const;


-	/////////////////////////////////
-	// Signals
-	/////////////////////////////////
-signals:
-	void changed();
+		/////////////////////////////////
+		// Signals
+		/////////////////////////////////
+	signals:
+		void changed();
 	

-	/////////////////////////////////
-	// Private slots
-	/////////////////////////////////
-private slots:
-	void onModelChanged();
+		/////////////////////////////////
+		// Private slots
+		/////////////////////////////////
+	private slots:
+		void onModelChanged();


-	/////////////////////////////////
-	// Internal Methods
-	/////////////////////////////////
-private:
-	void updateNPages();
-	void printSimplePage( QPainter* painter, int iPage ) const;
-	void printMergePage( QPainter* painter, int iPage ) const;
-	void printCropMarks( QPainter* painter ) const;
-	void printOutline( QPainter* painter ) const;
-	void clipLabel( QPainter* painter ) const;
-	void printLabel( QPainter* painter, merge::Record* record ) const;
+		/////////////////////////////////
+		// Internal Methods
+		/////////////////////////////////
+	private:
+		void updateNPages();
+		void printSimplePage( QPainter* painter, int iPage ) const;
+		void printMergePage( QPainter* painter, int iPage ) const;
+		void printCropMarks( QPainter* painter ) const;
+		void printOutline( QPainter* painter ) const;
+		void clipLabel( QPainter* painter ) const;
+		void printLabel( QPainter* painter, merge::Record* record ) const;


-	/////////////////////////////////
-	// Private Data
-	/////////////////////////////////
-private:
-	const LabelModel*   mModel;
-	const merge::Merge* mMerge;
+		/////////////////////////////////
+		// Private Data
+		/////////////////////////////////
+	private:
+		const LabelModel*   mModel;
+		const merge::Merge* mMerge;
 	
-	int               mNCopies;
-	int               mStartLabel;
-	int               mLastLabel;
-	bool              mPrintOutlines;
-	bool              mPrintCropMarks;
-	bool              mPrintReverse;
-	int               mIPage;
+		int               mNCopies;
+		int               mStartLabel;
+		int               mLastLabel;
+		bool              mPrintOutlines;
+		bool              mPrintCropMarks;
+		bool              mPrintReverse;
+		int               mIPage;

-	bool              mIsMerge;
-	int               mNPages;
-	int               mNLabelsPerPage;
+		bool              mIsMerge;
+		int               mNPages;
+		int               mNLabelsPerPage;

-	QVector<glabels::Point> mOrigins;
-};
+		QVector<Point>    mOrigins;
+	};
+
+}


 #endif // PageRenderer_h