Skip to content

Commit fe2350c

Browse files
m-kuhnm-kuhn
authoredMay 19, 2017
Merge pull request #4557 from m-kuhn/expressionModulaizing
Modularizing the expression engine file structure and some cleanup
·
ltr-3_40final-3_0_0
2 parents d7b952b + 24b16c5 commit fe2350c

File tree

118 files changed

+11111
-10448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+11111
-10448
lines changed
 

‎doc/api_break.dox

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,8 @@ version instead.
10661066
- acceptVisitor() has been removed
10671067
- QgsExpression::referencedColumns() returns QSet<QString> instead of QStringList
10681068
- QgsExpression::Node::referencedColumns() returns QSet<QString> instead of QStringList
1069+
- `QgsExpression::Node` was renamed to `QgsExpressionNode`
1070+
- `QgsExpression::Function` was renamed to `QgsExpressionFunction`
10691071

10701072

10711073
QgsExpression::Function {#qgis_api_break_3_0_QgsExpression_Function}

‎python/CMakeLists.txt

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -93,38 +93,37 @@ INCLUDE_DIRECTORIES(SYSTEM
9393
${SQLITE3_INCLUDE_DIR}
9494
)
9595
INCLUDE_DIRECTORIES(
96-
../src/core
97-
../src/core/annotations
98-
../src/core/auth
99-
../src/core/pal
100-
../src/core/composer
101-
../src/core/diagram
102-
../src/core/effects
103-
../src/core/fieldformatter
104-
../src/core/dxf
105-
../src/core/geometry
106-
../src/core/gps
107-
../src/core/layertree
108-
../src/core/metadata
109-
../src/core/processing
110-
../src/core/providers
111-
../src/core/providers/memory
112-
../src/core/raster
113-
../src/core/scalebar
114-
../src/core/symbology-ng
115-
116-
../src/gui
117-
../src/gui/symbology-ng
118-
../src/gui/raster
119-
../src/gui/attributetable
120-
../src/gui/auth
121-
../src/gui/editorwidgets
122-
../src/gui/editorwidgets/core
123-
../src/gui/effects
124-
../src/gui/layertree
125-
../src/gui/locator
126-
127-
../src/plugins
96+
${CMAKE_SOURCE_DIR}/src/core
97+
${CMAKE_SOURCE_DIR}/src/core/annotations
98+
${CMAKE_SOURCE_DIR}/src/core/auth
99+
${CMAKE_SOURCE_DIR}/src/core/expression
100+
${CMAKE_SOURCE_DIR}/src/core/pal
101+
${CMAKE_SOURCE_DIR}/src/core/composer
102+
${CMAKE_SOURCE_DIR}/src/core/diagram
103+
${CMAKE_SOURCE_DIR}/src/core/effects
104+
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
105+
${CMAKE_SOURCE_DIR}/src/core/dxf
106+
${CMAKE_SOURCE_DIR}/src/core/geometry
107+
${CMAKE_SOURCE_DIR}/src/core/gps
108+
${CMAKE_SOURCE_DIR}/src/core/layertree
109+
${CMAKE_SOURCE_DIR}/src/core/metadata
110+
${CMAKE_SOURCE_DIR}/src/core/processing
111+
${CMAKE_SOURCE_DIR}/src/core/providers
112+
${CMAKE_SOURCE_DIR}/src/core/providers/memory
113+
${CMAKE_SOURCE_DIR}/src/core/raster
114+
${CMAKE_SOURCE_DIR}/src/core/scalebar
115+
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
116+
${CMAKE_SOURCE_DIR}/src/gui
117+
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
118+
${CMAKE_SOURCE_DIR}/src/gui/raster
119+
${CMAKE_SOURCE_DIR}/src/gui/attributetable
120+
${CMAKE_SOURCE_DIR}/src/gui/auth
121+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
122+
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
123+
${CMAKE_SOURCE_DIR}/src/gui/effects
124+
${CMAKE_SOURCE_DIR}/src/gui/layertree
125+
${CMAKE_SOURCE_DIR}/src/gui/locator
126+
${CMAKE_SOURCE_DIR}/src/plugins
128127

129128
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
130129
${CMAKE_BINARY_DIR}/src/core

0 commit comments

Comments
 (0)
Please sign in to comment.