[Uml-devel] branches/work/soc-umbrello/umbrello

[Ralf Habacker]

SVN commit 1287872 by habacker:

Reduced differences to trunk.

 M  +1 -1      dialogs/umlviewdialog.cpp  
 M  +1 -1      umlscene.cpp  
 M  +1 -1      umlscene.h  
 M  +1 -1      widgets/floatingtextwidget.cpp  
 M  +1 -1      widgets/linkwidget.cpp  


--- branches/work/soc-umbrello/umbrello/dialogs/umlviewdialog.cpp #1287871:1287872
@@ -97,7 +97,7 @@
 
     m_diagramProperties->ui_diagramName->setText( m_pScene->name() );
     m_diagramProperties->ui_zoom->setValue(m_pScene->activeView()->currentZoom());
-    m_diagramProperties->ui_showOpSigs->setChecked( m_pScene->getShowOpSig() );
+    m_diagramProperties->ui_showOpSigs->setChecked( m_pScene->showOpSig() );
 
     m_diagramProperties->ui_checkBoxShowGrid->setChecked(m_pScene->isSnapGridVisible());
     m_diagramProperties->ui_snapToGrid->setChecked(m_pScene->snapToGrid());
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1287871:1287872
@@ -3721,7 +3721,7 @@
 /**
  * Returns whether to show operation signatures.
  */
-bool UMLScene::getShowOpSig() const
+bool UMLScene::showOpSig() const
 {
     return m_Options.classState.showOpSig;
 }
--- branches/work/soc-umbrello/umbrello/umlscene.h #1287871:1287872
@@ -149,7 +149,7 @@
     QFont getFont() const;
     void setFont(QFont font, bool changeAllWidgets = false);
 
-    bool getShowOpSig() const;
+    bool showOpSig() const;
     void setShowOpSig(bool bShowOpSig);
 
     const Settings::OptionState& optionState() const;
--- branches/work/soc-umbrello/umbrello/widgets/floatingtextwidget.cpp #1287871:1287872
@@ -109,7 +109,7 @@
             QString seqNum, op;
             m_linkWidget->seqNumAndOp(seqNum, op);
             if (!seqNum.isEmpty() || !op.isEmpty()) {
-                if (umlScene() && ! umlScene()->getShowOpSig()) {
+                if (umlScene() && ! umlScene()->showOpSig()) {
                     op.replace(QRegExp("\\(.*\\)"), "()");
                 }
                 text = seqNum.append(": ").append(op);
--- branches/work/soc-umbrello/umbrello/widgets/linkwidget.cpp #1287871:1287872
@@ -53,7 +53,7 @@
     if (scene == NULL)
         scene = UMLApp::app()->currentView()->umlScene();
     Uml::SignatureType sigType;
-    if (scene && scene->getShowOpSig())
+    if (scene && scene->showOpSig())
         sigType = Uml::SignatureType::SigNoVis;
     else
         sigType = Uml::SignatureType::NoSigNoVis;