[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

slotMenuSelection(): Bring back the list popup menues (aftermath of
introducing inputdialog.h)


  M +5 -6      associationwidget.cpp   1.65


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.64:1.65
@@ -2441,5 +2441,4 @@ void AssociationWidget::mouseReleaseEven
 void AssociationWidget::slotMenuSelection(int sel) {
         QString oldText, newText;
-        int result = 0;
         bool done = false;
         QFont font;
@@ -2504,5 +2503,5 @@ void AssociationWidget::slotMenuSelectio
                         oldText = "";
                 newText = KInputDialog::getText(i18n("Multiplicity"), i18n("Enter multiplicity:") , oldText, 0, m_pView);
-                if( result && newText != oldText && FloatingText::isTextValid(newText) ) {
+                if ( newText != oldText && FloatingText::isTextValid(newText) ) {
                         setMultiA(newText);
                 }
@@ -2516,5 +2515,5 @@ void AssociationWidget::slotMenuSelectio
                         oldText = "";
                 newText = KInputDialog::getText(i18n("Multiplicity"), i18n("Enter multiplicity:"), oldText, 0, m_pView);
-                if( result && newText != oldText && FloatingText::isTextValid(newText) ) {
+                if ( newText != oldText && FloatingText::isTextValid(newText) ) {
                         setMultiB(newText);
                 }
@@ -2528,5 +2527,5 @@ void AssociationWidget::slotMenuSelectio
 
                 newText = KInputDialog::getText(i18n("Association Name"), i18n("Enter association name:"), oldText, 0, m_pView);
-                if( result && newText != oldText && FloatingText::isTextValid(newText) )
+                if ( newText != oldText && FloatingText::isTextValid(newText) )
                         setName(newText);
 
@@ -2539,5 +2538,5 @@ void AssociationWidget::slotMenuSelectio
                         oldText = "";
                 newText = KInputDialog::getText(i18n("Role Name"), i18n("Enter role name:"), oldText, 0, m_pView);
-                if( result && newText != oldText && FloatingText::isTextValid(newText) ) {
+                if ( newText != oldText && FloatingText::isTextValid(newText) ) {
                         setRoleNameA(newText);
                 }
@@ -2550,5 +2549,5 @@ void AssociationWidget::slotMenuSelectio
                         oldText = "";
                 newText = KInputDialog::getText(i18n("Role Name"), i18n("Enter role name:"), oldText, 0, m_pView);
-                if( result && newText != oldText && FloatingText::isTextValid(newText) ) {
+                if ( newText != oldText && FloatingText::isTextValid(newText) ) {
                         setRoleNameB(newText);
                 }