Skip to content

Commit 0a1d44f

Browse files
jef-njef-n
committedSep 6, 2013
make qgis_app a shared library and fix some more stl warnings with msvc
1 parent 1632730 commit 0a1d44f

File tree

128 files changed

+248
-237
lines changed

Some content is hidden

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

128 files changed

+248
-237
lines changed
 

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
494494
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
495495
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
496496
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
497+
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
497498

498499
#############################################################
499500
# user-changeable settings which can be used to customize

‎python/core/composer/qgsatlascomposition.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ public:
5050
QString featureFilter() const;
5151
void setFeatureFilter( const QString& expression );
5252

53-
size_t sortKeyAttributeIndex() const;
54-
void setSortKeyAttributeIndex( size_t idx );
53+
int sortKeyAttributeIndex() const;
54+
void setSortKeyAttributeIndex( int idx );
5555

5656
/** Begins the rendering. */
5757
void beginRender();
5858
/** Ends the rendering. Restores original extent */
5959
void endRender();
6060

6161
/** Returns the number of features in the coverage layer */
62-
size_t numFeatures() const;
62+
int numFeatures() const;
6363

6464
/** Prepare the atlas map for the given feature. Sets the extent and context variables */
65-
void prepareForFeature( size_t i );
65+
void prepareForFeature( int i );
6666

6767
/** Returns the current filename. Must be called after prepareForFeature( i ) */
6868
const QString& currentFilename() const;

0 commit comments

Comments
 (0)
Please sign in to comment.