Use labelAttributes rather than layerAttributes where appropriate

timlinux · timlinux · commit ed8b48700c2b · 2009-11-01T21:24:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11879 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.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;
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
@@ -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(

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ void QgsQuickPrint::scaleTextLabels( int theScaleFactor, SymbolScalingType theDi`
`688`	`688`	`if ( mypVectorLayer )`
`689`	`689`	`{`
`690`	`690`	`QgsLabel * mypLabel = mypVectorLayer->label();`
`691`		`- QgsLabelAttributes * mypLabelAttributes = mypLabel->layerAttributes();`
	`691`	`+ QgsLabelAttributes * mypLabelAttributes = mypLabel->labelAttributes();`
`692`	`692`	`if ( theDirection == ScaleUp )`
`693`	`693`	`{`
`694`	`694`	`mypLabelAttributes->setSize(`