Some style cleanup to libglabels.

2015-08-11 17:18:49 -04:00
parent de8ec9b66a
commit 0ad6caeeca
46 changed files with 1294 additions and 380 deletions
@@ -34,24 +34,15 @@ namespace libglabels
 	class XmlUtil
 	{
 	private:
-		XmlUtil()
-		{
-			mDefaultUnits = Units::point();
-		}
+		XmlUtil();

+		
 	public:

-		static void init()
-		{
-			static XmlUtil *xmlUtil = new XmlUtil();
-		}
+		static void init();

-		static const Units *defaultUnits() { return mDefaultUnits; }
-
-		static void setDefaultUnits( Units *defaultUnits )
-		{
-			mDefaultUnits = defaultUnits;
-		}
+		static const Units* defaultUnits();
+		static void setDefaultUnits( Units* defaultUnits );

 		static QString  getStringAttr( const QDomElement& node,
 		                               const QString&     name,
@@ -106,7 +97,7 @@ namespace libglabels
 		                               double value );

 	private:
-		static Units *mDefaultUnits;
+		static Units* mDefaultUnits;

 	};