Use QColor instead of Qt::GlobalColor in item data

simonsonc · simonsonc · commit 6ebd9a8b1043 · 2014-04-01T20:50:44.000-05:00
The QVariant constructor that takes a Qt::GlobalColor is removed in Qt 5.
It is actually a kind of special case in Qt 4 anyway. Fix the uses of this
by constructing a QColor and using that instead.
diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -353,7 +353,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
       if ( i == myGrayBand )
       {
         mHistoColors << Qt::darkGray;
-        cboHistoBand->setItemData( i - 1, Qt::darkGray, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::darkGray ), Qt::ForegroundRole );
       }
       else
       {
@@ -366,7 +366,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
         {
           mHistoColors << Qt::black;
         }
-        cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );
       }
     }
   }
@@ -399,7 +399,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
         {
           myColor = Qt::black;
         }
-        cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );
       }
       if ( i == myRedBand ||  i == myGreenBand || i == myBlueBand )
       {

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ void QgsRasterHistogramWidget::refreshHistogram()`
`353`	`353`	`if ( i == myGrayBand )`
`354`	`354`	`{`
`355`	`355`	`mHistoColors << Qt::darkGray;`
`356`		`- cboHistoBand->setItemData( i - 1, Qt::darkGray, Qt::ForegroundRole );`
	`356`	`+ cboHistoBand->setItemData( i - 1, QColor( Qt::darkGray ), Qt::ForegroundRole );`
`357`	`357`	`}`
`358`	`358`	`else`
`359`	`359`	`{`
`@@ -366,7 +366,7 @@ void QgsRasterHistogramWidget::refreshHistogram()`
`366`	`366`	`{`
`367`	`367`	`mHistoColors << Qt::black;`
`368`	`368`	`}`
`369`		`- cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );`
	`369`	`+ cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`	`}`
`@@ -399,7 +399,7 @@ void QgsRasterHistogramWidget::refreshHistogram()`
`399`	`399`	`{`
`400`	`400`	`myColor = Qt::black;`
`401`	`401`	`}`
`402`		`- cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );`
	`402`	`+ cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );`
`403`	`403`	`}`
`404`	`404`	`if ( i == myRedBand \|\| i == myGreenBand \|\| i == myBlueBand )`
`405`	`405`	`{`