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

[Ralf Habacker]

SVN commit 1287895 by habacker:

Removed get prefix.

 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  
 M  +1 -1      widgets/associationwidget.cpp  
 M  +2 -2      widgets/messagewidget.cpp  
 M  +1 -1      widgets/preconditionwidget.cpp  
 M  +2 -2      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/controller/umlwidgetcontroller.cpp #1287894:1287895
@@ -126,7 +126,7 @@
 
     m_shiftPressed = false;
 
-    int count = m_widget->m_scene->getSelectCount(true);
+    int count = m_widget->m_scene->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
@@ -309,7 +309,7 @@
             m_leftButtonDown = false;
 
             if (!m_moved && !m_resized) {
-                if (!m_shiftPressed && (m_widget->m_scene->getSelectCount(true) > 1)) {
+                if (!m_shiftPressed && (m_widget->m_scene->selectedCount(true) > 1)) {
                     selectSingle(me);
                 } else if (!m_wasSelected) {
                     deselect(me);
@@ -626,7 +626,7 @@
  */
 void UMLWidgetController::setSelectionBounds()
 {
-    if (m_widget->m_scene->getSelectCount() > 0) {
+    if (m_widget->m_scene->selectedCount() > 0) {
         m_selectedWidgetsList.clear();
         m_widget->m_scene->selectedWidgets(m_selectedWidgetsList, false);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #1287894:1287895
@@ -1411,7 +1411,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();
@@ -1426,7 +1426,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 );
@@ -1750,7 +1750,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);
     }
@@ -2603,7 +2603,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;
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1287894:1287895
@@ -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
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1287894:1287895
@@ -1879,7 +1879,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 m_SelectedList.count();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1287894:1287895
@@ -189,7 +189,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);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1287894:1287895
@@ -3737,7 +3737,7 @@
     // overwrites the docwindow, but we want the main association doc
     // to win.
     if( _select ) {
-        if( m_scene->getSelectCount() == 0 )
+        if( m_scene->selectedCount() == 0 )
                 m_scene->view()->showDocumentation( this, false );
     } else
         m_scene->view()->updateDocumentation( true );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/messagewidget.cpp #1287894:1287895
@@ -512,7 +512,7 @@
         return;
     }
     //TODO why this condition?
-/*    if (m_scene->getSelectCount() > 2) {
+/*    if (m_scene->selectedCount() > 2) {
         return;
     }*/
 
@@ -553,7 +553,7 @@
     calculateWidget();
     if( !m_pFText )
         return;
-    if (m_scene->getSelectCount(true) > 1)
+    if (m_scene->selectedCount(true) > 1)
         return;
     setTextPosition();
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/preconditionwidget.cpp #1287894:1287895
@@ -190,7 +190,7 @@
         m_nY = getMaxY();
 
     calculateDimensions();
-    if (m_scene->getSelectCount(true) > 1)
+    if (m_scene->selectedCount(true) > 1)
         return;
 
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1287894:1287895
@@ -891,7 +891,7 @@
     m_menuIsEmbedded = false;
     //if in a multi- selection to a specific m_pMenu for that
     // NEW: ask UMLView to count ONLY the widgets and not their floatingtextwidgets
-    int count = m_scene->getSelectCount(true);
+    int count = m_scene->selectedCount(true);
     //a MessageWidget when selected will select its text widget and vice versa
     //so take that into account for popup menu.
 
@@ -1060,7 +1060,7 @@
 {
     const WidgetBase::WidgetType wt = m_Type;
     if (_select) {
-        if (m_scene->getSelectCount() == 0) {
+        if (m_scene->selectedCount() == 0) {
             if (widgetHasUMLObject(wt)) {
                 m_scene->view()->showDocumentation(m_pObject, false);
             } else {