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

[Ralf Habacker]

SVN commit 1268737 by habacker:

there are two different properties dialog implementations, separate them using a descriptive name

 M  +1 -1      dialogs/codeeditor.cpp  
 M  +2 -2      umllistview.cpp  
 M  +1 -1      umlobject.cpp  
 M  +2 -1      umlobject.h  
 M  +1 -1      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp #1268736:1268737
@@ -176,7 +176,7 @@
                     delete dlg;
                 }
                 else if ( (dynamic_cast<UMLClassifier*>(obj)) ) {
-                    if (obj->showPropertiesDialog()) {
+                    if (obj->showPropertiesPagedDialog()) {
                         rebuildView(para);
                     }
                 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1268736:1268737
@@ -546,7 +546,7 @@
         umlType = object->baseType();
 
         if (Model_Utils::typeIsCanvasWidget(lvt)) {
-            object->showPropertiesDialog(ClassPropDlg::page_gen);
+            object->showPropertiesPagedDialog(ClassPropDlg::page_gen);
         } else if (umlType == UMLObject::ot_EnumLiteral) {
             // Show the Enum Literal Dialog
             UMLEnumLiteral* selectedEnumLiteral = static_cast<UMLEnumLiteral*>(object);
@@ -1334,7 +1334,7 @@
     }
 
     if (object)
-        object->showPropertiesDialog(page);
+        object->showPropertiesPagedDialog(page);
     item->cancelRename(0);  //double click can cause it to go into rename mode.
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #1268736:1268737
@@ -116,7 +116,7 @@
  * @param assoc   Whether to show association page.
  * @return        True if we modified the object.
  */
-bool UMLObject::showPropertiesDialog(int page, bool assoc)
+bool UMLObject::showPropertiesPagedDialog(int page, bool assoc)
 {
     Q_UNUSED(page);
     DocWindow *docwindow = UMLApp::app()->docWindow();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.h #1268736:1268737
@@ -128,7 +128,8 @@
 
     void setInPaste(bool bInPaste = true);
 
-    virtual bool showPropertiesDialog(int page = 0, bool assoc = false);
+    // FIXME: merge with showPropertiesDialog()
+    virtual bool showPropertiesPagedDialog(int page = 0, bool assoc = false);
 
     virtual bool resolveRef();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1268736:1268737
@@ -295,7 +295,7 @@
             UMLApp::app()->endMacro();
         } else if (wt == wt_Object) {
             UMLApp::app()->beginMacro(i18n("Change Properties"));
-            m_pObject->showPropertiesDialog();
+            m_pObject->showPropertiesPagedDialog();
             UMLApp::app()->endMacro();
         } else {
             uWarning() << "making properties dialog for unknown widget type";