Removed C++17 nested namespace definitions. Should build on trusty again.

2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
@@ -33,96 +33,99 @@
 #include <QVector>


-namespace glabels::model
+namespace glabels
 {
-
-	// Forward references
-	class Model;
-
-
-	///
-	///  PageRenderer Widget
-	///
-	class PageRenderer : public QObject
+	namespace model
 	{
-		Q_OBJECT
+
+		// Forward references
+		class Model;
+
+
+		///
+		///  PageRenderer Widget
+		///
+		class PageRenderer : public QObject
+		{
+			Q_OBJECT
 	
-		/////////////////////////////////
-		// Life Cycle
-		/////////////////////////////////
-	public:
-		PageRenderer( const Model* model = nullptr );
+			/////////////////////////////////
+			// Life Cycle
+			/////////////////////////////////
+		public:
+			PageRenderer( const Model* model = nullptr );


-		/////////////////////////////////
-		// Public Methods
-		/////////////////////////////////
-	public:
-		void setModel( const Model* model );
-		const Model* 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 print( QPrinter* printer ) const;
-		void printPage( QPainter* painter ) const;
-		void printPage( QPainter* painter, int iPage ) const;
+			/////////////////////////////////
+			// Public Methods
+			/////////////////////////////////
+		public:
+			void setModel( const Model* model );
+			const Model* 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 print( QPrinter* printer ) 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 Model*        mModel;
-		const merge::Merge* mMerge;
+			/////////////////////////////////
+			// Private Data
+			/////////////////////////////////
+		private:
+			const Model*        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<Point>    mOrigins;
-	};
+			QVector<Point>    mOrigins;
+		};

+	}
 }