Qt 5.2 has QComboBox::currentData()

qgis · Sep 21, 2016 · 6653e779964a5f88e697336ef5600c770c168a88 · 6653e77 · nyalldawson · Sep 21, 2016
1 parent 0542aac
commit 6653e779964a5f88e697336ef5600c770c168a88
diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp
@@ -76,7 +76,7 @@ void QgsComposerColumnAlignmentDelegate::setEditorData( QWidget* editor, const Q
 void QgsComposerColumnAlignmentDelegate::setModelData( QWidget* editor, QAbstractItemModel* model, const QModelIndex& index ) const
 {
   QComboBox *comboBox = static_cast<QComboBox*>( editor );
-  Qt::AlignmentFlag alignment = ( Qt::AlignmentFlag ) comboBox->itemData( comboBox->currentIndex() ).toInt();
+  Qt::AlignmentFlag alignment = ( Qt::AlignmentFlag ) comboBox->currentData().toInt();
   model->setData( index, alignment, Qt::EditRole );
 }
 

diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp
@@ -249,7 +249,7 @@ void QgsComposerManager::on_mAddButton_clicked()
     }
     else
     {
-      templateFile.setFileName( mTemplate->itemData( mTemplate->currentIndex() ).toString() );
+      templateFile.setFileName( mTemplate->currentData().toString() );
     }
 
     if ( !templateFile.exists() )

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -260,7 +260,7 @@ QgsGPSInformationWidget::~QgsGPSInformationWidget()
 #endif
 
   QSettings mySettings;
-  mySettings.setValue( "/gps/lastPort", mCboDevices->itemData( mCboDevices->currentIndex() ).toString() );
+  mySettings.setValue( "/gps/lastPort", mCboDevices->currentData().toString() );
   mySettings.setValue( "/gps/trackWidth", mSpinTrackWidth->value() );
   mySettings.setValue( "/gps/trackColor", mTrackColor );
   mySettings.setValue( "/gps/markerSize", mSliderMarkerSize->value() );
@@ -396,7 +396,7 @@ void QgsGPSInformationWidget::connectGps()
 
   if ( mRadUserPath->isChecked() )
   {
-    port = mCboDevices->itemData( mCboDevices->currentIndex() ).toString();
+    port = mCboDevices->currentData().toString();
 
     if ( port.isEmpty() )
     {

diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -518,7 +518,7 @@ QString QgsVectorLayerSaveAsDialog::encoding() const
 
 QString QgsVectorLayerSaveAsDialog::format() const
 {
-  return mFormatComboBox->itemData( mFormatComboBox->currentIndex() ).toString();
+  return mFormatComboBox->currentData().toString();
 }
 
 long QgsVectorLayerSaveAsDialog::crs() const
@@ -551,7 +551,7 @@ QStringList QgsVectorLayerSaveAsDialog::datasourceOptions() const
         case QgsVectorFileWriter::Set:
         {
           QComboBox* cb = mDatasourceOptionsGroupBox->findChild<QComboBox*>( it.key() );
-          if ( cb && !cb->itemData( cb->currentIndex() ).isNull() )
+          if ( cb && !cb->currentData().isNull() )
             options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
           break;
         }
@@ -603,7 +603,7 @@ QStringList QgsVectorLayerSaveAsDialog::layerOptions() const
         case QgsVectorFileWriter::Set:
         {
           QComboBox* cb = mLayerOptionsGroupBox->findChild<QComboBox*>( it.key() );
-          if ( cb && !cb->itemData( cb->currentIndex() ).isNull() )
+          if ( cb && !cb->currentData().isNull() )
             options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
           break;
         }
@@ -669,7 +669,7 @@ bool QgsVectorLayerSaveAsDialog::addToCanvas() const
 
 int QgsVectorLayerSaveAsDialog::symbologyExport() const
 {
-  return mSymbologyExportComboBox->itemData( mSymbologyExportComboBox->currentIndex() ).toInt();
+  return mSymbologyExportComboBox->currentData().toInt();
 }
 
 double QgsVectorLayerSaveAsDialog::scaleDenominator() const
@@ -699,7 +699,7 @@ bool QgsVectorLayerSaveAsDialog::onlySelected() const
 
 QgsWkbTypes::Type QgsVectorLayerSaveAsDialog::geometryType() const
 {
-  int currentIndexData = mGeometryTypeComboBox->itemData( mGeometryTypeComboBox->currentIndex() ).toInt();
+  int currentIndexData = mGeometryTypeComboBox->currentData().toInt();
   if ( currentIndexData == -1 )
   {
     //automatic
@@ -711,7 +711,7 @@ QgsWkbTypes::Type QgsVectorLayerSaveAsDialog::geometryType() const
 
 bool QgsVectorLayerSaveAsDialog::automaticGeometryType() const
 {
-  int currentIndexData = mGeometryTypeComboBox->itemData( mGeometryTypeComboBox->currentIndex() ).toInt();
+  int currentIndexData = mGeometryTypeComboBox->currentData().toInt();
   return currentIndexData == -1;
 }
 

diff --git a/src/app/qgsaddtaborgroup.cpp b/src/app/qgsaddtaborgroup.cpp
@@ -68,7 +68,7 @@ QString QgsAddTabOrGroup::name()
 
 QTreeWidgetItem* QgsAddTabOrGroup::tab()
 {
-  TabPair tab = mTabs.at( mTabList->itemData( mTabList->currentIndex() ).toInt() );
+  TabPair tab = mTabs.at( mTabList->currentData().toInt() );
   return tab.second;
 }
 

diff --git a/src/app/qgsalignrasterdialog.cpp b/src/app/qgsalignrasterdialog.cpp
@@ -439,7 +439,7 @@ QString QgsAlignRasterLayerConfigDialog::outputFilename() const
 
 QgsAlignRaster::ResampleAlg QgsAlignRasterLayerConfigDialog::resampleMethod() const
 {
-  return static_cast< QgsAlignRaster::ResampleAlg >( cboResample->itemData( cboResample->currentIndex() ).toInt() );
+  return static_cast< QgsAlignRaster::ResampleAlg >( cboResample->currentData().toInt() );
 }
 
 bool QgsAlignRasterLayerConfigDialog::rescaleValues() const

diff --git a/src/app/qgsdecorationcopyrightdialog.cpp b/src/app/qgsdecorationcopyrightdialog.cpp
@@ -90,7 +90,7 @@ void QgsDecorationCopyrightDialog::apply()
   mDeco.mQFont = txtCopyrightText->currentFont();
   mDeco.mLabelQString = txtCopyrightText->toPlainText();
   mDeco.mLabelQColor = pbnColorChooser->color();
-  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->itemData( cboPlacement->currentIndex() ).toInt() ) );
+  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->currentData().toInt() ) );
   mDeco.mMarginUnit = wgtUnitSelection->unit();
   mDeco.mMarginHorizontal = spnHorizontal->value();
   mDeco.mMarginVertical = spnVertical->value();

diff --git a/src/app/qgsdecorationnortharrowdialog.cpp b/src/app/qgsdecorationnortharrowdialog.cpp
@@ -93,7 +93,7 @@ void QgsDecorationNorthArrowDialog::on_sliderRotation_valueChanged( int theInt )
 void QgsDecorationNorthArrowDialog::apply()
 {
   mDeco.mRotationInt = sliderRotation->value();
-  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->itemData( cboPlacement->currentIndex() ).toInt() ) );
+  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->currentData().toInt() ) );
   mDeco.mMarginUnit = wgtUnitSelection->unit();
   mDeco.setEnabled( grpEnable->isChecked() );
   mDeco.mAutomatic = cboxAutomatic->isChecked();

diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp
@@ -89,7 +89,7 @@ void QgsDecorationScaleBarDialog::on_buttonBox_helpRequested()
 
 void QgsDecorationScaleBarDialog::apply()
 {
-  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->itemData( cboPlacement->currentIndex() ).toInt() ) );
+  mDeco.setPlacement( static_cast< QgsDecorationItem::Placement>( cboPlacement->currentData().toInt() ) );
   mDeco.mMarginUnit = wgtUnitSelection->unit();
   mDeco.mMarginHorizontal = spnHorizontal->value();
   mDeco.mMarginVertical = spnVertical->value();

diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -667,7 +667,7 @@ void QgsDiagramProperties::apply()
       }
       else
       {
-        maxVal = provider->maximumValue( mSizeAttributeComboBox->itemData( mSizeAttributeComboBox->currentIndex() ).toInt() ).toDouble();
+        maxVal = provider->maximumValue( mSizeAttributeComboBox->currentData().toInt() ).toDouble();
       }
     }
 
@@ -724,8 +724,8 @@ void QgsDiagramProperties::apply()
   ds.sizeScale = mDiagramUnitComboBox->getMapUnitScale();
   ds.lineSizeUnit = mDiagramLineUnitComboBox->unit();
   ds.lineSizeScale = mDiagramLineUnitComboBox->getMapUnitScale();
-  ds.labelPlacementMethod = static_cast<QgsDiagramSettings::LabelPlacementMethod>( mLabelPlacementComboBox->itemData( mLabelPlacementComboBox->currentIndex() ).toInt() );
-  ds.scaleByArea = mScaleDependencyComboBox->itemData( mScaleDependencyComboBox->currentIndex() ).toBool();
+  ds.labelPlacementMethod = static_cast<QgsDiagramSettings::LabelPlacementMethod>( mLabelPlacementComboBox->currentData().toInt() );
+  ds.scaleByArea = mScaleDependencyComboBox->currentData().toBool();
 
   if ( mIncreaseSmallDiagramsCheck->isChecked() )
   {
@@ -745,7 +745,7 @@ void QgsDiagramProperties::apply()
   ds.scaleBasedVisibility = mScaleVisibilityGroupBox->isChecked();
 
   // Diagram angle offset (pie)
-  ds.angleOffset = mAngleOffsetComboBox->itemData( mAngleOffsetComboBox->currentIndex() ).toInt();
+  ds.angleOffset = mAngleOffsetComboBox->currentData().toInt();
 
   // Diagram orientation (histogram)
   ds.diagramOrientation = static_cast<QgsDiagramSettings::DiagramOrientation>( mOrientationButtonGroup->checkedButton()->property( "direction" ).toInt() );
@@ -795,23 +795,23 @@ void QgsDiagramProperties::apply()
   dls.setShowAllDiagrams( mShowAllCheckBox->isChecked() );
   if ( mDataDefinedVisibilityGroupBox->isChecked() )
   {
-    dls.showColumn = mDataDefinedVisibilityComboBox->itemData( mDataDefinedVisibilityComboBox->currentIndex() ).toInt();
+    dls.showColumn = mDataDefinedVisibilityComboBox->currentData().toInt();
   }
   else
   {
     dls.showColumn = -1;
   }
   if ( mDataDefinedPositionGroupBox->isChecked() )
   {
-    dls.xPosColumn = mDataDefinedXComboBox->itemData( mDataDefinedXComboBox->currentIndex() ).toInt();
-    dls.yPosColumn = mDataDefinedYComboBox->itemData( mDataDefinedYComboBox->currentIndex() ).toInt();
+    dls.xPosColumn = mDataDefinedXComboBox->currentData().toInt();
+    dls.yPosColumn = mDataDefinedYComboBox->currentData().toInt();
   }
   else
   {
     dls.xPosColumn = -1;
     dls.yPosColumn = -1;
   }
-  dls.setPlacement(( QgsDiagramLayerSettings::Placement )mPlacementComboBox->itemData( mPlacementComboBox->currentIndex() ).toInt() );
+  dls.setPlacement(( QgsDiagramLayerSettings::Placement )mPlacementComboBox->currentData().toInt() );
 
   unsigned int flags = 0;
   if ( chkLineAbove->isChecked() )

diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -201,7 +201,7 @@ void QgsFieldCalculator::accept()
     //update existing field
     if ( mUpdateExistingGroupBox->isChecked() || !mNewFieldGroupBox->isEnabled() )
     {
-      if ( mExistingFieldComboBox->itemData( mExistingFieldComboBox->currentIndex() ).toString() == "geom" )
+      if ( mExistingFieldComboBox->currentData().toString() == "geom" )
       {
         //update geometry
         mAttributeId = -1;

diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -994,7 +994,7 @@ void QgsFieldsProperties::apply()
     QgsEditorWidgetConfig cfg;
 
     QComboBox* cb = qobject_cast<QComboBox*>( mRelationsList->cellWidget( i, RelNmCol ) );
-    QVariant otherRelation = cb->itemData( cb->currentIndex() );
+    QVariant otherRelation = cb->currentData();
 
     if ( otherRelation.isValid() )
     {

diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -940,7 +940,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
   lyr.dist = mLineDistanceSpnBx->value();
   lyr.distInMapUnits = ( mLineDistanceUnitWidget->unit() == QgsUnitTypes::RenderMapUnits );
   lyr.distMapUnitScale = mLineDistanceUnitWidget->getMapUnitScale();
-  lyr.offsetType = static_cast< QgsPalLayerSettings::OffsetType >( mOffsetTypeComboBox->itemData( mOffsetTypeComboBox->currentIndex() ).toInt() );
+  lyr.offsetType = static_cast< QgsPalLayerSettings::OffsetType >( mOffsetTypeComboBox->currentData().toInt() );
   lyr.quadOffset = ( QgsPalLayerSettings::QuadrantPosition )mQuadrantBtnGrp->checkedId();
   lyr.xOffset = mPointOffsetXSpinBox->value();
   lyr.yOffset = mPointOffsetYSpinBox->value();
@@ -1010,7 +1010,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
   lyr.priority = mPrioritySlider->value();
   lyr.obstacle = mChkNoObstacle->isChecked() || mMode == ObstaclesOnly;
   lyr.obstacleFactor = mObstacleFactorSlider->value() / 50.0;
-  lyr.obstacleType = ( QgsPalLayerSettings::ObstacleType )mObstacleTypeComboBox->itemData( mObstacleTypeComboBox->currentIndex() ).toInt();
+  lyr.obstacleType = ( QgsPalLayerSettings::ObstacleType )mObstacleTypeComboBox->currentData().toInt();
   lyr.labelPerPart = chkLabelPerFeaturePart->isChecked();
   lyr.displayAll = mPalShowAllLabelsForLayerChkBx->isChecked();
   lyr.mergeLines = chkMergeLines->isChecked();

diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -206,14 +206,15 @@ void QgsMeasureTool::canvasReleaseEvent( QgsMapMouseEvent* e )
   if ( e->button() == Qt::RightButton ) // if we clicked the right button we stop measuring
   {
     mDone = true;
+    mRubberBand->removeLastPoint();
+    mDialog->removeLastPoint();
   }
   else if ( e->button() == Qt::LeftButton )
   {
     mDone = false;
+    addPoint( point );
   }
 
-  // we always add the clicked point to the measuring feature
-  addPoint( point );
   mDialog->show();
 
 }

diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -289,7 +289,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
   }
 
   //evaluate behaviour (feature value or min / max / mean )
-  QString mergeBehaviourString = comboBox->itemData( comboBox->currentIndex() ).toString();
+  QString mergeBehaviourString = comboBox->currentData().toString();
   QVariant mergeResult; // result to show in the merge result field
   if ( mergeBehaviourString == "concat" )
   {
@@ -312,7 +312,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
   else
   {
     //numerical statistic
-    QgsStatisticalSummary::Statistic stat = ( QgsStatisticalSummary::Statistic )( comboBox->itemData( comboBox->currentIndex() ).toInt() );
+    QgsStatisticalSummary::Statistic stat = ( QgsStatisticalSummary::Statistic )( comboBox->currentData().toInt() );
     mergeResult = calcStatistic( col, stat );
   }
 
@@ -557,7 +557,7 @@ QgsAttributes QgsMergeAttributesDialog::mergedAttributes() const
     if ( fieldIdx >= results.count() )
       results.resize( fieldIdx + 1 ); // make sure the results vector is long enough (maybe not necessary)
 
-    if ( comboBox->itemData( comboBox->currentIndex() ).toString() != "skip" )
+    if ( comboBox->currentData().toString() != "skip" )
     {
       results[fieldIdx] = currentItem->data( Qt::DisplayRole );
     }
@@ -595,7 +595,7 @@ QSet<int> QgsMergeAttributesDialog::skippedAttributeIndexes() const
       continue;
     }
 
-    if ( comboBox->itemData( comboBox->currentIndex() ).toString() == "skip" )
+    if ( comboBox->currentData().toString() == "skip" )
     {
       skipped << i;
     }