[Uml-devel] kdesdk/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Fix beastie 89563: not marked as modified when renaming diagram in listview
based on patch from Jean Vittor but extended to all items in list view


  M +1 -0      THANKS   1.2
  M +0 -4      umbrello/umllistview.cpp   1.122
  M +6 -3      umbrello/umllistviewitem.cpp   1.58


--- kdesdk/umbrello/THANKS  #1.1:1.2
@@ -15,2 +15,3 @@
 
  * Tobias Koenig - fix crashes caused by lack of code generator
+ * Jean Vittor - fix not marked as modified when renaming diagram in listview

--- kdesdk/umbrello/umbrello/umllistviewitem.cpp  #1.57:1.58
@@ -317,15 +317,17 @@ QString UMLListViewItem::getText() const
 void UMLListViewItem::okRename( int col ) {
         QListViewItem::okRename( col );
+        UMLDoc* doc = s_pListView->getDocument();
         if (m_bCreating) {
                 m_bCreating = false;
-                if ( s_pListView -> slotItemRenamed( this, col ) ) {
+                if ( s_pListView->slotItemRenamed( this, col ) ) {
                         m_Label = text(col);
+                        doc->setModified(true);
                 }
                 return;
         }
         QString newText = text( col );
-        if ( newText == m_Label )
+        if ( newText == m_Label ) {
             return;
-        UMLDoc * doc = s_pListView -> getDocument();
+        }
         if( newText.isEmpty() ) {
                 KMessageBox::error( kapp->mainWidget() ,
@@ -426,4 +428,5 @@ void UMLListViewItem::okRename( int col 
                         break;
         }
+        doc->setModified(true);
 }
 

--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.121:1.122
@@ -393,20 +393,16 @@ void UMLListView::popupMenuSel(int sel) 
         case ListPopupMenu::mt_Logical_Folder:
                 addNewItem( temp, Uml::lvt_Logical_Folder );
-                m_doc -> setModified( true );
                 break;
 
         case ListPopupMenu::mt_UseCase_Folder:
                 addNewItem( temp, Uml::lvt_UseCase_Folder );
-                m_doc -> setModified( true );
                 break;
 
         case ListPopupMenu::mt_Component_Folder:
                 addNewItem(temp, Uml::lvt_Component_Folder);
-                m_doc->setModified(true);
                 break;
 
         case ListPopupMenu::mt_Deployment_Folder:
                 addNewItem(temp, Uml::lvt_Deployment_Folder);
-                m_doc->setModified(true);
                 break;