Reconciled names, namespaces and nameing conventions.

app/BarcodeStyle.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtlabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtlabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtlabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtlabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "BarcodeStyle.h"

app/BarcodeStyle.h

@@ -2,29 +2,29 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_BarcodeStyle_h
-#define qtlabels_BarcodeStyle_h
+#ifndef glabels_BarcodeStyle_h
+#define glabels_BarcodeStyle_h
 
 #include <QString>
 #include <algorithm>
 
-namespace qtLabels
+namespace glabels
 {
 
 	class BarcodeStyle
@@ -114,4 +114,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_BarcodeStyle_h
+#endif // glabels_BarcodeStyle_h

app/ColorNode.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "ColorNode.h"

app/ColorNode.h

@@ -2,30 +2,30 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_ColorNode_h
-#define qtlabels_ColorNode_h
+#ifndef glabels_ColorNode_h
+#define glabels_ColorNode_h
 
 #include <QString>
 #include <QColor>
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	class ColorNode
@@ -138,4 +138,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_ColorNode_h
+#endif // glabels_ColorNode_h

app/File.cpp

@@ -23,7 +23,7 @@
 #include "NewLabelDialog.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	namespace File

app/File.h

@@ -25,7 +25,7 @@
 #include <QWidget>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	namespace File

app/Help.cpp

@@ -25,7 +25,7 @@
 #include <iostream>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	namespace Help

app/Help.h

@@ -25,7 +25,7 @@
 #include <QWidget>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	namespace Help

app/Icons.h

@@ -24,7 +24,7 @@
 #include <QIcon>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	namespace Icons

app/LabelModel.cpp

@@ -2,25 +2,25 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "LabelModel.h"
 
-namespace qtLabels
+namespace glabels
 {
 
 	/**
@@ -34,65 +34,97 @@ namespace qtLabels
 	/**
 	 * Add item.
 	 */
-	void LabelModel::add_item( LabelModelItem &item )
+	void LabelModel::addItem( LabelModelItem *item )
 	{
-		m_item_list.push_back( &item );
+		mItemList << item;
+	}
+
+
+	void LabelModel::deleteItem( LabelModelItem *item )
+	{
+		mItemList.removeOne( item );
 	}
 
 
 	/**
 	 * Select item.
 	 */
-	void LabelModel::select_item( LabelModelItem &item )
+	void LabelModel::selectItem( LabelModelItem *item )
 	{
-		item.select();
+		item->select();
 
-		emit selection_changed();
+		emit selectionChanged();
 	}
 
 
 	/**
 	 * Unselect item.
 	 */
-	void LabelModel::unselect_item( LabelModelItem &item )
+	void LabelModel::unselectItem( LabelModelItem *item )
 	{
-		item.unselect();
+		item->unselect();
 
-		emit selection_changed();
+		emit selectionChanged();
 	}
 
 
 	/**
 	 * Select all items.
 	 */
-	void LabelModel::select_all( void )
+	void LabelModel::selectAll( void )
 	{
-		list<LabelModelItem*>::iterator i_item;
-
-		for ( i_item = m_item_list.begin(); i_item != m_item_list.end(); i_item++ )
+		foreach ( LabelModelItem *item, mItemList )
 		{
-			(*i_item)->select();
+			item->select();
 		}
 
-		emit selection_changed();
+		emit selectionChanged();
 	}
 
 
 	/**
 	 * Unselect item all items.
 	 */
-	void LabelModel::unselect_all( void )
+	void LabelModel::unselectAll( void )
 	{
-		list<LabelModelItem*>::iterator i_item;
-
-		for ( i_item = m_item_list.begin(); i_item != m_item_list.end(); i_item++ )
+		foreach ( LabelModelItem *item, mItemList )
 		{
-			(*i_item)->unselect();
+			item->unselect();
 		}
 
-		emit selection_changed();
+		emit selectionChanged();
 	}
 
+
+	QList<LabelModelItem *> LabelModel::getSelection()
+	{
+		QList<LabelModelItem*> selectedList;
+
+		foreach ( LabelModelItem *item, mItemList )
+		{
+			if ( item->isSelected() )
+			{
+				selectedList << item;
+			}
+		}
+		
+	}
+
+
+	void LabelModel::deleteSelection()
+	{
+		QList<LabelModelItem*> selectedList = getSelection();
+
+		foreach ( LabelModelItem *item, selectedList )
+		{
+			deleteItem( item );
+		}
+
+		emit selectionChanged();
+	}
+
+
+
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -468,7 +500,7 @@ namespace qtLabels
 		}
 
 
-		public void select_all()
+		public void selectAll()
 		{
 			foreach ( LabelObject object in object_list )
 			{
@@ -478,7 +510,7 @@ namespace qtLabels
 		}
 
 
-		public void unselect_all()
+		public void unselectAll()
 		{
 			foreach ( LabelObject object in object_list )
 			{

app/LabelModel.h

@@ -2,33 +2,32 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_LabelModel_h
-#define qtlabels_LabelModel_h
+#ifndef glabels_LabelModel_h
+#define glabels_LabelModel_h
 
-#include <QObject>
-#include <list>
+#include <QGraphicsScene>
+#include <QList>
 
 #include "LabelModelItem.h"
 
-using namespace std;
 
-namespace qtLabels
+namespace glabels
 {
 
 	class LabelModel : public QObject
@@ -40,28 +39,39 @@ namespace qtLabels
 		virtual ~LabelModel() {}
 
 	signals:
-		void selection_changed();
+		void selectionChanged();
 
 	public:
-		void add_item( LabelModelItem &item );
+		void addItem( LabelModelItem *item );
 
-		void select_item( LabelModelItem &item );
+		void deleteItem( LabelModelItem *item );
 
-		void unselect_item( LabelModelItem &item );
 
-		void select_all( void );
+		void selectItem( LabelModelItem *item );
 
-		void unselect_all( void );
+		void unselectItem( LabelModelItem *item );
+
+		void selectAll( void );
+
+		void unselectAll( void );
+
+
+		void deleteSelection();
 
 
 	private:
-		list<LabelModelItem*> m_item_list;
+
+		QList<LabelModelItem *> getSelection();
+
+		QList<LabelModelItem*> mItemList;
 		
 	};
 
 }
 
-#endif // qtlabels_LabelModel_h
+#endif // glabels_LabelModel_h
+
+
 
 ///////////////////////////////////////////////////////////////////////////////
 #if 0

app/LabelModelItem.cpp

@@ -2,26 +2,26 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "LabelModelItem.h"
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	/*

app/LabelModelItem.h

@@ -2,24 +2,24 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_LabelModelItem_h
-#define qtlabels_LabelModelItem_h
+#ifndef glabels_LabelModelItem_h
+#define glabels_LabelModelItem_h
 
 #include <QObject>
 #include <QTransform>
@@ -33,7 +33,7 @@
 #include "MergeRecord.h"
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	class LabelModelItem : public QObject
@@ -63,9 +63,9 @@ namespace qtLabels
 		/*
 		 * Selected Property.
 		 */
-		Q_PROPERTY( bool selected READ is_selected WRITE select RESET unselect )
+		Q_PROPERTY( bool selected READ isSelected WRITE select RESET unselect )
 
-		bool is_selected( void ) { return m_selected_flag; }
+		bool isSelected( void ) { return m_selected_flag; }
 		void select( bool value = true ) { m_selected_flag = value; }
 		void unselect( void ) { m_selected_flag = false; }
 
@@ -468,7 +468,7 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_LabelModelItem_h
+#endif // glabels_LabelModelItem_h
 
 ///////////////////////////////////////////////////////////////////////////////
 #if 0

app/LabelRegion.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "LabelRegion.h"

app/LabelRegion.h

@@ -2,27 +2,27 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_LabelRegion_h
-#define qtlabels_LabelRegion_h
+#ifndef glabels_LabelRegion_h
+#define glabels_LabelRegion_h
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	struct LabelRegion
@@ -50,4 +50,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_LabelRegion_h
+#endif // glabels_LabelRegion_h

app/MainWindow.cpp

@@ -30,7 +30,7 @@
 #include "File.h"
 #include "Help.h"
 
-namespace gLabels
+namespace glabels
 {
 
 	MainWindow::MainWindow()

app/MainWindow.h

@@ -30,7 +30,7 @@
 #include <QLabel>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	class MainWindow : public QMainWindow

app/MergeField.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "MergeField.h"

app/MergeField.h

@@ -2,29 +2,29 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_MergeField_h
-#define qtlabels_MergeField_h
+#ifndef glabels_MergeField_h
+#define glabels_MergeField_h
 
 #include <QString>
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	struct MergeField
@@ -44,4 +44,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_MergeField_h
+#endif // glabels_MergeField_h

app/MergeRecord.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "MergeRecord.h"

app/MergeRecord.h

@@ -2,24 +2,24 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_MergeRecord_h
-#define qtlabels_MergeRecord_h
+#ifndef glabels_MergeRecord_h
+#define glabels_MergeRecord_h
 
 #include <QString>
 #include <list>
@@ -29,7 +29,7 @@
 using namespace std;
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	struct MergeRecord
@@ -55,4 +55,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_MergeRecord_h
+#endif // glabels_MergeRecord_h

app/NewLabelDialog.cpp

@@ -26,7 +26,7 @@
 #include "TemplatePickerItem.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	NewLabelDialog::NewLabelDialog( QWidget *parent = 0 )

app/NewLabelDialog.h

@@ -24,7 +24,7 @@
 #include "ui_NewLabelDialog.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	class NewLabelDialog : public QDialog, public Ui_NewLabelDialog

app/SimplePreview.cpp

@@ -48,7 +48,7 @@ namespace
 }
 
 
-namespace gLabels
+namespace glabels
 {
 
 	SimplePreview::SimplePreview( QWidget *parent = 0 )

app/SimplePreview.h

@@ -29,7 +29,7 @@
 #include "libglabels/Template.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	class SimplePreview : public QGraphicsView

app/TemplatePicker.cpp

@@ -25,7 +25,7 @@
 #include "TemplatePickerItem.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	TemplatePicker::TemplatePicker( QWidget *parent ) : QListWidget(parent)

app/TemplatePicker.h

@@ -28,7 +28,7 @@
 #include "libglabels/Template.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	class TemplatePicker : public QListWidget

app/TemplatePickerItem.cpp

@@ -25,7 +25,7 @@
 #include <QHBoxLayout>
 
 
-namespace gLabels
+namespace glabels
 {
 
 	TemplatePickerItem::TemplatePickerItem( libglabels::Template *tmplate,

app/TemplatePickerItem.h

@@ -28,7 +28,7 @@
 #include "libglabels/Template.h"
 
 
-namespace gLabels
+namespace glabels
 {
 
 	class TemplatePickerItem : public QListWidgetItem

app/TextNode.cpp

@@ -2,20 +2,20 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "TextNode.h"
@@ -33,7 +33,7 @@ namespace {
 }
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	TextNode::TextNode( const QString &text, int i_start, int &i_next )

app/TextNode.h

@@ -2,29 +2,29 @@
  *
  *  Copyright (C) 2013  Jim Evins <evins@snaught.com>
  *
- *  This file is part of qtLabels.
+ *  This file is part of gLabels-qt.
  *
- *  qtLabels is free software: you can redistribute it and/or modify
+ *  gLabels-qt is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  qtLabels is distributed in the hope that it will be useful,
+ *  gLabels-qt is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with qtLabels.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef qtlabels_TextNode_h
-#define qtlabels_TextNode_h
+#ifndef glabels_TextNode_h
+#define glabels_TextNode_h
 
 #include <QString>
 
 
-namespace qtLabels
+namespace glabels
 {
 
 	class TextNode
@@ -79,4 +79,4 @@ namespace qtLabels
 
 }
 
-#endif // qtlabels_TextNode_h
+#endif // glabels_TextNode_h

app/glabels_main.cpp

@@ -24,7 +24,7 @@
 #include "MainWindow.h"
 #include "libglabels/Db.h"
 
-using namespace gLabels;
+using namespace glabels;
 using namespace libglabels;
 
 

app/ui/NewLabelDialog.ui

@@ -123,7 +123,7 @@
         </layout>
        </item>
        <item>
-        <widget class="gLabels::TemplatePicker" name="templatePicker">
+        <widget class="glabels::TemplatePicker" name="templatePicker">
          <property name="showDropIndicator" stdset="0">
           <bool>false</bool>
          </property>
@@ -185,7 +185,7 @@
               <number>12</number>
              </property>
              <item>
-              <widget class="gLabels::SimplePreview" name="simplePreview">
+              <widget class="glabels::SimplePreview" name="simplePreview">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                  <horstretch>0</horstretch>
@@ -441,12 +441,12 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>gLabels::TemplatePicker</class>
+   <class>glabels::TemplatePicker</class>
    <extends>QListWidget</extends>
    <header>TemplatePicker.h</header>
   </customwidget>
   <customwidget>
-   <class>gLabels::SimplePreview</class>
+   <class>glabels::SimplePreview</class>
    <extends>QGraphicsView</extends>
    <header>SimplePreview.h</header>
   </customwidget>