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
@@ -23,88 +23,91 @@
 #include "ModelImageObject.h"


-namespace glabels::model
+namespace glabels
 {
-
-	DataCache::DataCache()
+	namespace model
 	{
-		// empty
-	}

-
-	DataCache::DataCache( const QList<ModelObject*>& objects )
-	{
-		foreach( ModelObject* object, objects )
+		DataCache::DataCache()
 		{
-			if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
+			// empty
+		}
+
+
+		DataCache::DataCache( const QList<ModelObject*>& objects )
+		{
+			foreach( ModelObject* object, objects )
 			{
-				TextNode filenameNode = imageObject->filenameNode();
-				if ( !filenameNode.isField()  )
+				if ( ModelImageObject* imageObject = dynamic_cast<ModelImageObject*>(object) )
 				{
-					if ( const QImage* image = imageObject->image() )
+					TextNode filenameNode = imageObject->filenameNode();
+					if ( !filenameNode.isField()  )
 					{
-						addImage( filenameNode.data(), *image );
-					}
-					else
-					{
-						QByteArray svg = imageObject->svg();
-						if ( !svg.isEmpty() )
+						if ( const QImage* image = imageObject->image() )
 						{
-							addSvg( filenameNode.data(), svg );
+							addImage( filenameNode.data(), *image );
+						}
+						else
+						{
+							QByteArray svg = imageObject->svg();
+							if ( !svg.isEmpty() )
+							{
+								addSvg( filenameNode.data(), svg );
+							}
 						}
 					}
 				}
 			}
 		}
-	}


-	bool DataCache::hasImage( const QString& name ) const
-	{
-		return mImageMap.contains( name );
-	}
+		bool DataCache::hasImage( const QString& name ) const
+		{
+			return mImageMap.contains( name );
+		}


-	QImage DataCache::getImage( const QString& name ) const
-	{
-		return mImageMap[ name ];
-	}
+		QImage DataCache::getImage( const QString& name ) const
+		{
+			return mImageMap[ name ];
+		}


-	void DataCache::addImage( const QString& name, const QImage& image )
-	{
-		mImageMap[ name ] = image;
-	}
+		void DataCache::addImage( const QString& name, const QImage& image )
+		{
+			mImageMap[ name ] = image;
+		}


-	QList<QString> DataCache::imageNames() const
-	{
-		return mImageMap.keys();
-	}
+		QList<QString> DataCache::imageNames() const
+		{
+			return mImageMap.keys();
+		}

 	
-	bool DataCache::hasSvg( const QString& name ) const
-	{
-		return mSvgMap.contains( name );
-	}
+		bool DataCache::hasSvg( const QString& name ) const
+		{
+			return mSvgMap.contains( name );
+		}


-	QByteArray DataCache::getSvg( const QString& name ) const
-	{
-		return mSvgMap[ name ];
-	}
+		QByteArray DataCache::getSvg( const QString& name ) const
+		{
+			return mSvgMap[ name ];
+		}


-	void DataCache::addSvg( const QString& name, const QByteArray& svg )
-	{
-		mSvgMap[ name ] = svg;
-	}
+		void DataCache::addSvg( const QString& name, const QByteArray& svg )
+		{
+			mSvgMap[ name ] = svg;
+		}


-	QList<QString> DataCache::svgNames() const
-	{
-		return mSvgMap.keys();
-	}
+		QList<QString> DataCache::svgNames() const
+		{
+			return mSvgMap.keys();
+		}

 	
-} // namespace glabels::model
+	}
+}