Reconcile style accross all source files.

- All glabels code is in "glabels" top-level namespace. - Other assorted cleanup.
2017-01-15 22:58:53 -05:00
parent 44aa31d074
commit b797d13e40
153 changed files with 17673 additions and 16841 deletions
@@ -26,55 +26,60 @@
 #include <QObject>


-///
-/// Color History
-///
-class ColorHistory : public QObject
+namespace glabels
 {
-	Q_OBJECT

-public:
-	static const int MAX_COLORS = 9;
+	///
+	/// Color History
+	///
+	class ColorHistory : public QObject
+	{
+		Q_OBJECT

-	/////////////////////////////////
-	// Life Cycle
-	/////////////////////////////////
-private:
-	ColorHistory();
+	public:
+		static const int MAX_COLORS = 9;

-public:
-	static ColorHistory* instance();
+		/////////////////////////////////
+		// Life Cycle
+		/////////////////////////////////
+	private:
+		ColorHistory();
+
+	public:
+		static ColorHistory* instance();


-	/////////////////////////////////
-	// Signals
-	/////////////////////////////////
-signals:
-	void changed();
+		/////////////////////////////////
+		// Signals
+		/////////////////////////////////
+	signals:
+		void changed();


-	/////////////////////////////////
-	// Public Methods
-	/////////////////////////////////
-public:
-	void   addColor( const QColor &color );
-	QList<QColor> getColors();
+		/////////////////////////////////
+		// Public Methods
+		/////////////////////////////////
+	public:
+		void   addColor( const QColor &color );
+		QList<QColor> getColors();


-	/////////////////////////////////
-	// Private Methods
-	/////////////////////////////////
-private:
-	QList<QColor> readColorList();
-	void writeColorList( const QList<QColor>& colorList );
+		/////////////////////////////////
+		// Private Methods
+		/////////////////////////////////
+	private:
+		QList<QColor> readColorList();
+		void writeColorList( const QList<QColor>& colorList );


-	/////////////////////////////////
-	// Private Members
-	/////////////////////////////////
-private:
+		/////////////////////////////////
+		// Private Members
+		/////////////////////////////////
+	private:

-};
+	};
+
+}


 #endif // ColorHistory_h