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
@@ -25,33 +25,36 @@
 #include "Model.h"


-namespace glabels::model
+namespace glabels
 {
-
-	class DataCache
+	namespace model
 	{
-	public:
-		DataCache();
+
+		class DataCache
+		{
+		public:
+			DataCache();
 		
-		DataCache( const QList<ModelObject*>& objects );
+			DataCache( const QList<ModelObject*>& objects );

-		bool hasImage( const QString& name ) const;
-		QImage getImage( const QString& name ) const;
-		void addImage( const QString& name, const QImage& image );
-		QList<QString> imageNames() const;
+			bool hasImage( const QString& name ) const;
+			QImage getImage( const QString& name ) const;
+			void addImage( const QString& name, const QImage& image );
+			QList<QString> imageNames() const;

-		bool hasSvg( const QString& name ) const;
-		QByteArray getSvg( const QString& name ) const;
-		void addSvg( const QString& name, const QByteArray& svg );
-		QList<QString> svgNames() const;
+			bool hasSvg( const QString& name ) const;
+			QByteArray getSvg( const QString& name ) const;
+			void addSvg( const QString& name, const QByteArray& svg );
+			QList<QString> svgNames() const;

 		
-	private:
-		QMap<QString,QImage> mImageMap;
-		QMap<QString,QByteArray> mSvgMap;
+		private:
+			QMap<QString,QImage> mImageMap;
+			QMap<QString,QByteArray> mSvgMap;

-	};
+		};

+	}
 }