[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/widget
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2010-08-27 22:35:04
Message-ID: 20100827223504.D30FDAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168933 by piggz:

Minor restructure as discussed with jstaniek

 M  +5 -0      KexiProjectModel.cpp  
 M  +6 -4      KexiProjectModelItem.cpp  


--- trunk/koffice/kexi/widget/KexiProjectModel.cpp #1168932:1168933
@@ -268,7 +268,10 @@
         }
         endInsertRows();
     }
+    else {
+        kDebug() << "Unable to find parent item!";
 }
+}
 
 KexiProjectModelItem* KexiProjectModel::addItem(KexiPart::Item &item, KexiPart::Info \
&info, KexiProjectModelItem *p) const  {
@@ -293,6 +296,8 @@
         beginRemoveRows(idx, 0,0);
         parent->removeChild(item);
         endRemoveRows();
+    } else {
+        kDebug() << "Unable to find parent item!";
     }
 }
 
--- trunk/koffice/kexi/widget/KexiProjectModelItem.cpp #1168932:1168933
@@ -159,7 +159,6 @@
     
     if (!m_item) {
         foreach(KexiProjectModelItem *child, m_childItems) {
-            if (!itm) {
                 if (child->m_item) {
                     if (child->m_item && child->m_item->identifier() == \
item.identifier()) {  itm = child;
@@ -167,10 +166,12 @@
                 } else {
                         itm = child->modelItemFromItem(item);
                 }
+            if (itm) {
+                return itm;
             }
         }
     }
-    return itm;
+    return 0;
 }
 
 KexiProjectModelItem* KexiProjectModelItem::modelItemFromName(const QString& name) \
const @@ -178,15 +179,16 @@
     KexiProjectModelItem* itm = 0;
 
         foreach(KexiProjectModelItem *child, m_childItems) {
-            if (!itm) {
                 if ((child->m_item && child->m_item->name() == name) || \
(child->m_info && child->m_info->partClass() == name) || (child->m_groupName == \
name)) {  itm = child;
                 } else {
                      itm = child->modelItemFromName(name);
                 }
+        if (itm) {
+            return itm;
             }
         }
-    return itm;
+    return 0;
 }
 
 void KexiProjectModelItem::sortChildren()


[prev in list] [next in list] [prev in thread] [next in thread]