X-Git-Url: http://git.maemo.org/git/?p=family-shop-mgr;a=blobdiff_plain;f=code%2Ffamily-shop-mgr%2FShoppingTreeModel.cpp;fp=code%2Ffamily-shop-mgr%2FShoppingTreeModel.cpp;h=2ee4df179bfc764c78b337f6767002796cedaa4d;hp=2bdde169deb8bd466431556254533ad39e63f85b;hb=f3b64470c91540f9ad00fdd0dcbc31a900427576;hpb=5395293ce1c95c407139f8e6c87343f600307277

diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp
index 2bdde16..2ee4df1 100644
--- 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);
         for(int column = 0; column < columnData.size(); column++)
         {
-            rootItem->child(rootItem->childCount() - 1)->setData(column, columnData[column]);
+            rootItem->child(rootItem->childCount() - 1)->
+                    setData(column, columnData[column]);
         }
         m_domElementForItem.insert(rootItem->child(rootItem->childCount() - 1),
                                    child);
@@ -98,7 +99,7 @@ QAbstractItemModel(parent), m_document("ShoppingList")
     }
 
 
-    connect(rootItem, SIGNAL(childInserted(ShoppingTreeItem*)), this,
+    connect(rootItem, SIGNAL(childItemSet(ShoppingTreeItem*)), this,
             SLOT(registerInsertedChild(ShoppingTreeItem*)));
     connect(rootItem, SIGNAL(childRemoved(ShoppingTreeItem*)), this,
             SLOT(deleteRemovedChild(ShoppingTreeItem*)));
@@ -107,7 +108,7 @@ QAbstractItemModel(parent), m_document("ShoppingList")
     while(i.hasNext())
     {
         i.next();
-        connect(i.key(), SIGNAL(childInserted(ShoppingTreeItem*)), this,
+        connect(i.key(), SIGNAL(childItemSet(ShoppingTreeItem*)), this,
                 SLOT(registerInsertedChild(ShoppingTreeItem*)));
         connect(i.key(), SIGNAL(childRemoved(ShoppingTreeItem*)), this,
                 SLOT(deleteRemovedChild(ShoppingTreeItem*)));
@@ -210,7 +211,8 @@ ShoppingTreeItem *ShoppingTreeModel::getItem(const QModelIndex &index) const
 }
 
 /*******************************************************************/
-QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,
+QVariant ShoppingTreeModel::headerData(int section,
+                                       Qt::Orientation orientation,
                                        int role) const
 {
     if(orientation == Qt::Horizontal && role == Qt::DisplayRole)
@@ -220,7 +222,8 @@ QVariant ShoppingTreeModel::headerData(int section, Qt::Orientation orientation,
 }
 
 /*******************************************************************/
-QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &parent) const
+QModelIndex ShoppingTreeModel::index(int row, int column,
+                                     const QModelIndex &parent) const
 {
     if(parent.isValid() && parent.column() != 0)
         return QModelIndex();
@@ -235,7 +238,8 @@ QModelIndex ShoppingTreeModel::index(int row, int column, const QModelIndex &par
 }
 
 /*******************************************************************/
-bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelIndex &parent)
+bool ShoppingTreeModel::insertColumns(int position, int columns,
+                                      const QModelIndex &parent)
 {
     bool success;
 
@@ -247,13 +251,15 @@ bool ShoppingTreeModel::insertColumns(int position, int columns, const QModelInd
 }
 
 /*******************************************************************/
-bool ShoppingTreeModel::insertRows(int position, int rows, const QModelIndex &parent)
+bool ShoppingTreeModel::insertRows(int position, int rows,
+                                   const QModelIndex &parent)
 {
     ShoppingTreeItem *parentItem = getItem(parent);
     bool success;
 
     beginInsertRows(parent, position, position + rows - 1);
-    success = parentItem->insertChildren(position, rows, rootItem->columnCount());
+    success = parentItem->insertChildren(position, rows,
+                                         rootItem->columnCount(), this);
     endInsertRows();
 
     return success;
@@ -359,9 +365,6 @@ bool ShoppingTreeModel::setHeaderData(int section, Qt::Orientation orientation,
 /*******************************************************************/
 void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)
 {
-    // wait until item type is defined
-    item->waitItemTypeDefinition();
-
     QDomElement parentElement = m_domElementForItem.value(item->parent());
     QDomElement element;
     if(item->getItemType() == ShoppingTreeItem::Category)
@@ -374,10 +377,6 @@ void ShoppingTreeModel::registerInsertedChild(ShoppingTreeItem *item)
     parentElement.appendChild(element);
     updateXmlFile();
     m_domElementForItem.insert(item, element);
-    connect(item, SIGNAL(childInserted(ShoppingTreeItem*)), this,
-            SLOT(registerInsertedChild(ShoppingTreeItem*)));
-    connect(item, SIGNAL(childRemoved(ShoppingTreeItem*)), this,
-            SLOT(deleteRemovedChild(ShoppingTreeItem*)));
 }
 
 /*******************************************************************/