adjust .sip file after rebase

Author: etiennesky

python/core/symbology-ng/qgsvectorcolorrampv2.sip

@@ -156,29 +156,15 @@ class QgsCptCityColorRampV2
     QgsCptCityColorRampV2( QString schemeName, QStringList variantList,
                            QString variantName = QString(), bool doLoadFile = true );
 
-
-    enum GradientType
-    {
-      Discrete, //discrete stops, e.g. Color Brewer
-      Continuous, //continuous, e.g. QgsVectorColorRampV2
-      ContinuousMulti //continuous with 2 values in intermediate stops
-    };
-    typedef QList< QPair < double, QColor > > GradientList;
-
-
     static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
 
-    virtual QColor color( double value ) const;
-
     virtual QString type() const;
 
     virtual QgsVectorColorRampV2* clone() const /Factory/;
     void copy( const QgsCptCityColorRampV2* other );
 
     virtual QgsStringMap properties() const;
 
-    int count() const;
-
     QString schemeName() const;
     QString variantName() const;
     QStringList variantList() const;
@@ -190,7 +176,8 @@ class QgsCptCityColorRampV2
     void setName( QString schemeName, QString variantName = "", QStringList variantList = QStringList() );
 
     void loadPalette();
-    GradientType gradientType() const;
+    bool hasMultiStops() const;
+    int count() const;
 
     QString fileName() const;
     bool loadFile();