Skip to content

Commit

Permalink
update for sip 4.13
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n authored and alexbruy committed Dec 25, 2011
1 parent 2b39c0f commit a450aac
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake/SIPMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
ELSE(MSVC)
# disable all warnings
ADD_DEFINITIONS( -w )
ADD_DEFINITIONS( -w -fpermissive )
ENDIF(MSVC)
ENDIF(PEDANTIC)

Expand Down
1 change: 0 additions & 1 deletion python/analysis/analysis.sip
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

%Module qgis.analysis 0

%Import QtCore/QtCoremod.sip
Expand Down
1 change: 0 additions & 1 deletion python/core/core.sip
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

%Module qgis.core 0

%Import QtCore/QtCoremod.sip
Expand Down
4 changes: 3 additions & 1 deletion python/core/qgsvectordataprovider.sip
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ class QgsVectorDataProvider : QgsDataProvider
ChangeGeometries = 256,
SelectGeometryAtId = 512,
RandomSelectGeometryAtId = 1024,
SequentialSelectGeometryAtId = 2048
SequentialSelectGeometryAtId = 2048,
CreateAttributeIndex = 4096,
SetEncoding = 8192,
};

/** bitmask of all provider's editing capabilities */
Expand Down
4 changes: 2 additions & 2 deletions python/core/symbology-ng-core.sip
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,10 @@ class QgsSymbolV2RenderContext
void setAlpha( qreal alpha );

bool selected() const;
void setSelected( bool selected ) const;
void setSelected( bool selected );

//! @note added in 1.5
int renderHints() const;
int renderHints();
//! @note added in 1.5
void setRenderHints( int hints );

Expand Down

0 comments on commit a450aac

Please sign in to comment.