sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04: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

6
python/core/qgslabel.sip
View File

@ -39,7 +39,7 @@ public:
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 );

2
src/app/qgisapp.cpp
View File

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