Skip to content

Commit 6cc7905

Browse files
author
jef
committed
add CORE_EXPORT to composer
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9127 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d0ff2d0 commit 6cc7905

16 files changed

+17
-16
lines changed

src/app/composer/qgscomposeritemwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ QgsComposerItemWidget::QgsComposerItemWidget(): QWidget(0), mItem(0)
3030

3131
}
3232

33-
QgsComposerItemWidget::QgsComposerItemWidget::~QgsComposerItemWidget()
33+
QgsComposerItemWidget::~QgsComposerItemWidget()
3434
{
3535

3636
}

src/app/qgsmaptooladdfeature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent(QMouseEvent * e)
104104
try
105105
{
106106
savePoint = toLayerCoords(vlayer, idPoint);
107-
QgsDebugMsg("savePoint = " + savePoint.stringRep());
107+
QgsDebugMsg("savePoint = " + savePoint.toString());
108108
}
109109
catch(QgsCsException &cse)
110110
{

src/core/composer/qgscomposeritem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QqsComposition;
2929
/** \ingroup MapComposer
3030
* A item that forms part of a map composition.
3131
*/
32-
class QgsComposerItem: public QGraphicsRectItem
32+
class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
3333
{
3434

3535
public:

src/core/composer/qgscomposeritemgroup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/** \ingroup MapComposer
2323
* A container for grouping several QgsComposerItems
2424
*/
25-
class QgsComposerItemGroup: public QObject, public QgsComposerItem
25+
class CORE_EXPORT QgsComposerItemGroup: public QObject, public QgsComposerItem
2626
{
2727
Q_OBJECT
2828
public:

src/core/composer/qgscomposerlabel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/** \ingroup MapComposer
2323
* A label that can be placed onto a map composition.
2424
*/
25-
class QgsComposerLabel: public QgsComposerItem
25+
class CORE_EXPORT QgsComposerLabel: public QgsComposerItem
2626
{
2727
public:
2828
QgsComposerLabel( QgsComposition *composition);

src/core/composer/qgscomposerlegend.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
#include <QObject>
2424

2525
class QgsSymbol;
26+
2627
/** \ingroup MapComposer
2728
* A legend that can be placed onto a map composition
2829
*/
29-
class QgsComposerLegend: public QObject, public QgsComposerItem
30+
class CORE_EXPORT QgsComposerLegend: public QObject, public QgsComposerItem
3031
{
3132
Q_OBJECT
3233

src/core/composer/qgscomposermap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QPainter;
3636
* \brief Object representing map window.
3737
*/
3838
// NOTE: QgsComposerMapBase must be first, otherwise does not compile
39-
class QgsComposerMap : /*public QWidget , private Ui::QgsComposerMapBase,*/ public QObject, public QgsComposerItem
39+
class CORE_EXPORT QgsComposerMap : /*public QWidget , private Ui::QgsComposerMapBase,*/ public QObject, public QgsComposerItem
4040
{
4141
Q_OBJECT
4242

src/core/composer/qgscomposerpicture.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/** \ingroup MapComposer
2626
* A composer class that displays svg files or raster format (jpg, png, ...)
2727
* */
28-
class QgsComposerPicture: public QObject, public QgsComposerItem
28+
class CORE_EXPORT QgsComposerPicture: public QObject, public QgsComposerItem
2929
{
3030
Q_OBJECT
3131
public:

src/core/composer/qgscomposerscalebar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QgsScaleBarStyle;
2626
* A scale bar item that can be added to a map composition.
2727
*/
2828

29-
class QgsComposerScaleBar: public QObject, public QgsComposerItem
29+
class CORE_EXPORT QgsComposerScaleBar: public QObject, public QgsComposerItem
3030
{
3131

3232
Q_OBJECT

src/core/composer/qgscomposition.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QDomElement;
3030
* Graphics scene for map printing. It manages the paper item which always
3131
* is the item in the back (z-value 0).
3232
* */
33-
class QgsComposition: public QGraphicsScene
33+
class CORE_EXPORT QgsComposition: public QGraphicsScene
3434
{
3535
public:
3636

src/core/composer/qgsdoubleboxscalebarstyle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/** \ingroup MapComposer
2323
* Double box with alternating colors
2424
*/
25-
class QgsDoubleBoxScaleBarStyle: public QgsScaleBarStyle
25+
class CORE_EXPORT QgsDoubleBoxScaleBarStyle: public QgsScaleBarStyle
2626
{
2727
public:
2828
QgsDoubleBoxScaleBarStyle(const QgsComposerScaleBar* bar);

src/core/composer/qgslegendmodel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsSymbol;
3131
* A model that provides layers as root items. The classification items are
3232
* children of the layer items.
3333
*/
34-
class QgsLegendModel: public QStandardItemModel
34+
class CORE_EXPORT QgsLegendModel: public QStandardItemModel
3535
{
3636
Q_OBJECT
3737

src/core/composer/qgsnumericscalebarstyle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/** \ingroup MapComposer
2323
* A scale bar style that draws text in the form of '1:XXXXX'
2424
*/
25-
class QgsNumericScaleBarStyle: public QgsScaleBarStyle
25+
class CORE_EXPORT QgsNumericScaleBarStyle: public QgsScaleBarStyle
2626
{
2727
public:
2828
QgsNumericScaleBarStyle(QgsComposerScaleBar* bar);

src/core/composer/qgsscalebarstyle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QPainter;
2727
* Abstraction of composer scale bar style. Subclasses draw themselves, have the
2828
possibility to implement custom labeling and calculate corresponding box size.
2929
*/
30-
class QgsScaleBarStyle
30+
class CORE_EXPORT QgsScaleBarStyle
3131
{
3232
public:
3333
QgsScaleBarStyle(const QgsComposerScaleBar* bar);

src/core/composer/qgssingleboxscalebarstyle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Scalebar style that draws a single box with alternating
2424
* color for the segments.
2525
*/
26-
class QgsSingleBoxScaleBarStyle: public QgsScaleBarStyle
26+
class CORE_EXPORT QgsSingleBoxScaleBarStyle: public QgsScaleBarStyle
2727
{
2828
public:
2929
QgsSingleBoxScaleBarStyle(const QgsComposerScaleBar* bar);

src/core/composer/qgsticksscalebarstyle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/** \ingroup MapComposer
2323
* A scale bar that draws segments using short ticks.
2424
*/
25-
class QgsTicksScaleBarStyle: public QgsScaleBarStyle
25+
class CORE_EXPORT QgsTicksScaleBarStyle: public QgsScaleBarStyle
2626
{
2727
public:
2828
enum TickPosition

0 commit comments

Comments
 (0)