Skip to content

Commit 8a1953b

Browse files
committedOct 1, 2012
Revert "Merge pull request #245 from Oslandia/atlas_integration"
This reverts commit fe8385e, reversing changes made to 23352ce.
1 parent a654e27 commit 8a1953b

36 files changed

+200
-2045
lines changed
 

‎python/core/qgsexpression.sip

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ class QgsExpression
4343
//! Return the number used for $rownum special column
4444
int currentRowNumber();
4545

46-
//! Assign a special column
47-
static void setSpecialColumn( const QString& name, QVariant value );
48-
//! Unset a special column
49-
static void unsetSpecialColumn( const QString& name );
50-
//! Return the value of the given special column or a null QVariant if undefined
51-
static QVariant specialColumn( const QString& name );
52-
5346
void setScale( double scale );
5447

5548
int scale();
@@ -71,6 +64,7 @@ class QgsExpression
7164
static QString replaceExpressionText( QString action, QgsFeature &feat,
7265
QgsVectorLayer* layer,
7366
const QMap<QString, QVariant> *substitutionMap = 0 );
67+
7468
//
7569

7670
enum UnaryOperator
@@ -147,11 +141,6 @@ class QgsExpression
147141
*/
148142
static int functionCount();
149143

150-
/**
151-
* Returns a list of special Column definitions
152-
*/
153-
static QList<QgsExpression::FunctionDef> specialColumns();
154-
155144
//! return quoted column reference (in double quotes)
156145
static QString quotedColumnRef( QString name );
157146
//! return quoted string (in single quotes)

0 commit comments

Comments
 (0)
Please sign in to comment.