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
@@ -25,38 +25,43 @@
 #include "BarcodeMenuItem.h"


-///
-/// Constructor
-///
-BarcodeMenuButton::BarcodeMenuButton( QWidget* parent )
-	: QPushButton(parent)
+namespace glabels
 {
-	mMenu = new BarcodeMenu();
-	setMenu( mMenu );
+	
+	///
+	/// Constructor
+	///
+	BarcodeMenuButton::BarcodeMenuButton( QWidget* parent )
+		: QPushButton(parent)
+	{
+		mMenu = new BarcodeMenu();
+		setMenu( mMenu );

-	mBcStyle = BarcodeBackends::lookupStyleFromId( "" ); // Default style
-	setText( mBcStyle->name() );
+		mBcStyle = BarcodeBackends::lookupStyleFromId( "" ); // Default style
+		setText( mBcStyle->name() );
+
+		connect( mMenu, SIGNAL(styleChanged()), this, SLOT(onMenuStyleChanged()) );
+	}
+
+
+	///
+	/// bcStyle getter
+	///
+	const BarcodeStyle* BarcodeMenuButton::bcStyle() const
+	{
+		return mBcStyle;
+	}
+
+
+	///
+	/// onMenuStyleChanged slot
+	///
+	void BarcodeMenuButton::onMenuStyleChanged()
+	{
+		mBcStyle = mMenu->bcStyle();
+		setText( mBcStyle->name() );
+
+		emit styleChanged();
+	}

-	connect( mMenu, SIGNAL(styleChanged()), this, SLOT(onMenuStyleChanged()) );
-}
-
-
-///
-/// bcStyle getter
-///
-const BarcodeStyle* BarcodeMenuButton::bcStyle() const
-{
-	return mBcStyle;
-}
-
-
-///
-/// onMenuStyleChanged slot
-///
-void BarcodeMenuButton::onMenuStyleChanged()
-{
-	mBcStyle = mMenu->bcStyle();
-	setText( mBcStyle->name() );
-
-	emit styleChanged();
 }