From ac96cb8112bf41723b5e10728ea07db06d4a2e45 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 23 Nov 2013 17:39:08 -0500 Subject: [PATCH] Reconciled names, namespaces and nameing conventions. --- app/BarcodeStyle.cpp | 8 ++-- app/BarcodeStyle.h | 16 +++---- app/ColorNode.cpp | 8 ++-- app/ColorNode.h | 16 +++---- app/File.cpp | 2 +- app/File.h | 2 +- app/Help.cpp | 2 +- app/Help.h | 2 +- app/Icons.h | 2 +- app/LabelModel.cpp | 86 ++++++++++++++++++++++++++------------ app/LabelModel.h | 46 ++++++++++++-------- app/LabelModelItem.cpp | 10 ++--- app/LabelModelItem.h | 20 ++++----- app/LabelRegion.cpp | 8 ++-- app/LabelRegion.h | 16 +++---- app/MainWindow.cpp | 2 +- app/MainWindow.h | 2 +- app/MergeField.cpp | 8 ++-- app/MergeField.h | 16 +++---- app/MergeRecord.cpp | 8 ++-- app/MergeRecord.h | 16 +++---- app/NewLabelDialog.cpp | 2 +- app/NewLabelDialog.h | 2 +- app/SimplePreview.cpp | 2 +- app/SimplePreview.h | 2 +- app/TemplatePicker.cpp | 2 +- app/TemplatePicker.h | 2 +- app/TemplatePickerItem.cpp | 2 +- app/TemplatePickerItem.h | 2 +- app/TextNode.cpp | 10 ++--- app/TextNode.h | 16 +++---- app/glabels_main.cpp | 2 +- app/ui/NewLabelDialog.ui | 8 ++-- 33 files changed, 195 insertions(+), 153 deletions(-) diff --git a/app/BarcodeStyle.cpp b/app/BarcodeStyle.cpp index 4395313..e38ad68 100644 --- a/app/BarcodeStyle.cpp +++ b/app/BarcodeStyle.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "BarcodeStyle.h" diff --git a/app/BarcodeStyle.h b/app/BarcodeStyle.h index b13a1b5..a96854b 100644 --- a/app/BarcodeStyle.h +++ b/app/BarcodeStyle.h @@ -2,29 +2,29 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_BarcodeStyle_h -#define qtlabels_BarcodeStyle_h +#ifndef glabels_BarcodeStyle_h +#define glabels_BarcodeStyle_h #include #include -namespace qtLabels +namespace glabels { class BarcodeStyle @@ -114,4 +114,4 @@ namespace qtLabels } -#endif // qtlabels_BarcodeStyle_h +#endif // glabels_BarcodeStyle_h diff --git a/app/ColorNode.cpp b/app/ColorNode.cpp index d109055..b5c8344 100644 --- a/app/ColorNode.cpp +++ b/app/ColorNode.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "ColorNode.h" diff --git a/app/ColorNode.h b/app/ColorNode.h index f5a80cb..4ad0ff1 100644 --- a/app/ColorNode.h +++ b/app/ColorNode.h @@ -2,30 +2,30 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_ColorNode_h -#define qtlabels_ColorNode_h +#ifndef glabels_ColorNode_h +#define glabels_ColorNode_h #include #include -namespace qtLabels +namespace glabels { class ColorNode @@ -138,4 +138,4 @@ namespace qtLabels } -#endif // qtlabels_ColorNode_h +#endif // glabels_ColorNode_h diff --git a/app/File.cpp b/app/File.cpp index a7e2278..a3a5f64 100644 --- a/app/File.cpp +++ b/app/File.cpp @@ -23,7 +23,7 @@ #include "NewLabelDialog.h" -namespace gLabels +namespace glabels { namespace File diff --git a/app/File.h b/app/File.h index 723034c..96a14a1 100644 --- a/app/File.h +++ b/app/File.h @@ -25,7 +25,7 @@ #include -namespace gLabels +namespace glabels { namespace File diff --git a/app/Help.cpp b/app/Help.cpp index 9eb62e9..19a1735 100644 --- a/app/Help.cpp +++ b/app/Help.cpp @@ -25,7 +25,7 @@ #include -namespace gLabels +namespace glabels { namespace Help diff --git a/app/Help.h b/app/Help.h index c4a294c..08d0a8f 100644 --- a/app/Help.h +++ b/app/Help.h @@ -25,7 +25,7 @@ #include -namespace gLabels +namespace glabels { namespace Help diff --git a/app/Icons.h b/app/Icons.h index f0bd0d2..7ad2332 100644 --- a/app/Icons.h +++ b/app/Icons.h @@ -24,7 +24,7 @@ #include -namespace gLabels +namespace glabels { namespace Icons diff --git a/app/LabelModel.cpp b/app/LabelModel.cpp index 7e5b76e..b39bdec 100644 --- a/app/LabelModel.cpp +++ b/app/LabelModel.cpp @@ -2,25 +2,25 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #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::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::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 LabelModel::getSelection() + { + QList selectedList; + + foreach ( LabelModelItem *item, mItemList ) + { + if ( item->isSelected() ) + { + selectedList << item; + } + } + + } + + + void LabelModel::deleteSelection() + { + QList 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 ) { diff --git a/app/LabelModel.h b/app/LabelModel.h index 3fa70e9..e0ca992 100644 --- a/app/LabelModel.h +++ b/app/LabelModel.h @@ -2,33 +2,32 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_LabelModel_h -#define qtlabels_LabelModel_h +#ifndef glabels_LabelModel_h +#define glabels_LabelModel_h -#include -#include +#include +#include #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 m_item_list; + + QList getSelection(); + + QList mItemList; }; } -#endif // qtlabels_LabelModel_h +#endif // glabels_LabelModel_h + + /////////////////////////////////////////////////////////////////////////////// #if 0 diff --git a/app/LabelModelItem.cpp b/app/LabelModelItem.cpp index 263ccb9..dc8697b 100644 --- a/app/LabelModelItem.cpp +++ b/app/LabelModelItem.cpp @@ -2,26 +2,26 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "LabelModelItem.h" -namespace qtLabels +namespace glabels { /* diff --git a/app/LabelModelItem.h b/app/LabelModelItem.h index b8712fc..fce1041 100644 --- a/app/LabelModelItem.h +++ b/app/LabelModelItem.h @@ -2,24 +2,24 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_LabelModelItem_h -#define qtlabels_LabelModelItem_h +#ifndef glabels_LabelModelItem_h +#define glabels_LabelModelItem_h #include #include @@ -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 diff --git a/app/LabelRegion.cpp b/app/LabelRegion.cpp index 01938b0..e8125fd 100644 --- a/app/LabelRegion.cpp +++ b/app/LabelRegion.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "LabelRegion.h" diff --git a/app/LabelRegion.h b/app/LabelRegion.h index 27b8363..637ccb0 100644 --- a/app/LabelRegion.h +++ b/app/LabelRegion.h @@ -2,27 +2,27 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#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 diff --git a/app/MainWindow.cpp b/app/MainWindow.cpp index 2e1a46b..1699402 100644 --- a/app/MainWindow.cpp +++ b/app/MainWindow.cpp @@ -30,7 +30,7 @@ #include "File.h" #include "Help.h" -namespace gLabels +namespace glabels { MainWindow::MainWindow() diff --git a/app/MainWindow.h b/app/MainWindow.h index e4d32f4..9c6006a 100644 --- a/app/MainWindow.h +++ b/app/MainWindow.h @@ -30,7 +30,7 @@ #include -namespace gLabels +namespace glabels { class MainWindow : public QMainWindow diff --git a/app/MergeField.cpp b/app/MergeField.cpp index a29e26e..1aeaa3c 100644 --- a/app/MergeField.cpp +++ b/app/MergeField.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "MergeField.h" diff --git a/app/MergeField.h b/app/MergeField.h index 8072dba..2123df4 100644 --- a/app/MergeField.h +++ b/app/MergeField.h @@ -2,29 +2,29 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_MergeField_h -#define qtlabels_MergeField_h +#ifndef glabels_MergeField_h +#define glabels_MergeField_h #include -namespace qtLabels +namespace glabels { struct MergeField @@ -44,4 +44,4 @@ namespace qtLabels } -#endif // qtlabels_MergeField_h +#endif // glabels_MergeField_h diff --git a/app/MergeRecord.cpp b/app/MergeRecord.cpp index 8cb053b..4461213 100644 --- a/app/MergeRecord.cpp +++ b/app/MergeRecord.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "MergeRecord.h" diff --git a/app/MergeRecord.h b/app/MergeRecord.h index 7c84d5f..04850d1 100644 --- a/app/MergeRecord.h +++ b/app/MergeRecord.h @@ -2,24 +2,24 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_MergeRecord_h -#define qtlabels_MergeRecord_h +#ifndef glabels_MergeRecord_h +#define glabels_MergeRecord_h #include #include @@ -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 diff --git a/app/NewLabelDialog.cpp b/app/NewLabelDialog.cpp index c709709..1b7d38b 100644 --- a/app/NewLabelDialog.cpp +++ b/app/NewLabelDialog.cpp @@ -26,7 +26,7 @@ #include "TemplatePickerItem.h" -namespace gLabels +namespace glabels { NewLabelDialog::NewLabelDialog( QWidget *parent = 0 ) diff --git a/app/NewLabelDialog.h b/app/NewLabelDialog.h index dafb067..dd4b254 100644 --- a/app/NewLabelDialog.h +++ b/app/NewLabelDialog.h @@ -24,7 +24,7 @@ #include "ui_NewLabelDialog.h" -namespace gLabels +namespace glabels { class NewLabelDialog : public QDialog, public Ui_NewLabelDialog diff --git a/app/SimplePreview.cpp b/app/SimplePreview.cpp index d6ac8f9..c1c94d7 100644 --- a/app/SimplePreview.cpp +++ b/app/SimplePreview.cpp @@ -48,7 +48,7 @@ namespace } -namespace gLabels +namespace glabels { SimplePreview::SimplePreview( QWidget *parent = 0 ) diff --git a/app/SimplePreview.h b/app/SimplePreview.h index f1b03b3..6b13b71 100644 --- a/app/SimplePreview.h +++ b/app/SimplePreview.h @@ -29,7 +29,7 @@ #include "libglabels/Template.h" -namespace gLabels +namespace glabels { class SimplePreview : public QGraphicsView diff --git a/app/TemplatePicker.cpp b/app/TemplatePicker.cpp index 7d0ebec..4f345e2 100644 --- a/app/TemplatePicker.cpp +++ b/app/TemplatePicker.cpp @@ -25,7 +25,7 @@ #include "TemplatePickerItem.h" -namespace gLabels +namespace glabels { TemplatePicker::TemplatePicker( QWidget *parent ) : QListWidget(parent) diff --git a/app/TemplatePicker.h b/app/TemplatePicker.h index 92445c0..b6344f0 100644 --- a/app/TemplatePicker.h +++ b/app/TemplatePicker.h @@ -28,7 +28,7 @@ #include "libglabels/Template.h" -namespace gLabels +namespace glabels { class TemplatePicker : public QListWidget diff --git a/app/TemplatePickerItem.cpp b/app/TemplatePickerItem.cpp index fa69fc8..078ae73 100644 --- a/app/TemplatePickerItem.cpp +++ b/app/TemplatePickerItem.cpp @@ -25,7 +25,7 @@ #include -namespace gLabels +namespace glabels { TemplatePickerItem::TemplatePickerItem( libglabels::Template *tmplate, diff --git a/app/TemplatePickerItem.h b/app/TemplatePickerItem.h index 87b5897..73df4c4 100644 --- a/app/TemplatePickerItem.h +++ b/app/TemplatePickerItem.h @@ -28,7 +28,7 @@ #include "libglabels/Template.h" -namespace gLabels +namespace glabels { class TemplatePickerItem : public QListWidgetItem diff --git a/app/TextNode.cpp b/app/TextNode.cpp index 6bd18eb..f2f6748 100644 --- a/app/TextNode.cpp +++ b/app/TextNode.cpp @@ -2,20 +2,20 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ #include "TextNode.h" @@ -33,7 +33,7 @@ namespace { } -namespace qtLabels +namespace glabels { TextNode::TextNode( const QString &text, int i_start, int &i_next ) diff --git a/app/TextNode.h b/app/TextNode.h index 9f24f3b..c9d1267 100644 --- a/app/TextNode.h +++ b/app/TextNode.h @@ -2,29 +2,29 @@ * * Copyright (C) 2013 Jim Evins * - * 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 . + * along with gLabels-qt. If not, see . */ -#ifndef qtlabels_TextNode_h -#define qtlabels_TextNode_h +#ifndef glabels_TextNode_h +#define glabels_TextNode_h #include -namespace qtLabels +namespace glabels { class TextNode @@ -79,4 +79,4 @@ namespace qtLabels } -#endif // qtlabels_TextNode_h +#endif // glabels_TextNode_h diff --git a/app/glabels_main.cpp b/app/glabels_main.cpp index 339009d..3b26009 100644 --- a/app/glabels_main.cpp +++ b/app/glabels_main.cpp @@ -24,7 +24,7 @@ #include "MainWindow.h" #include "libglabels/Db.h" -using namespace gLabels; +using namespace glabels; using namespace libglabels; diff --git a/app/ui/NewLabelDialog.ui b/app/ui/NewLabelDialog.ui index 98aa10c..967a54e 100644 --- a/app/ui/NewLabelDialog.ui +++ b/app/ui/NewLabelDialog.ui @@ -123,7 +123,7 @@ - + false @@ -185,7 +185,7 @@ 12 - + 0 @@ -441,12 +441,12 @@ - gLabels::TemplatePicker + glabels::TemplatePicker QListWidget
TemplatePicker.h
 - gLabels::SimplePreview + glabels::SimplePreview QGraphicsView
SimplePreview.h