Skip to content
Permalink
Browse files

Use labelAttributes rather than layerAttributes where appropriate

git-svn-id: http://svn.osgeo.org/qgis/trunk@11879 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Nov 1, 2009
1 parent f9ffdc1 commit ed8b48700c2baf848de58c35bf8de477b379dd8f
Showing with 4 additions and 4 deletions.
  1. +3 −3 src/app/qgslabeldialog.cpp
  2. +1 −1 src/gui/qgsquickprint.cpp
@@ -55,7 +55,7 @@ void QgsLabelDialog::init( )
{
QgsDebugMsg( "entering." );

QgsLabelAttributes * myLabelAttributes = mLabel->layerAttributes();
QgsLabelAttributes * myLabelAttributes = mLabel->labelAttributes();
//populate a string list with all the field names which will be used to set up the
//data bound combos
QgsFieldMap& myFieldsMap = mLabel->fields();
@@ -340,8 +340,8 @@ void QgsLabelDialog::apply()
QgsDebugMsg( "entering." );

//set the label props that are NOT bound to a field in the attributes tbl
//All of these are set in the layerAttributes member of the layer
QgsLabelAttributes * myLabelAttributes = mLabel->layerAttributes();
//All of these are set in the labelAttributes member of the layer
QgsLabelAttributes * myLabelAttributes = mLabel->labelAttributes();
myLabelAttributes->setText( leDefaultLabel->text() );
myLabelAttributes->setFamily( mFont.family() );
int myTypeInt = 0;
@@ -688,7 +688,7 @@ void QgsQuickPrint::scaleTextLabels( int theScaleFactor, SymbolScalingType theDi
if ( mypVectorLayer )
{
QgsLabel * mypLabel = mypVectorLayer->label();
QgsLabelAttributes * mypLabelAttributes = mypLabel->layerAttributes();
QgsLabelAttributes * mypLabelAttributes = mypLabel->labelAttributes();
if ( theDirection == ScaleUp )
{
mypLabelAttributes->setSize(

0 comments on commit ed8b487

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