remove QgsColorButton in favor of V2

qgis · Aug 4, 2016 · 3e197ae · 3e197ae
1 parent 138e113
commit 3e197ae
Show file tree

Hide file tree

Showing 65 changed files with 1,168 additions and 2,278 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -21,12 +21,13 @@ This page tries to maintain a list with incompatible changes that happened in pr
 \subsection qgis_api_break_3_0_removed_classes Removed Classes
 
 <ul>
-<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
-<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
-<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
+<li>QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.
 <li>QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
 so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
 should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
+<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
+<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
+<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
 <li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>
 </ul>
 

diff --git a/python/core/qgscolorscheme.sip b/python/core/qgscolorscheme.sip
@@ -5,7 +5,7 @@ typedef QList< QPair< QColor, QString > > QgsNamedColorList;
  * \class QgsColorScheme
  * \brief Abstract base class for color schemes
  *
- * A color scheme for display in QgsColorButtonV2. Color schemes return lists
+ * A color scheme for display in QgsColorButton. Color schemes return lists
  * of colors with an optional associated color name. The colors returned
  * can be generated using an optional base color.
  * \note Added in version 2.5

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -46,7 +46,7 @@
 %End
 %Include qgscharacterselectdialog.sip
 %Include qgscolorbutton.sip
-%Include qgscolorbuttonv2.sip
+%Include qgscolorbutton.sip
 %Include qgscolordialog.sip
 %Include qgscolorschemelist.sip
 %Include qgscolorswatchgrid.sip