QListFromTreeAdaptor: Simplified signal interception.

Removed unnecessary checks and variables.

Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org>

1 files changed, 9 insertions, 24 deletions

diff --git a/src/qlistfromtreeadaptor.cpp b/src/qlistfromtreeadaptor.cpp
index b04dfe0..e08ba8b 100644
--- a/src/qlistfromtreeadaptor.cpp
+++ b/src/qlistfromtreeadaptor.cpp
@@ -57,16 +57,11 @@ void QtListFromTreeAdaptorPrivate::_q_itemsInserted(const QtTreeModelBase::itera
     Q_Q(QtListFromTreeAdaptor);
 
     QtTreeModelBase::iterator_base _it = it;
-    QtTreeModelBase::iterator_base root = this->it;
     int index = 0;
 
-    _it.parent();
-
-    if ((root.isValid() && root == _it) || !_it.hasParent()) {
-        _it = it;
-
-        for (; _it.hasPreviousSibling(); index++) {
-            _it.previousSibling();
+    if (this->it == _it.parent()) {
+        for (_it = it; _it.hasPreviousSibling(); _it.previousSibling()) {
+            index++;
         }
 
         emit q->itemsInserted(index, count);
@@ -82,16 +77,11 @@ void QtListFromTreeAdaptorPrivate::_q_itemsRemoved(const QtTreeModelBase::iterat
     Q_Q(QtListFromTreeAdaptor);
 
     QtTreeModelBase::iterator_base _it = it;
-    QtTreeModelBase::iterator_base root = this->it;
     int index = 0;
 
-    _it.parent();
-
-    if ((root.isValid() && root == _it) || !_it.hasParent()) {
-        _it = it;
-
-        for (; _it.hasPreviousSibling(); index++) {
-            _it.previousSibling();
+    if (this->it == _it.parent()) {
+        for (_it = it; _it.hasPreviousSibling(); _it.previousSibling()) {
+            index++;
         }
 
         emit q->itemsRemoved(index, count);
@@ -108,16 +98,11 @@ void QtListFromTreeAdaptorPrivate::_q_itemsChanged(const QtTreeModelBase::iterat
     Q_Q(QtListFromTreeAdaptor);
 
     QtTreeModelBase::iterator_base _it = it;
-    QtTreeModelBase::iterator_base root = this->it;
     int index = 0;
 
-    _it.parent();
-
-    if ((root.isValid() && root == _it) || !_it.hasParent()) {
-        _it = it;
-
-        for (; _it.hasPreviousSibling(); index++) {
-            _it.previousSibling();
+    if (this->it == _it.parent()) {
+        for (_it = it; _it.hasPreviousSibling(); _it.previousSibling()) {
+            index++;
         }
 
         emit q->itemsChanged(index, count, roles);