[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 461904 by okellogg:

BUG:112552 - slot{Up,Down}Clicked(): Reset the m_pOldListItem.

 M  +1 -1      ChangeLog  
 M  +9 -6      umbrello/dialogs/classifierlistpage.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #461903:461904
@@ -11,7 +11,7 @@
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
  57588  57672  58809  66461  67120  67719  72016  79433  87252  88117
  97162 105564 108223 109591 109636 110073 110216 110231 110379 111088
-111470 111502 111759 111768 112017 112293 112333
+111470 111502 111759 111768 112017 112292 112293 112333 112531 112552
 
 Version 1.4.2 (maintenance release)
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp #461903:461904
@@ -179,12 +179,13 @@
     //
     // for more information see Qt doc for void QListBox::clearSelection()
     UMLClassifierListItem* listItem;
-    if(!item && m_pItemListLB->count() == 0) {
-        enableWidgets(false);
-        m_pOldListItem = 0;
-        m_pItemListLB->clearSelection();
-        return;
-    } else if (!item && m_pItemListLB->count() > 0) {
+    if (item == NULL) {
+        if (m_pItemListLB->count() == 0) {
+            enableWidgets(false);
+            m_pOldListItem = 0;
+            m_pItemListLB->clearSelection();
+            return;
+        }
         m_pItemListLB->setSelected(0, true);
         listItem = getItemList().at(0);
     } else {
@@ -327,6 +328,7 @@
     //shouldn't occur, but just in case
     if( count <= 1 || index <= 0 )
         return;
+    m_pOldListItem = NULL;
 
     //swap the text around in the ListBox
     QString aboveString = m_pItemListLB->text( index - 1 );
@@ -354,6 +356,7 @@
     //shouldn't occur, but just in case
     if( count <= 1 || index >= count - 1 )
         return;
+    m_pOldListItem = NULL;
 
     //swap the text around in the ListBox
     QString belowString = m_pItemListLB->text( index + 1 );