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

[Ralf Habacker]

SVN commit 1287893 by habacker:

Reduced differences to trunk.

 M  +3 -3      controller/umlwidgetcontroller.cpp  
 M  +4 -4      uml.cpp  
 M  +1 -1      umllistview.cpp  
 M  +1 -1      umlscene.cpp  
 M  +1 -1      umlscene.h  


--- branches/work/soc-umbrello/umbrello/controller/umlwidgetcontroller.cpp #1287892:1287893
@@ -129,7 +129,7 @@
 
     m_shiftPressed = false;
 
-    int count = m_widget->umlScene()->getSelectCount(true);
+    int count = m_widget->umlScene()->selectedCount(true);
     if (me->button() == Qt::LeftButton) {
         if (m_widget->isSelected() && count > 1) {
             //Single selection is made in release event if the widget wasn't moved
@@ -314,7 +314,7 @@
             m_leftButtonDown = false;
 
             if (!m_moved && !m_resized) {
-                if (!m_shiftPressed && (m_widget->umlScene()->getSelectCount(true) > 1)) {
+                if (!m_shiftPressed && (m_widget->umlScene()->selectedCount(true) > 1)) {
                     selectSingle(me);
                 } else if (!m_wasSelected) {
                     deselect(me);
@@ -632,7 +632,7 @@
  */
 void UMLWidgetController::setSelectionBounds()
 {
-    if (m_widget->umlScene()->getSelectCount() > 0) {
+    if (m_widget->umlScene()->selectedCount() > 0) {
         m_selectedWidgetsList.clear();
         m_widget->umlScene()->getSelectedWidgets(m_selectedWidgetsList, false);
 
--- branches/work/soc-umbrello/umbrello/uml.cpp #1287892:1287893
@@ -1412,7 +1412,7 @@
     slotStatusMsg(i18n("Cutting selection..."));
     //FIXME bug 59774 this fromview isn't very reliable.
     //when cutting diagrams it is set to true even though it shouldn't be
-    bool fromview = (currentView() && currentView()->umlScene()->getSelectCount());
+    bool fromview = (currentView() && currentView()->umlScene()->selectedCount());
     if ( editCutCopy(fromview) ) {
         emit sigCutSuccessful();
         slotDeleteSelectedWidget();
@@ -1427,7 +1427,7 @@
 void UMLApp::slotEditCopy()
 {
     slotStatusMsg(i18n("Copying selection to clipboard..."));
-    bool  fromview = (currentView() && currentView()->umlScene()->getSelectCount());
+    bool  fromview = (currentView() && currentView()->umlScene()->selectedCount());
     editCutCopy( fromview );
     resetStatusMsg();
     m_doc->setModified( true );
@@ -1757,7 +1757,7 @@
  */
 void UMLApp::slotCopyChanged()
 {
-    if (m_listView->selectedItemsCount() || (currentView() && currentView()->umlScene()->getSelectCount())) {
+    if (m_listView->selectedItemsCount() || (currentView() && currentView()->umlScene()->selectedCount())) {
         editCopy->setEnabled(true);
         editCut->setEnabled(true);
     }
@@ -2610,7 +2610,7 @@
 {
     // in case we have selected something in the diagram, move it by one pixel
     // to the direction pointed by the cursor key
-    if (m_view == NULL || !m_view->umlScene()->getSelectCount() || e->modifiers() != Qt::AltModifier) {
+    if (m_view == NULL || !m_view->umlScene()->selectedCount() || e->modifiers() != Qt::AltModifier) {
         e->ignore();
         return;
     }
--- branches/work/soc-umbrello/umbrello/umllistview.cpp #1287892:1287893
@@ -332,7 +332,7 @@
 void UMLListView::keyPressEvent(QKeyEvent *ke)
 {
     UMLView *view = UMLApp::app()->currentView();
-    if (view && view->umlScene()->getSelectCount()) {
+    if (view && view->umlScene()->selectedCount()) {
         // Widgets have been selected in the diagram area,
         // assume they handle the keypress.
         ke->accept();                 // munge and do nothing
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1287892:1287893
@@ -1772,7 +1772,7 @@
  *                    Default: Count all widgets.
  * @return  Number of widgets selected.
  */
-int UMLScene::getSelectCount(bool filterText) const
+int UMLScene::selectedCount(bool filterText) const
 {
     if (!filterText)
         return selectedWidgets().count();
--- branches/work/soc-umbrello/umbrello/umlscene.h #1287892:1287893
@@ -187,7 +187,7 @@
 
     void moveSelectedBy(UMLSceneValue dX, UMLSceneValue dY);
 
-    int getSelectCount(bool filterText = false) const;
+    int selectedCount(bool filterText = false) const;
 
     void selectionUseFillColor(bool useFC);
     void selectionSetFont(const QFont &font);