Skip to content
Permalink
Browse files

fix SIP build error and a warning

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11878 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Nov 1, 2009
1 parent 5ca66c8 commit c209c92e8e2b4b58b437b6150c09f3599a2c4714
Showing with 27 additions and 25 deletions.
  1. +25 −25 python/core/qgslabel.sip
  2. +2 −0 src/app/qgisapp.cpp
@@ -17,29 +17,29 @@ public:

/* Fields */
enum LabelField {
Text = 0,
Family,
Size,
Bold,
Italic,
Underline,
Color,
XCoordinate,
YCoordinate,
XOffset,
YOffset,
Angle,
Alignment,
BufferEnabled,
BufferSize,
BufferColor,
BufferBrush,
BorderWidth,
BorderColor,
BorderStyle,
MultilineEnabled,
LabelFieldCount
};
Text = 0,
Family,
Size,
Bold,
Italic,
Underline,
Color,
XCoordinate,
YCoordinate,
XOffset,
YOffset,
Angle,
Alignment,
BufferEnabled,
BufferSize,
BufferColor,
BufferBrush,
BorderWidth,
BorderColor,
BorderStyle,
MultilineEnabled,
LabelFieldCount
};

struct labelpoint {
QgsPoint p;
@@ -85,13 +85,13 @@ public:
* @note this will be deprecated in version 2 as it is
* badly named. Rather use attributes.
* @see labelAttributes method rather */
QgsLabelAttributes *layerAttributes( void );
QgsLabelAttributes *layerAttributes( );

/** Pointer to default attributes.
* @note this replaces the to-be-deprecated layerAttributes method.
* @note introduced in QGIS 1.4
*/
QgsLabelAttributes *labelAttributes( void );
QgsLabelAttributes *labelAttributes( );

//! Set label field
void setLabelField ( int attr, int fieldId );
@@ -4243,6 +4243,8 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
composer->showMinimized();
composer->zoomFull();
}

return true;
}

void QgisApp::deletePrintComposers()

0 comments on commit c209c92

Please sign in to comment.
You can’t perform that action at this time.