[composer] Fix display name for attribute table frames

nyalldawson · nyalldawson · commit 10d75c006678 · 2014-10-03T09:15:07.000+10:00
diff --git a/python/core/composer/qgscomposerattributetablev2.sip b/python/core/composer/qgscomposerattributetablev2.sip
@@ -44,6 +44,8 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
 
     QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
     ~QgsComposerAttributeTableV2();
+    
+    virtual QString displayName() const;
 
     /**Writes properties specific to attribute tables
      * @param elem an existing QDomElement in which to store the attribute table's properties.
diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -148,6 +148,11 @@ QgsComposerAttributeTableV2::~QgsComposerAttributeTableV2()
 {
 }
 
+QString QgsComposerAttributeTableV2::displayName() const
+{
+  return tr( "<attribute table>" );
+}
+
 void QgsComposerAttributeTableV2::setVectorLayer( QgsVectorLayer* layer )
 {
   if ( layer == mVectorLayer )
diff --git a/src/core/composer/qgscomposerattributetablev2.h b/src/core/composer/qgscomposerattributetablev2.h
@@ -66,6 +66,8 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
     QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
     ~QgsComposerAttributeTableV2();
 
+    virtual QString displayName() const;
+
     /**Writes properties specific to attribute tables
      * @param elem an existing QDomElement in which to store the attribute table's properties.
      * @param doc QDomDocument for the destination xml.

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,11 @@ QgsComposerAttributeTableV2::~QgsComposerAttributeTableV2()`
`148`	`148`	`{`
`149`	`149`	`}`
`150`	`150`
	`151`	`+QString QgsComposerAttributeTableV2::displayName() const`
	`152`	`+{`
	`153`	`+ return tr( "<attribute table>" );`
	`154`	`+}`
	`155`	`+`
`151`	`156`	`void QgsComposerAttributeTableV2::setVectorLayer( QgsVectorLayer* layer )`
`152`	`157`	`{`
`153`	`158`	`if ( layer == mVectorLayer )`