Skip to content

Commit

Permalink
Merge pull request qgis#1288 from simonsonc/qvariant-qcolor
Browse files Browse the repository at this point in the history
Use QColor instead of Qt::GlobalColor in item data
  • Loading branch information
etiennesky committed Apr 2, 2014
2 parents 2b3108f + 6ebd9a8 commit bc40ab6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/gui/raster/qgsrasterhistogramwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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 );
}
}
}
Expand Down Expand Up @@ -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 )
{
Expand Down

0 comments on commit bc40ab6

Please sign in to comment.