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

[Oliver Kellogg]

SVN commit 643980 by okellogg:

showProperties(): Make virtual in UMLWidget.  Change return type to void.


 M  +1 -5      activitywidget.cpp  
 M  +1 -3      activitywidget.h  
 M  +1 -4      objectwidget.cpp  
 M  +1 -3      objectwidget.h  
 M  +1 -5      statewidget.cpp  
 M  +1 -3      statewidget.h  
 M  +1 -4      umlwidget.cpp  
 M  +1 -3      umlwidget.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/activitywidget.cpp #643979:643980
@@ -146,19 +146,15 @@
         UMLWidget::slotMenuSelection( sel );
 }
 
-bool ActivityWidget::showProperties() {
+void ActivityWidget::showProperties() {
     DocWindow *docwindow = UMLApp::app()->getDocWindow();
     docwindow->updateDocumentation(false);
 
     ActivityDialog dialog(m_pView, this);
-    bool modified = false;
     if (dialog.exec() && dialog.getChangesMade()) {
         docwindow->showDocumentation(this, true);
         UMLApp::app()->getDocument()->setModified(true);
-        modified = true;
     }
-
-    return modified;
 }
 
 bool ActivityWidget::isActivity(WorkToolBar::ToolBar_Buttons tbb,
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/activitywidget.h #643979:643980
@@ -76,10 +76,8 @@
 
     /**
      * Show a properties dialog for an ActivityWidget.
-     *
-     * @return  True if we modified the activity.
      */
-    bool showProperties();
+    void showProperties();
 
     /**
      * Determines whether a toolbar button represents an Activity.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/objectwidget.cpp #643979:643980
@@ -207,18 +207,15 @@
     }
 }
 
-bool ObjectWidget::showProperties() {
+void ObjectWidget::showProperties() {
     DocWindow *docwindow = UMLApp::app()->getDocWindow();
     docwindow->updateDocumentation(false);
     ClassPropDlg *dlg = new ClassPropDlg((QWidget*)UMLApp::app(), this);
-    bool modified = false;
     if (dlg->exec()) {
         docwindow->showDocumentation(this, true);
         UMLApp::app()->getDocument()->setModified(true);
-        modified = true;
     }
     dlg->close(true);//wipe from memory
-    return modified;
 }
 
 void ObjectWidget::drawObject(QPainter & p, int offsetX, int offsetY) {
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/objectwidget.h #643979:643980
@@ -141,10 +141,8 @@
 
     /**
      * Show a properties dialog for an ObjectWidget.
-     *
-     * @return  True if we modified the object.
      */
-    bool showProperties();
+    void showProperties();
 
     /**
      * Returns whether to draw as an Actor or not.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/statewidget.cpp #643979:643980
@@ -216,19 +216,15 @@
     return true;
 }
 
-bool StateWidget::showProperties() {
+void StateWidget::showProperties() {
     DocWindow *docwindow = UMLApp::app()->getDocWindow();
     docwindow->updateDocumentation(false);
 
     StateDialog dialog(m_pView, this);
-    bool modified = false;
     if (dialog.exec() && dialog.getChangesMade()) {
         docwindow->showDocumentation(this, true);
         UMLApp::app()->getDocument()->setModified(true);
-        modified = true;
     }
-
-    return modified;
 }
 
 bool StateWidget::isState(WorkToolBar::ToolBar_Buttons tbb, StateType& resultType)
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/statewidget.h #643979:643980
@@ -113,10 +113,8 @@
 
     /**
      * Show a properties dialog for a StateWidget.
-     *
-     * @return  True if we modified the state.
      */
-    bool showProperties();
+    void showProperties();
 
     /**
      * Returns true if the given toolbar button represents a State.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.cpp #643979:643980
@@ -599,21 +599,18 @@
     }
 }
 
-bool UMLWidget::showProperties() {
+void UMLWidget::showProperties() {
     // will already be selected so make sure docWindow updates the doc
     // back it the widget
     DocWindow *docwindow = UMLApp::app()->getDocWindow();
     docwindow->updateDocumentation( false );
     ClassPropDlg *dlg = new ClassPropDlg((QWidget*)UMLApp::app(), this);
 
-    bool modified = false;
     if (dlg->exec()) {
         docwindow->showDocumentation( getUMLObject() , true );
         UMLApp::app()->getDocument()->setModified(true);
-        modified = true;
     }
     dlg->close(true); //wipe from memory
-    return modified;
 }
 
 void UMLWidget::startPopupMenu( const QPoint &At) {
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidget.h #643979:643980
@@ -420,10 +420,8 @@
 
     /**
      * Show a properties dialog for a UMLWidget.
-     *
-     * @return  True if the widget was modified.
      */
-    bool showProperties();
+    virtual void showProperties();
 
     /**
      * Returns true if the Activate method has been called for this instance