sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix SIP build error and a warning

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11878 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-11-01 16:32:39 +00:00
parent 5dca02a50e
commit f9ffdc1c4c
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
python/core/qgslabel.sip
View File

@ -17,29 +17,29 @@ public:
/* Fields */ /* Fields */
enum LabelField { enum LabelField {
Text = 0, Text = 0,
Family, Family,
Size, Size,
Bold, Bold,
Italic, Italic,
Underline, Underline,
Color, Color,
XCoordinate, XCoordinate,
YCoordinate, YCoordinate,
XOffset, XOffset,
YOffset, YOffset,
Angle, Angle,
Alignment, Alignment,
BufferEnabled, BufferEnabled,
BufferSize, BufferSize,
BufferColor, BufferColor,
BufferBrush, BufferBrush,
BorderWidth, BorderWidth,
BorderColor, BorderColor,
BorderStyle, BorderStyle,
MultilineEnabled, MultilineEnabled,
LabelFieldCount LabelFieldCount
}; };
struct labelpoint { struct labelpoint {
QgsPoint p; QgsPoint p;
@ -85,13 +85,13 @@ public:
* @note this will be deprecated in version 2 as it is * @note this will be deprecated in version 2 as it is
* badly named. Rather use attributes. * badly named. Rather use attributes.
* @see labelAttributes method rather */ * @see labelAttributes method rather */
QgsLabelAttributes *layerAttributes( void ); QgsLabelAttributes *layerAttributes( );
/** Pointer to default attributes. /** Pointer to default attributes.
* @note this replaces the to-be-deprecated layerAttributes method. * @note this replaces the to-be-deprecated layerAttributes method.
* @note introduced in QGIS 1.4 * @note introduced in QGIS 1.4
*/ */
QgsLabelAttributes *labelAttributes( void ); QgsLabelAttributes *labelAttributes( );
//! Set label field //! Set label field
void setLabelField ( int attr, int fieldId ); void setLabelField ( int attr, int fieldId );

2
src/app/qgisapp.cpp
View File

@ -4243,6 +4243,8 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
composer->showMinimized(); composer->showMinimized();
composer->zoomFull(); composer->zoomFull();
} }
return true;
} }
void QgisApp::deletePrintComposers() void QgisApp::deletePrintComposers()