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

[family-shop-mgr] / code / family-shop-mgr / ShoppingTreeModel.cpp

diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp
index 2bdde16..2ee4df1 100644 (file)
--- a/code/family-shop-mgr/ShoppingTreeModel.cpp
+++ b/code/family-shop-mgr/ShoppingTreeModel.cpp
@@ -90,7 +90,8 @@ QAbstractItemModel(parent), m_document("ShoppingList")
                 setItemType(ShoppingTreeItem::Item);\r
         for(int column = 0; column < columnData.size(); column++)\r
         {\r
                 setItemType(ShoppingTreeItem::Item);\r
         for(int column = 0; column < columnData.size(); column++)\r
         {\r

-            rootItem->child(rootItem->childCount() - 1)->setData(column, columnData[column]);\r
+            rootItem->child(rootItem->childCount() - 1)->\r
+                    setData(column, columnData[column]);\r

         }\r
         m_domElementForItem.insert(rootItem->child(rootItem->childCount() - 1),\r
                                    child);\r
         }\r
         m_domElementForItem.insert(rootItem->child(rootItem->childCount() - 1),\r
                                    child);\r

@@ -98,7 +99,7 @@ QAbstractItemModel(parent), m_document("ShoppingList")
     }\r
 \r
 \r
     }\r
 \r
 \r

-    connect(rootItem, SIGNAL(childInserted(ShoppingTreeItem*)), this,\r
+    connect(rootItem, SIGNAL(childItemSet(ShoppingTreeItem*)), this,\r

             SLOT(registerInsertedChild(ShoppingTreeItem*)));\r
     connect(rootItem, SIGNAL(childRemoved(ShoppingTreeItem*)), this,\r
             SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r
             SLOT(registerInsertedChild(ShoppingTreeItem*)));\r
     connect(rootItem, SIGNAL(childRemoved(ShoppingTreeItem*)), this,\r
             SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r

@@ -107,7 +108,7 @@ QAbstractItemModel(parent), m_document("ShoppingList")
     while(i.hasNext())\r
     {\r
         i.next();\r
     while(i.hasNext())\r
     {\r
         i.next();\r

-        connect(i.key(), SIGNAL(childInserted(ShoppingTreeItem*)), this,\r
+        connect(i.key(), SIGNAL(childItemSet(ShoppingTreeItem*)), this,\r

                 SLOT(registerInsertedChild(ShoppingTreeItem*)));\r
         connect(i.key(), SIGNAL(childRemoved(ShoppingTreeItem*)), this,\r
                 SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r
                 SLOT(registerInsertedChild(ShoppingTreeItem*)));\r
         connect(i.key(), SIGNAL(childRemoved(ShoppingTreeItem*)), this,\r
                 SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r

@@ -210,7 +211,8 @@ ShoppingTreeItem *ShoppingTreeModel::getItem(const QModelIndex &index) const
 }\r
 \r
 /*******************************************************************/\r
 }\r
 \r
 /*******************************************************************/\r

-QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,\r
+QVariant ShoppingTreeModel::headerData(int section,\r
+                                       Qt::Orientation orientation,\r

                                        int role) const\r
 {\r
     if(orientation == Qt::Horizontal && role == Qt::DisplayRole)\r
                                        int role) const\r
 {\r
     if(orientation == Qt::Horizontal && role == Qt::DisplayRole)\r

@@ -220,7 +222,8 @@ QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,
 }\r
 \r
 /*******************************************************************/\r
 }\r
 \r
 /*******************************************************************/\r

-QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &parent) const\r
+QModelIndex ShoppingTreeModel::index(int row, int column,\r
+                                     const QModelIndex &parent) const\r

 {\r
     if(parent.isValid() && parent.column() != 0)\r
         return QModelIndex();\r
 {\r
     if(parent.isValid() && parent.column() != 0)\r
         return QModelIndex();\r

@@ -235,7 +238,8 @@ QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &par
 }\r
 \r
 /*******************************************************************/\r
 }\r
 \r
 /*******************************************************************/\r

-bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelIndex &parent)\r
+bool ShoppingTreeModel::insertColumns(int position, int columns,\r
+                                      const QModelIndex &parent)\r

 {\r
     bool success;\r
 \r
 {\r
     bool success;\r
 \r

@@ -247,13 +251,15 @@ bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelInd
 }\r
 \r
 /*******************************************************************/\r
 }\r
 \r
 /*******************************************************************/\r

-bool ShoppingTreeModel::insertRows(int position, int rows, const QModelIndex &parent)\r
+bool ShoppingTreeModel::insertRows(int position, int rows,\r
+                                   const QModelIndex &parent)\r

 {\r
     ShoppingTreeItem *parentItem = getItem(parent);\r
     bool success;\r
 \r
     beginInsertRows(parent, position, position + rows - 1);\r
 {\r
     ShoppingTreeItem *parentItem = getItem(parent);\r
     bool success;\r
 \r
     beginInsertRows(parent, position, position + rows - 1);\r

-    success = parentItem->insertChildren(position, rows, rootItem->columnCount());\r
+    success = parentItem->insertChildren(position, rows,\r
+                                         rootItem->columnCount(), this);\r

     endInsertRows();\r
 \r
     return success;\r
     endInsertRows();\r
 \r
     return success;\r

@@ -359,9 +365,6 @@ bool ShoppingTreeModel::setHeaderData(int section, Qt::Orientation orientation,
 /*******************************************************************/\r
 void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)\r
 {\r
 /*******************************************************************/\r
 void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)\r
 {\r

-    // wait until item type is defined\r
-    item->waitItemTypeDefinition();\r
-\r

     QDomElement parentElement = m_domElementForItem.value(item->parent());\r
     QDomElement element;\r
     if(item->getItemType() == ShoppingTreeItem::Category)\r
     QDomElement parentElement = m_domElementForItem.value(item->parent());\r
     QDomElement element;\r
     if(item->getItemType() == ShoppingTreeItem::Category)\r

@@ -374,10 +377,6 @@ void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)
     parentElement.appendChild(element);\r
     updateXmlFile();\r
     m_domElementForItem.insert(item, element);\r
     parentElement.appendChild(element);\r
     updateXmlFile();\r
     m_domElementForItem.insert(item, element);\r

-    connect(item, SIGNAL(childInserted(ShoppingTreeItem*)), this,\r
-            SLOT(registerInsertedChild(ShoppingTreeItem*)));\r
-    connect(item, SIGNAL(childRemoved(ShoppingTreeItem*)), this,\r
-            SLOT(deleteRemovedChild(ShoppingTreeItem*)));\r

 }\r
 \r
 /*******************************************************************/\r
 }\r
 \r
 /*******************************************************************/\r