git-svn-id: file:///svnroot/family-shop-mgr@21 26eb2498-383b-47a6-be48-5d6f36779e85

diff --git a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
index e962014..fe8187c 100644 (file)
--- a/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
+++ b/code/family-shop-mgr/FamilyShoppingManagerMainWindow.cpp
@@ -26,6 +26,7 @@
 #include "ListManagerView.h"
 #include "GoShoppingView.h"
 
+/*******************************************************************/
 FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent)
     : QMainWindow(parent), activityView(NULL), showCheckedItemsAction(NULL),
     endShoppingAction(NULL), goShoppingAction(NULL), editMenu(NULL)
@@ -38,11 +39,13 @@ FamilyShoppingManagerMainWindow::FamilyShoppingManagerMainWindow(QWidget *parent
     showListManager();
 }
 
+/*******************************************************************/
 FamilyShoppingManagerMainWindow::~FamilyShoppingManagerMainWindow()
 {
     delete activityView;
 }
 
+/*******************************************************************/
 void FamilyShoppingManagerMainWindow::showListManager()
 {
     menuBar()->clear();
@@ -70,6 +73,7 @@ void FamilyShoppingManagerMainWindow::showListManager()
     update();
 }
 
+/*******************************************************************/
 void FamilyShoppingManagerMainWindow::showGoShopping()
 {
     menuBar()->clear();
@@ -95,6 +99,7 @@ void FamilyShoppingManagerMainWindow::showGoShopping()
     update();
 }
 
+/*******************************************************************/
 void FamilyShoppingManagerMainWindow::showAbout()
 {
     QString text;

diff --git a/code/family-shop-mgr/GoShoppingView.cpp b/code/family-shop-mgr/GoShoppingView.cpp
index 0421948..0f08744 100644 (file)
--- a/code/family-shop-mgr/GoShoppingView.cpp
+++ b/code/family-shop-mgr/GoShoppingView.cpp
@@ -23,6 +23,7 @@
 \r
 #include "ShoppingTreeModel.h"\r
 \r
+/*******************************************************************/\r
 GoShoppingView::GoShoppingView(QString xmlFileName, QWidget *parent)\r
     :QTreeView(parent)\r
 {\r
@@ -32,6 +33,7 @@ GoShoppingView::GoShoppingView(QString xmlFileName, QWidget *parent)
         this->resizeColumnToContents(column);\r
 }\r
 \r
+/*******************************************************************/\r
 GoShoppingView::~GoShoppingView()\r
 {\r
 }\r

diff --git a/code/family-shop-mgr/ListManagerView.cpp b/code/family-shop-mgr/ListManagerView.cpp
index 535444e..c9050a7 100644 (file)
--- a/code/family-shop-mgr/ListManagerView.cpp
+++ b/code/family-shop-mgr/ListManagerView.cpp
@@ -23,6 +23,7 @@
 \r
 #include "ShoppingTreeModel.h"\r
 \r
+/*******************************************************************/\r
 ListManagerView::ListManagerView(QString xmlFileName, QWidget *parent)\r
     :QTreeView(parent)\r
 {\r
@@ -32,10 +33,12 @@ ListManagerView::ListManagerView(QString xmlFileName, QWidget *parent)
         this->resizeColumnToContents(column);\r
 }\r
 \r
+/*******************************************************************/\r
 ListManagerView::~ListManagerView()\r
 {\r
 }\r
 \r
+/*******************************************************************/\r
 void ListManagerView::updateActions()\r
 {\r
     bool hasSelection = !this->selectionModel()->selection().isEmpty();\r

diff --git a/code/family-shop-mgr/ShoppingTreeItem.cpp b/code/family-shop-mgr/ShoppingTreeItem.cpp
index 5f8faa1..6407767 100644 (file)
--- a/code/family-shop-mgr/ShoppingTreeItem.cpp
+++ b/code/family-shop-mgr/ShoppingTreeItem.cpp
@@ -21,6 +21,7 @@
 \r
 #include "ShoppingTreeItem.h"\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem::ShoppingTreeItem(const QVector<QVariant> &data,\r
                                    ShoppingTreeItem *parent) : m_itemType(NotDefined)\r
 {\r
@@ -28,21 +29,25 @@ ShoppingTreeItem::ShoppingTreeItem(const QVector<QVariant> &data,
     itemData = data;\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem::~ShoppingTreeItem()\r
 {\r
     qDeleteAll(childItems);\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem *ShoppingTreeItem::child(int number)\r
 {\r
     return childItems.value(number);\r
 }\r
 \r
+/*******************************************************************/\r
 int ShoppingTreeItem::childCount() const\r
 {\r
     return childItems.count();\r
 }\r
 \r
+/*******************************************************************/\r
 int ShoppingTreeItem::childNumber() const\r
 {\r
     if (parentItem)\r
@@ -51,16 +56,19 @@ int ShoppingTreeItem::childNumber() const
     return 0;\r
 }\r
 \r
+/*******************************************************************/\r
 int ShoppingTreeItem::columnCount() const\r
 {\r
     return itemData.count();\r
 }\r
 \r
+/*******************************************************************/\r
 QVariant ShoppingTreeItem::data(int column) const\r
 {\r
     return itemData.value(column);\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::insertChildren(int position, int count, int columns)\r
 {\r
     if (position < 0 || position > childItems.size())\r
@@ -76,6 +84,7 @@ bool ShoppingTreeItem::insertChildren(int position, int count, int columns)
     return true;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::insertColumns(int position, int columns)\r
 {\r
     if (position < 0 || position > itemData.size())\r
@@ -90,11 +99,13 @@ bool ShoppingTreeItem::insertColumns(int position, int columns)
     return true;\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem *ShoppingTreeItem::parent()\r
 {\r
     return parentItem;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::removeChildren(int position, int count)\r
 {\r
     if (position < 0 || position + count > childItems.size())\r
@@ -110,6 +121,7 @@ bool ShoppingTreeItem::removeChildren(int position, int count)
     return true;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::removeColumns(int position, int columns)\r
 {\r
     if (position < 0 || position + columns > itemData.size())\r
@@ -124,6 +136,7 @@ bool ShoppingTreeItem::removeColumns(int position, int columns)
     return true;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::setData(int column, const QVariant &value)\r
 {\r
     if (column < 0 || column >= itemData.size())\r
@@ -137,6 +150,7 @@ bool ShoppingTreeItem::setData(int column, const QVariant &value)
     return true;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeItem::setItemType(ItemType type)\r
 {\r
     if(type == NotDefined)\r
@@ -150,11 +164,13 @@ bool ShoppingTreeItem::setItemType(ItemType type)
     return (m_itemType == type) ? true : false;\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem::ItemType ShoppingTreeItem::getItemType() const\r
 {\r
     return m_itemType;\r
 }\r
 \r
+/*******************************************************************/\r
 void ShoppingTreeItem::waitItemTypeDefinition()\r
 {\r
     m_typeSemaphore.acquire();\r

diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp
index 0a65d9d..5f2985f 100644 (file)
--- a/code/family-shop-mgr/ShoppingTreeModel.cpp
+++ b/code/family-shop-mgr/ShoppingTreeModel.cpp
@@ -26,6 +26,7 @@
 #include <QApplication>\r
 #include <QtGui>\r
 \r
+/*******************************************************************/\r
 ShoppingTreeModel::ShoppingTreeModel(const QString &xmlFileName,\r
                                      QObject *parent) :\r
 QAbstractItemModel(parent), m_document("ShoppingList")\r
@@ -107,11 +108,13 @@ QAbstractItemModel(parent), m_document("ShoppingList")
     }\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeModel::~ShoppingTreeModel()\r
 {\r
     delete rootItem;\r
 }\r
 \r
+/*******************************************************************/\r
 QVariant ShoppingTreeModel::data(const QModelIndex &index, int role) const\r
 {\r
     if(!index.isValid())\r
@@ -124,6 +127,7 @@ QVariant ShoppingTreeModel::data(const QModelIndex &index, int role) const
     return item->data(index.column());\r
 }\r
 \r
+/*******************************************************************/\r
 Qt::ItemFlags ShoppingTreeModel::flags(const QModelIndex &index) const\r
 {\r
     if(!index.isValid())\r
@@ -132,6 +136,7 @@ Qt::ItemFlags ShoppingTreeModel::flags(const QModelIndex &index) const
     return Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable;\r
 }\r
 \r
+/*******************************************************************/\r
 ShoppingTreeItem *ShoppingTreeModel::getItem(const QModelIndex &index) const\r
 {\r
     if(index.isValid()){\r
@@ -142,6 +147,7 @@ ShoppingTreeItem *ShoppingTreeModel::getItem(const QModelIndex &index) const
     return rootItem;\r
 }\r
 \r
+/*******************************************************************/\r
 QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,\r
                                        int role) const\r
 {\r
@@ -151,6 +157,7 @@ QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,
     return QVariant();\r
 }\r
 \r
+/*******************************************************************/\r
 QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &parent) const\r
 {\r
     if(parent.isValid() && parent.column() != 0)\r
@@ -165,6 +172,7 @@ QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &par
         return QModelIndex();\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelIndex &parent)\r
 {\r
     bool success;\r
@@ -176,6 +184,7 @@ bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelInd
     return success;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::insertRows(int position, int rows, const QModelIndex &parent)\r
 {\r
     ShoppingTreeItem *parentItem = getItem(parent);\r
@@ -188,6 +197,7 @@ bool ShoppingTreeModel::insertRows(int position, int rows, const QModelIndex &pa
     return success;\r
 }\r
 \r
+/*******************************************************************/\r
 QModelIndex ShoppingTreeModel::parent(const QModelIndex &index) const\r
 {\r
     if(!index.isValid())\r
@@ -202,6 +212,7 @@ QModelIndex ShoppingTreeModel::parent(const QModelIndex &index) const
     return createIndex(parentItem->childNumber(), 0, parentItem);\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::removeColumns(int position, int columns, const QModelIndex &parent)\r
 {\r
     bool success;\r
@@ -216,6 +227,7 @@ bool ShoppingTreeModel::removeColumns(int position, int columns, const QModelInd
     return success;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::removeRows(int position, int rows, const QModelIndex &parent)\r
 {\r
     ShoppingTreeItem *parentItem = getItem(parent);\r
@@ -228,6 +240,7 @@ bool ShoppingTreeModel::removeRows(int position, int rows, const QModelIndex &pa
     return success;\r
 }\r
 \r
+/*******************************************************************/\r
 int ShoppingTreeModel::rowCount(const QModelIndex &parent) const\r
 {\r
     ShoppingTreeItem *parentItem = getItem(parent);\r
@@ -235,10 +248,13 @@ int ShoppingTreeModel::rowCount(const QModelIndex &parent) const
     return parentItem->childCount();\r
 }\r
 \r
+/*******************************************************************/\r
 int ShoppingTreeModel::columnCount(const QModelIndex &parent) const\r
 {\r
     return rootItem->columnCount();\r
 }\r
+\r
+/*******************************************************************/\r
 bool ShoppingTreeModel::setData(const QModelIndex &index, const QVariant &value, int role)\r
 {\r
     if(role != Qt::EditRole)\r
@@ -260,6 +276,7 @@ bool ShoppingTreeModel::setData(const QModelIndex &index, const QVariant &value,
     return result;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::setHeaderData(int section, Qt::Orientation orientation,\r
                                       const QVariant &value, int role)\r
 {\r
@@ -274,6 +291,7 @@ bool ShoppingTreeModel::setHeaderData(int section, Qt::Orientation orientation,
     return result;\r
 }\r
 \r
+/*******************************************************************/\r
 void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)\r
 {\r
     // wait until item type is defined\r
@@ -297,6 +315,7 @@ void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)
             SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r
 }\r
 \r
+/*******************************************************************/\r
 void ShoppingTreeModel::deleteRemovedChild(ShoppingTreeItem *item)\r
 {\r
     QDomElement element = m_domElementForItem.value(item);\r
@@ -306,6 +325,7 @@ void ShoppingTreeModel::deleteRemovedChild(ShoppingTreeItem *item)
     m_domElementForItem.remove(item);\r
 }\r
 \r
+/*******************************************************************/\r
 void ShoppingTreeModel::parseCategoryElement(const QDomElement &element,\r
                                              ShoppingTreeItem *parentItem)\r
 {\r
@@ -367,6 +387,7 @@ void ShoppingTreeModel::parseCategoryElement(const QDomElement &element,
     }\r
 }\r
 \r
+/*******************************************************************/\r
 QVector<QVariant> ShoppingTreeModel::getColumnsFromItemElement(const QDomElement &element)\r
 {\r
     QVector<QVariant> data;\r
@@ -383,6 +404,7 @@ QVector<QVariant> ShoppingTreeModel::getColumnsFromItemElement(const QDomElement
     return data;\r
 }\r
 \r
+/*******************************************************************/\r
 bool ShoppingTreeModel::updateDomElement(ShoppingTreeItem *item, int column)\r
 {\r
     QDomElement element = m_domElementForItem.value(item);\r
@@ -391,7 +413,7 @@ bool ShoppingTreeModel::updateDomElement(ShoppingTreeItem *item, int column)
      return false;\r
 \r
     bool success;\r
-    switch(column)\r
+    switch(column)/*******************************************************************/\r
     {\r
         case 0:\r
         {\r
@@ -438,6 +460,7 @@ bool ShoppingTreeModel::updateDomElement(ShoppingTreeItem *item, int column)
     return success;\r
 }\r
 \r
+/*******************************************************************/\r
 void ShoppingTreeModel::updateXmlFile() const\r
 {\r
     QFile xmlFile(m_xmlFileName);\r

diff --git a/code/family-shop-mgr/main.cpp b/code/family-shop-mgr/main.cpp
index 670e43f..a602825 100644 (file)
--- a/code/family-shop-mgr/main.cpp
+++ b/code/family-shop-mgr/main.cpp
@@ -22,6 +22,7 @@
 #include <QtGui/QApplication>
 #include "FamilyShoppingManagerMainWindow.h"
 
+/*******************************************************************/
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);