sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Flag old composer table classes as deprecated

Browse Source
This commit is contained in:
Nyall Dawson 2016-05-23 13:30:01 +10:00
parent eb3a34cc92
commit 726a013222
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/composer/qgscomposerattributetable.sip
View File

@ -24,7 +24,9 @@ class QgsComposerAttributeTableCompare
void setAscending( bool asc );
};
/** A table class that displays a vector attribute table*/
/** A table class that displays a vector attribute table
* @deprecated use QgsComposerAttributeTableV2 instead
*/
class QgsComposerAttributeTable : QgsComposerTable
{
%TypeHeaderCode
@ -32,7 +34,7 @@ class QgsComposerAttributeTable : QgsComposerTable
%End
public:
QgsComposerAttributeTable( QgsComposition* composition /TransferThis/ );
QgsComposerAttributeTable( QgsComposition* composition /TransferThis/ ) /Deprecated/;
~QgsComposerAttributeTable();
/** Return correct graphics item type. */

6
python/core/composer/qgscomposertable.sip
View File

@ -1,4 +1,6 @@
/** A class to display feature attributes in the print composer*/
/** A class to display feature attributes in the print composer
* @deprecated use QgsComposerTableV2 instead
*/
class QgsComposerTable: QgsComposerItem
{
%TypeHeaderCode
@ -17,7 +19,7 @@ class QgsComposerTable: QgsComposerItem
HeaderRight /*!< align headers right */
};
QgsComposerTable( QgsComposition* composition /TransferThis/ );
QgsComposerTable( QgsComposition* composition /TransferThis/ ) /Deprecated/;
virtual ~QgsComposerTable();
/** Return correct graphics item type. */

7
python/core/composer/qgscomposertexttable.sip
View File

@ -1,11 +1,14 @@
/** A text table item that reads text from string lists*/
/** A text table item that reads text from string lists
* @deprecated use QgsComposerTextTableV2 instead
*/
class QgsComposerTextTable: QgsComposerTable
{
%TypeHeaderCode
#include <qgscomposertexttable.h>
%End
public:
QgsComposerTextTable( QgsComposition* c /TransferThis/ );
QgsComposerTextTable( QgsComposition* c /TransferThis/ ) /Deprecated/;
~QgsComposerTextTable();
/** Return correct graphics item type. */

5
src/core/composer/qgscomposerattributetable.h
View File

@ -45,7 +45,10 @@ class CORE_EXPORT QgsComposerAttributeTableCompare
bool mAscending;
};
/** A table class that displays a vector attribute table*/
/** A table class that displays a vector attribute table
* @deprecated use QgsComposerAttributeTableV2 instead
*/
// TODO QGIS 3.0 - remove
class CORE_EXPORT QgsComposerAttributeTable: public QgsComposerTable
{
Q_OBJECT

5
src/core/composer/qgscomposertable.h
View File

@ -26,7 +26,10 @@
class QgsComposerTableColumn;
/** A class to display feature attributes in the print composer*/
/** A class to display feature attributes in the print composer
* @deprecated use QgsComposerTableV2 instead
*/
//TODO QGIS 3.0 -remove
class CORE_EXPORT QgsComposerTable: public QgsComposerItem
{
Q_OBJECT

5
src/core/composer/qgscomposertexttable.h
View File

@ -21,7 +21,10 @@
#include "qgscomposertable.h"
#include "qgscomposertablev2.h"
/** A text table item that reads text from string lists*/
/** A text table item that reads text from string lists
* @deprecated use QgsComposerTextTableV2 intead
*/
//TODO QGIS 3.0 - remove
class CORE_EXPORT QgsComposerTextTable: public QgsComposerTable
{
Q_OBJECT