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

[Laurent Montel]

SVN commit 564824 by mlaurent:

Fix some compile error


 M  +2 -2      classgenpage.cpp  
 M  +1 -1      parmpropdlg.cpp  
 M  +1 -1      selectopdlg.cpp  
 M  +4 -4      settingsdlg.cpp  
 M  +1 -1      umlattributedialog.cpp  
 M  +1 -1      umlentityattributedialog.cpp  
 M  +3 -3      umloperationdialog.cpp  
 M  +1 -1      umltemplatedialog.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp #564823:564824
@@ -234,9 +234,9 @@
     }
     // lookup for a default stereotype, if the operation doesn't have one
     if (foundDefaultStereotype)
-        m_pStereoTypeCB -> setCurrentItem(defaultStereotype);
+        m_pStereoTypeCB -> setCurrentIndex(defaultStereotype);
     else
-        m_pStereoTypeCB -> setCurrentItem(-1);
+        m_pStereoTypeCB -> setCurrentIndex(-1);
 
     ///////////
     m_pDoc->setWordWrap(Q3MultiLineEdit::WidgetWidth);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp #564823:564824
@@ -162,7 +162,7 @@
         QString typeBoxString = m_pTypeCB->text(typeBoxCount);
         if ( typeBoxString == type ) { //getTypeName()
             foundType = true;
-            m_pTypeCB->setCurrentItem(typeBoxCount);
+            m_pTypeCB->setCurrentIndex(typeBoxCount);
         } else {
             typeBoxCount++;
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/selectopdlg.cpp #564823:564824
@@ -134,7 +134,7 @@
     for (int i = 1; i!= m_pOpCB->count(); ++i)
     {
         if ( m_pOpCB->text(i) == op ) {
-            m_pOpCB->setCurrentItem(i);
+            m_pOpCB->setCurrentIndex(i);
             m_pCustomRB -> setChecked(false);
             slotSelected(OP);
             return true;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #564823:564824
@@ -212,7 +212,7 @@
         insertDiagram( diagrams[i] );
     }
 
-    m_GeneralWidgets.diagramKB->setCurrentItem( (int)m_pOptionState->generalState.diagram-1 );
+    m_GeneralWidgets.diagramKB->setCurrentIndex( (int)m_pOptionState->generalState.diagram-1 );
     connect( m_GeneralWidgets.autosaveCB, SIGNAL(clicked()), this, SLOT(slotAutosaveCBClicked()) );
 }
 
@@ -284,7 +284,7 @@
     insertAttribScope( tr2i18n( "Public" ) );
     insertAttribScope( tr2i18n( "Private" ) );
     insertAttribScope( tr2i18n( "Protected" ) );
-    m_ClassWidgets.m_pAttribScopeCB->setCurrentItem((m_pOptionState->classState.defaultAttributeScope - 200));
+    m_ClassWidgets.m_pAttribScopeCB->setCurrentIndex((m_pOptionState->classState.defaultAttributeScope - 200));
     m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
     scopeLayout -> addWidget( m_ClassWidgets.m_pAttribScopeCB, 0, 1 );
 
@@ -292,7 +292,7 @@
     insertOperationScope( tr2i18n( "Public" ) );
     insertOperationScope( tr2i18n( "Private" ) );
     insertOperationScope( tr2i18n( "Protected" ) );
-    m_ClassWidgets.m_pOperationScopeCB->setCurrentItem((m_pOptionState->classState.defaultOperationScope - 200));
+    m_ClassWidgets.m_pOperationScopeCB->setCurrentIndex((m_pOptionState->classState.defaultOperationScope - 200));
     m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
     scopeLayout -> addWidget( m_ClassWidgets.m_pOperationScopeCB, 1, 1 );
 
@@ -400,7 +400,7 @@
         m_ClassWidgets.showAttSigCB -> setChecked( false );
         m_ClassWidgets.showOpSigCB -> setChecked( false );
         m_ClassWidgets.showPackageCB -> setChecked( false );
-        m_ClassWidgets.m_pAttribScopeCB->setCurrentItem(1); // Private
+        m_ClassWidgets.m_pAttribScopeCB->setCurrentIndex(1); // Private
         m_ClassWidgets.m_pOperationScopeCB->setCurrentItem(0); // Public
     }
     else if (  current == pageCodeGen || current == pageCodeViewer )
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #564823:564824
@@ -141,7 +141,7 @@
         QString typeBoxString = m_pTypeCB->text(typeBoxCount);
         if ( typeBoxString == m_pAttribute->getTypeName() ) {
             foundType = true;
-            m_pTypeCB->setCurrentItem(typeBoxCount);
+            m_pTypeCB->setCurrentIndex(typeBoxCount);
         } else {
             typeBoxCount++;
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #564823:564824
@@ -168,7 +168,7 @@
         QString typeBoxString = m_pTypeCB->text(typeBoxCount);
         if ( typeBoxString == m_pEntityAttribute->getTypeName() ) {
             foundType = true;
-            m_pTypeCB->setCurrentItem(typeBoxCount);
+            m_pTypeCB->setCurrentIndex(typeBoxCount);
         } else {
             typeBoxCount++;
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp #564823:564824
@@ -192,7 +192,7 @@
         QString returnBoxString = m_pRtypeCB->text(returnBoxCount);
         if ( returnBoxString == m_pOperation->getTypeName() ) {
             foundReturnType = true;
-            m_pRtypeCB->setCurrentItem(returnBoxCount);
+            m_pRtypeCB->setCurrentIndex(returnBoxCount);
             break;
         }
         returnBoxCount++;
@@ -237,9 +237,9 @@
     }
     // lookup for a default stereotype, if the operation doesn't have one
     if (foundDefaultStereotype)
-        m_pStereoTypeCB->setCurrentItem(defaultStereotype);
+        m_pStereoTypeCB->setCurrentIndex(defaultStereotype);
     else
-        m_pStereoTypeCB->setCurrentItem(-1);
+        m_pStereoTypeCB->setCurrentIndex(-1);
 
     //setup parm list box signals
     connect( m_pUpButton, SIGNAL( clicked() ), this, SLOT( slotParameterUp() ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umltemplatedialog.cpp #564823:564824
@@ -102,7 +102,7 @@
         QString typeBoxString = m_pTypeCB->text(typeBoxCount);
         if ( typeBoxString == m_pTemplate->getTypeName() ) {
             foundType = true;
-            m_pTypeCB->setCurrentItem(typeBoxCount);
+            m_pTypeCB->setCurrentIndex(typeBoxCount);
         } else {
             typeBoxCount++;
         }