SVN commit 866454 by aclemens:

API change: rename the colors methods, I think the new names are a little bit more
meaningful now.

 M  +3 -3      imageproperties/imagepropertiescolorstab.cpp  
 M  +3 -3      widgets/common/histogrambox.cpp  
 M  +2 -2      widgets/common/histogrambox.h  


--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp #866453:866454
@@ -310,7 +310,7 @@
                                 (int)HistogramBox::LuminosityChannel));
     d->histogramBox->setScale(group.readEntry("Histogram Scale",
                                 (int)HistogramBox::Logarithmic));
-    d->histogramBox->setColors(group.readEntry("Histogram Color", 0));
+    d->histogramBox->setColorsChannel(group.readEntry("Histogram Color", 0));
 
     d->regionBG->button(group.readEntry("Histogram Rendering",
                                         (int)HistogramWidget::FullImageHistogram))->setChecked(true);
@@ -364,7 +364,7 @@
     group.writeEntry("ImagePropertiesColors Tab", currentIndex());
     group.writeEntry("Histogram Channel", d->histogramBox->channel());
     group.writeEntry("Histogram Scale", d->histogramBox->scale());
-    group.writeEntry("Histogram Color", d->histogramBox->colors());
+    group.writeEntry("Histogram Color", d->histogramBox->colorsChannel());
     group.writeEntry("Histogram Rendering", d->regionBG->checkedId());
     group.writeEntry("ICC Level", d->iccProfileWidget->getMode());
     group.writeEntry("Current ICC Item", d->iccProfileWidget->getCurrentItemKey());
@@ -657,7 +657,7 @@
     int channel = d->histogramBox->channel();
 
     if ( channel == HistogramWidget::ColorChannelsHistogram )
-        channel = d->histogramBox->colors()+1;
+        channel = d->histogramBox->colorsChannel()+1;
 
     double mean = d->histogramBox->histogram()->m_imageHistogram->getMean(channel, min, max);
     d->labelMeanValue->setText(value.setNum(mean, 'f', 1));
--- trunk/extragear/graphics/digikam/libs/widgets/common/histogrambox.cpp #866453:866454
@@ -343,12 +343,12 @@
     d->colorsCB->setEnabled(enabled);
 }
 
-int HistogramBox::colors() const
+int HistogramBox::colorsChannel() const
 {
     return d->colorsCB->currentIndex();
 }
 
-void HistogramBox::setColors(int color)
+void HistogramBox::setColorsChannel(int color)
 {
     d->colorsCB->setCurrentIndex(color);
     slotColorsChanged();
@@ -424,7 +424,7 @@
 
 void HistogramBox::slotColorsChanged()
 {
-    switch (colors())
+    switch (colorsChannel())
     {
         case HistogramWidget::GreenColor:
             d->histogramWidget->m_colorType = HistogramWidget::GreenColor;
--- trunk/extragear/graphics/digikam/libs/widgets/common/histogrambox.h #866453:866454
@@ -83,8 +83,8 @@
     void setChannel(int channel);
     void setChannelEnabled(bool enabled);
 
-    int  colors() const;
-    void setColors(int color);
+    int  colorsChannel() const;
+    void setColorsChannel(int color);
     void setColorsEnabled(bool enabled);
 
     int  scale() const;