Follow up 2041fc2

qgis · Jul 14, 2014 · 6f3cea1 · 6f3cea1
1 parent 2041fc2
commit 6f3cea1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 334 deletions.
diff --git a/python/core/composer/qgscomposermap.sip b/python/core/composer/qgscomposermap.sip
@@ -348,7 +348,7 @@ class QgsComposerMap : QgsComposerItem
      * or the current evaluated rotation (which may be affected by data driven rotation
      * settings).
     */
-   // double mapRotation( QgsComposerBaseItem::PropertyValueType valueType = QgsComposerBaseItem::EvaluatedValue ) const;
+    double mapRotation( QgsComposerObject::PropertyValueType valueType = QgsComposerObject::EvaluatedValue ) const;
 
     void updateItem();
 

diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
@@ -28,7 +28,7 @@
 
 //QgsComposerItemBaseWidget
 
-QgsComposerItemBaseWidget::QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject *baseItem ): QWidget( parent ), mBaseItem( baseItem )
+QgsComposerItemBaseWidget::QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject *composerObject ): QWidget( parent ), mComposerObject( composerObject )
 {
 
 }
@@ -54,18 +54,18 @@ void QgsComposerItemBaseWidget::updateDataDefinedProperty()
 
   //set the data defined property and refresh the item
   setDataDefinedProperty( ddButton, property );
-  mBaseItem->refreshDataDefinedProperty( property );
+  mComposerObject->refreshDataDefinedProperty( property );
 }
 
 void QgsComposerItemBaseWidget::setDataDefinedProperty( const QgsDataDefinedButton *ddBtn, QgsComposerObject::DataDefinedProperty p )
 {
-  if ( !mBaseItem )
+  if ( !mComposerObject )
   {
     return;
   }
 
   const QMap< QString, QString >& map = ddBtn->definedProperty();
-  mBaseItem->setDataDefinedProperty( p, map.value( "active" ).toInt(), map.value( "useexpr" ).toInt(), map.value( "expression" ), map.value( "field" ) );
+  mComposerObject->setDataDefinedProperty( p, map.value( "active" ).toInt(), map.value( "useexpr" ).toInt(), map.value( "expression" ), map.value( "field" ) );
 }
 
 QgsComposerObject::DataDefinedProperty QgsComposerItemBaseWidget::ddPropertyForWidget( QgsDataDefinedButton *widget )
@@ -78,12 +78,12 @@ QgsComposerObject::DataDefinedProperty QgsComposerItemBaseWidget::ddPropertyForW
 
 QgsAtlasComposition* QgsComposerItemBaseWidget::atlasComposition() const
 {
-  if ( !mBaseItem )
+  if ( !mComposerObject )
   {
     return 0;
   }
 
-  QgsComposition* composition = mBaseItem->composition();
+  QgsComposition* composition = mComposerObject->composition();
 
   if ( !composition )
   {

diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h
@@ -32,7 +32,7 @@ class QgsComposerItemBaseWidget: public QWidget
 {
     Q_OBJECT
   public:
-    QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject* baseItem );
+    QgsComposerItemBaseWidget( QWidget* parent, QgsComposerObject* composerObject );
     ~QgsComposerItemBaseWidget();
 
   protected slots:
@@ -52,7 +52,7 @@ class QgsComposerItemBaseWidget: public QWidget
     /**Returns the atlas for the composition*/
     QgsAtlasComposition *atlasComposition() const;
 
-    QgsComposerObject* mBaseItem;
+    QgsComposerObject* mComposerObject;
 };
 
 /**A class to enter generic properties for composer items (e.g. background, outline, frame).

diff --git a/src/core/composer/qgscomposerobject.cpp b/src/core/composer/qgscomposerobject.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                         qgscomposerbaseitem.h
+                            qgscomposerobject.cpp
                              -------------------
     begin                : July 2014
     copyright            : (C) 2014 by Nyall Dawson,Radim Blazek