Avoid some deprecated warnings

nyalldawson · nyalldawson · commit cac9c9ee12c7 · 2015-11-25T07:13:01.000+11:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2754,10 +2754,10 @@ void QgsVectorLayer::setEditType( int idx, EditType type )
 
   Q_NOWARN_DEPRECATED_PUSH
   const QString widgetType = QgsLegacyHelpers::convertEditType( type, cfg, this, mUpdatedFields[idx].name() );
-  Q_NOWARN_DEPRECATED_POP
 
   setEditorWidgetV2( idx, widgetType );
   setEditorWidgetV2Config( idx, cfg );
+  Q_NOWARN_DEPRECATED_POP
 }
 
 void QgsVectorLayer::setAnnotationForm( const QString& ui )
@@ -2767,28 +2767,36 @@ void QgsVectorLayer::setAnnotationForm( const QString& ui )
 
 QMap< QString, QVariant > QgsVectorLayer::valueMap( int idx )
 {
+  Q_NOWARN_DEPRECATED_PUSH
   return editorWidgetV2Config( idx );
+  Q_NOWARN_DEPRECATED_POP
 }
 
 QgsVectorLayer::RangeData QgsVectorLayer::range( int idx )
 {
+  Q_NOWARN_DEPRECATED_PUSH
   const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );
   return RangeData(
            cfg.value( "Min" ),
            cfg.value( "Max" ),
            cfg.value( "Step" )
          );
+  Q_NOWARN_DEPRECATED_POP
 }
 
 QString QgsVectorLayer::dateFormat( int idx )
 {
+  Q_NOWARN_DEPRECATED_PUSH
   return editorWidgetV2Config( idx ).value( "DateFormat" ).toString();
+  Q_NOWARN_DEPRECATED_POP
 }
 
 QSize QgsVectorLayer::widgetSize( int idx )
 {
+  Q_NOWARN_DEPRECATED_PUSH
   const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );
   return QSize( cfg.value( "Width" ).toInt(), cfg.value( "Height" ).toInt() );
+  Q_NOWARN_DEPRECATED_POP
 }
 
 void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )
@@ -2859,10 +2867,12 @@ void QgsVectorLayer::destroyEditCommand()
 
 void QgsVectorLayer::setCheckedState( int idx, const QString& checked, const QString& unchecked )
 {
+  Q_NOWARN_DEPRECATED_PUSH
   QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );
   cfg["CheckedState"] = checked;
   cfg["UncheckedState"] = unchecked;
   setEditorWidgetV2Config( idx, cfg );
+  Q_NOWARN_DEPRECATED_POP
 }
 
 int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const

Original file line number	Diff line number	Diff line change
`@@ -2754,10 +2754,10 @@ void QgsVectorLayer::setEditType( int idx, EditType type )`
`2754`	`2754`
`2755`	`2755`	`Q_NOWARN_DEPRECATED_PUSH`
`2756`	`2756`	`const QString widgetType = QgsLegacyHelpers::convertEditType( type, cfg, this, mUpdatedFields[idx].name() );`
`2757`		`- Q_NOWARN_DEPRECATED_POP`
`2758`	`2757`
`2759`	`2758`	`setEditorWidgetV2( idx, widgetType );`
`2760`	`2759`	`setEditorWidgetV2Config( idx, cfg );`
	`2760`	`+ Q_NOWARN_DEPRECATED_POP`
`2761`	`2761`	`}`
`2762`	`2762`
`2763`	`2763`	`void QgsVectorLayer::setAnnotationForm( const QString& ui )`
`@@ -2767,28 +2767,36 @@ void QgsVectorLayer::setAnnotationForm( const QString& ui )`
`2767`	`2767`
`2768`	`2768`	`QMap< QString, QVariant > QgsVectorLayer::valueMap( int idx )`
`2769`	`2769`	`{`
	`2770`	`+ Q_NOWARN_DEPRECATED_PUSH`
`2770`	`2771`	`return editorWidgetV2Config( idx );`
	`2772`	`+ Q_NOWARN_DEPRECATED_POP`
`2771`	`2773`	`}`
`2772`	`2774`
`2773`	`2775`	`QgsVectorLayer::RangeData QgsVectorLayer::range( int idx )`
`2774`	`2776`	`{`
	`2777`	`+ Q_NOWARN_DEPRECATED_PUSH`
`2775`	`2778`	`const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );`
`2776`	`2779`	`return RangeData(`
`2777`	`2780`	`cfg.value( "Min" ),`
`2778`	`2781`	`cfg.value( "Max" ),`
`2779`	`2782`	`cfg.value( "Step" )`
`2780`	`2783`	`);`
	`2784`	`+ Q_NOWARN_DEPRECATED_POP`
`2781`	`2785`	`}`
`2782`	`2786`
`2783`	`2787`	`QString QgsVectorLayer::dateFormat( int idx )`
`2784`	`2788`	`{`
	`2789`	`+ Q_NOWARN_DEPRECATED_PUSH`
`2785`	`2790`	`return editorWidgetV2Config( idx ).value( "DateFormat" ).toString();`
	`2791`	`+ Q_NOWARN_DEPRECATED_POP`
`2786`	`2792`	`}`
`2787`	`2793`
`2788`	`2794`	`QSize QgsVectorLayer::widgetSize( int idx )`
`2789`	`2795`	`{`
	`2796`	`+ Q_NOWARN_DEPRECATED_PUSH`
`2790`	`2797`	`const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );`
`2791`	`2798`	`return QSize( cfg.value( "Width" ).toInt(), cfg.value( "Height" ).toInt() );`
	`2799`	`+ Q_NOWARN_DEPRECATED_POP`
`2792`	`2800`	`}`
`2793`	`2801`
`2794`	`2802`	`void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )`
`@@ -2859,10 +2867,12 @@ void QgsVectorLayer::destroyEditCommand()`
`2859`	`2867`
`2860`	`2868`	`void QgsVectorLayer::setCheckedState( int idx, const QString& checked, const QString& unchecked )`
`2861`	`2869`	`{`
	`2870`	`+ Q_NOWARN_DEPRECATED_PUSH`
`2862`	`2871`	`QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx );`
`2863`	`2872`	`cfg["CheckedState"] = checked;`
`2864`	`2873`	`cfg["UncheckedState"] = unchecked;`
`2865`	`2874`	`setEditorWidgetV2Config( idx, cfg );`
	`2875`	`+ Q_NOWARN_DEPRECATED_POP`
`2866`	`2876`	`}`
`2867`	`2877`
`2868`	`2878`	`int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const`