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

[Ralf Habacker]

SVN commit 1287814 by habacker:

Reduces differences to trunk.

 M  +4 -4      dialogs/umlviewdialog.cpp  
 M  +1 -1      listpopupmenu.cpp  
 M  +2 -2      uml.cpp  
 M  +12 -12    umlscene.cpp  
 M  +4 -4      umlscene.h  


--- branches/work/soc-umbrello/umbrello/dialogs/umlviewdialog.cpp #1287813:1287814
@@ -100,11 +100,11 @@
     m_diagramProperties->ui_showOpSigs->setChecked( m_pScene->getShowOpSig() );
 
     m_diagramProperties->ui_checkBoxShowGrid->setChecked(m_pScene->isSnapGridVisible());
-    m_diagramProperties->ui_snapToGrid->setChecked(m_pScene->getSnapToGrid());
-    m_diagramProperties->ui_snapComponentSizeToGrid->setChecked(m_pScene->getSnapComponentSizeToGrid());
+    m_diagramProperties->ui_snapToGrid->setChecked(m_pScene->snapToGrid());
+    m_diagramProperties->ui_snapComponentSizeToGrid->setChecked(m_pScene->snapComponentSizeToGrid());
 
-    m_diagramProperties->ui_gridSpaceX->setValue( m_pScene->getSnapX());
-    m_diagramProperties->ui_gridSpaceY->setValue( m_pScene->getSnapY());
+    m_diagramProperties->ui_gridSpaceX->setValue( m_pScene->snapX());
+    m_diagramProperties->ui_gridSpaceY->setValue( m_pScene->snapY());
     m_diagramProperties->ui_lineWidth->setValue( m_pScene->lineWidth());
     m_diagramProperties->ui_documentation->setText(m_pScene->documentation());
 }
--- branches/work/soc-umbrello/umbrello/listpopupmenu.cpp #1287813:1287814
@@ -1758,7 +1758,7 @@
         uWarning() << "Could not add autolayout entries because graphviz installation has not been found.";
     }
     insert(mt_SnapToGrid, i18n("Snap to Grid"), CHECKABLE);
-    setActionChecked(mt_SnapToGrid, view->umlScene()->getSnapToGrid() );
+    setActionChecked(mt_SnapToGrid, view->umlScene()->snapToGrid() );
     insert(mt_ShowSnapGrid, i18n("Show Grid"), CHECKABLE);
     setActionChecked(mt_ShowSnapGrid, view->umlScene()->isSnapGridVisible() );
     insert(mt_Properties);
--- branches/work/soc-umbrello/umbrello/uml.cpp #1287813:1287814
@@ -2324,7 +2324,7 @@
 void UMLApp::slotCurrentViewToggleSnapToGrid()
 {
     currentView()->umlScene()->toggleSnapToGrid();
-    viewSnapToGrid->setChecked( currentView()->umlScene()->getSnapToGrid() );
+    viewSnapToGrid->setChecked( currentView()->umlScene()->snapToGrid() );
 }
 
 /**
@@ -2375,7 +2375,7 @@
     viewProperties->setEnabled( bState );
     filePrint->setEnabled( bState );
     if ( currentView() ) {
-        viewSnapToGrid->setChecked( currentView()->umlScene()->getSnapToGrid() );
+        viewSnapToGrid->setChecked( currentView()->umlScene()->snapToGrid() );
         viewShowGrid->setChecked( currentView()->umlScene()->isSnapGridVisible() );
     }
 }
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1287813:1287814
@@ -3588,7 +3588,7 @@
  */
 void UMLScene::toggleSnapToGrid()
 {
-    setSnapToGrid(!getSnapToGrid());
+    setSnapToGrid(!snapToGrid());
 }
 
 /**
@@ -3597,7 +3597,7 @@
  */
 void UMLScene::toggleSnapComponentSizeToGrid()
 {
-    setSnapComponentSizeToGrid(!getSnapComponentSizeToGrid());
+    setSnapComponentSizeToGrid(!snapComponentSizeToGrid());
 }
 
 /**
@@ -3612,7 +3612,7 @@
 /**
  * Return whether to use snap to grid.
  */
-bool UMLScene::getSnapToGrid() const
+bool UMLScene::snapToGrid() const
 {
     return m_bUseSnapToGrid;
 }
@@ -3623,13 +3623,13 @@
 void UMLScene::setSnapToGrid(bool bSnap)
 {
     m_bUseSnapToGrid = bSnap;
-    emit sigSnapToGridToggled(getSnapToGrid());
+    emit sigSnapToGridToggled(snapToGrid());
 }
 
 /**
  * Return whether to use snap to grid for component size.
  */
-bool UMLScene::getSnapComponentSizeToGrid() const
+bool UMLScene::snapComponentSizeToGrid() const
 {
     return m_bUseSnapComponentSizeToGrid;
 }
@@ -3641,13 +3641,13 @@
 {
     m_bUseSnapComponentSizeToGrid = bSnap;
     updateComponentSizes();
-    emit sigSnapComponentSizeToGridToggled(getSnapComponentSizeToGrid());
+    emit sigSnapComponentSizeToGridToggled(snapComponentSizeToGrid());
 }
 
 /**
  * Returns the x grid size.
  */
-int UMLScene::getSnapX() const
+int UMLScene::snapX() const
 {
     return m_layoutGrid->gridSpacingX();
 }
@@ -3655,7 +3655,7 @@
 /**
  * Returns the y grid size.
  */
-int UMLScene::getSnapY() const
+int UMLScene::snapY() const
 {
     return m_layoutGrid->gridSpacingY();
 }
@@ -3674,8 +3674,8 @@
 qreal UMLScene::snappedX(qreal _x)
 {
     int x = (int)_x;
-    if (getSnapToGrid()) {
-        int gridX = getSnapX();
+    if (snapToGrid()) {
+        int gridX = snapX();
         int modX = x % gridX;
         x -= modX;
         if (modX >= gridX / 2)
@@ -3690,8 +3690,8 @@
 qreal UMLScene::snappedY(qreal _y)
 {
     int y = (int)_y;
-    if (getSnapToGrid()) {
-        int gridY = getSnapY();
+    if (snapToGrid()) {
+        int gridY = snapY();
         int modY = y % gridY;
         y -= modY;
         if (modY >= gridY / 2)
--- branches/work/soc-umbrello/umbrello/umlscene.h #1287813:1287814
@@ -127,14 +127,14 @@
     const QColor& gridDotColor() const;
     void setGridDotColor(const QColor &gridColor);
 
-    bool getSnapToGrid() const;
+    bool snapToGrid() const;
     void setSnapToGrid(bool bSnap);
 
-    bool getSnapComponentSizeToGrid() const;
+    bool snapComponentSizeToGrid() const;
     void setSnapComponentSizeToGrid(bool bSnap);
 
-    int getSnapX() const;
-    int getSnapY() const;
+    int snapX() const;
+    int snapY() const;
     void setSnapSpacing(int x, int y);
 
     qreal snappedX(qreal x);