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
@@ -21,74 +21,77 @@
 #include "Size.h"


-namespace glabels::model
+namespace glabels
 {
-
-	///
-	/// Constructor
-	///
-	Size::Size() : mW(0), mH(0)
+	namespace model
 	{
-		// empty
+
+		///
+		/// Constructor
+		///
+		Size::Size() : mW(0), mH(0)
+		{
+			// empty
+		}
+
+
+		///
+		/// Constructor
+		///
+		Size::Size( const Distance& w, const Distance& h ) : mW(w), mH(h)
+		{
+			// empty
+		}
+
+
+		///
+		/// Get w
+		///
+		Distance Size::w() const
+		{
+			return mW;
+		}
+
+
+		///
+		/// Set w
+		///
+		void Size::setW( const Distance& value )
+		{
+			mW = value;
+		}
+
+
+		///
+		/// Get h
+		///
+		Distance Size::h() const
+		{
+			return mH;
+		}
+
+
+		///
+		/// Set h
+		///
+		void Size::setH( const Distance& value )
+		{
+			mH = value;
+		}
+
+
+		///
+		/// Convert to a QSizeF
+		///
+		QSizeF Size::qSizeF() const
+		{
+			QSizeF s;
+
+			s.setWidth( mW.pt() );
+			s.setHeight( mH.pt() );
+
+			return s;
+		}
+
 	}
-
-
-	///
-	/// Constructor
-	///
-	Size::Size( const Distance& w, const Distance& h ) : mW(w), mH(h)
-	{
-		// empty
-	}
-
-
-	///
-	/// Get w
-	///
-	Distance Size::w() const
-	{
-		return mW;
-	}
-
-
-	///
-	/// Set w
-	///
-	void Size::setW( const Distance& value )
-	{
-		mW = value;
-	}
-
-
-	///
-	/// Get h
-	///
-	Distance Size::h() const
-	{
-		return mH;
-	}
-
-
-	///
-	/// Set h
-	///
-	void Size::setH( const Distance& value )
-	{
-		mH = value;
-	}
-
-
-	///
-	/// Convert to a QSizeF
-	///
-	QSizeF Size::qSizeF() const
-	{
-		QSizeF s;
-
-		s.setWidth( mW.pt() );
-		s.setHeight( mH.pt() );
-
-		return s;
-	}
-
-} // namespace glabels::model
+}