Skip to content

Commit

Permalink
Use labelAttributes rather than layerAttributes where appropriate
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11879 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 1, 2009
1 parent c209c92 commit 237db62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/app/qgslabeldialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsquickprint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 237db62

Please sign in to comment.