Revert "Merge pull request #245 from Oslandia/atlas_integration"

This reverts commit fe8385e, reversing changes made to 23352ce.
qgis · Oct 1, 2012 · 8a1953b · 8a1953b
1 parent a654e27
commit 8a1953b
Show file tree

Hide file tree

Showing 36 changed files with 200 additions and 2,045 deletions.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -43,13 +43,6 @@ class QgsExpression
     //! Return the number used for $rownum special column
     int currentRowNumber();
 
-    //! Assign a special column
-    static void setSpecialColumn( const QString& name, QVariant value );
-    //! Unset a special column
-    static void unsetSpecialColumn( const QString& name );
-    //! Return the value of the given special column or a null QVariant if undefined
-    static QVariant specialColumn( const QString& name );
-
     void setScale( double scale );
 
     int scale();
@@ -71,6 +64,7 @@ class QgsExpression
     static QString replaceExpressionText( QString action, QgsFeature &feat,
                                           QgsVectorLayer* layer,
                                           const QMap<QString, QVariant> *substitutionMap = 0 );
+
     //
 
     enum UnaryOperator
@@ -147,11 +141,6 @@ class QgsExpression
       */
     static int functionCount();
 
-    /**
-     * Returns a list of special Column definitions
-     */
-    static QList<QgsExpression::FunctionDef> specialColumns();
-
     //! return quoted column reference (in double quotes)
     static QString quotedColumnRef( QString name );
     //! return quoted string (in single quotes)