add CORE_EXPORT to composer

git-svn-id: http://svn.osgeo.org/qgis/trunk@9127 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 23, 2008 · b2c7c2a · b2c7c2a
1 parent ebc672a
commit b2c7c2a
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 16 deletions.
diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp
@@ -30,7 +30,7 @@ QgsComposerItemWidget::QgsComposerItemWidget(): QWidget(0), mItem(0)
 
 }
 
-QgsComposerItemWidget::QgsComposerItemWidget::~QgsComposerItemWidget()
+QgsComposerItemWidget::~QgsComposerItemWidget()
 {
 
 }

diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -104,7 +104,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent(QMouseEvent * e)
       try
       {
         savePoint = toLayerCoords(vlayer, idPoint);
-        QgsDebugMsg("savePoint = " + savePoint.stringRep());
+        QgsDebugMsg("savePoint = " + savePoint.toString());
       }
       catch(QgsCsException &cse)
       {

diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
@@ -29,7 +29,7 @@ class QqsComposition;
 /** \ingroup MapComposer
  * A item that forms part of a map composition.
  */
-class QgsComposerItem: public QGraphicsRectItem
+class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
 {
 
 public:

diff --git a/src/core/composer/qgscomposeritemgroup.h b/src/core/composer/qgscomposeritemgroup.h
@@ -22,7 +22,7 @@
 /** \ingroup MapComposer
  * A container for grouping several QgsComposerItems
  */
-class QgsComposerItemGroup: public QObject, public QgsComposerItem
+class CORE_EXPORT QgsComposerItemGroup: public QObject, public QgsComposerItem
 {
   Q_OBJECT
  public:

diff --git a/src/core/composer/qgscomposerlabel.h b/src/core/composer/qgscomposerlabel.h
@@ -22,7 +22,7 @@
 /** \ingroup MapComposer
  * A label that can be placed onto a map composition.
  */
-class QgsComposerLabel: public QgsComposerItem
+class CORE_EXPORT QgsComposerLabel: public QgsComposerItem
 {
  public:
   QgsComposerLabel( QgsComposition *composition);

diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -23,10 +23,11 @@
 #include <QObject>
 
 class QgsSymbol;
+
 /** \ingroup MapComposer
  * A legend that can be placed onto a map composition
  */
-class QgsComposerLegend: public QObject, public QgsComposerItem
+class CORE_EXPORT QgsComposerLegend: public QObject, public QgsComposerItem
 {
   Q_OBJECT
 

diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
@@ -36,7 +36,7 @@ class QPainter;
  *  \brief Object representing map window. 
  */
 // NOTE: QgsComposerMapBase must be first, otherwise does not compile
-class QgsComposerMap : /*public QWidget , private Ui::QgsComposerMapBase,*/ public QObject, public QgsComposerItem
+class CORE_EXPORT QgsComposerMap : /*public QWidget , private Ui::QgsComposerMapBase,*/ public QObject, public QgsComposerItem
 {
   Q_OBJECT
 

diff --git a/src/core/composer/qgscomposerpicture.h b/src/core/composer/qgscomposerpicture.h
@@ -25,7 +25,7 @@
 /** \ingroup MapComposer
  * A composer class that displays svg files or raster format (jpg, png, ...)
  * */
-class QgsComposerPicture: public QObject, public QgsComposerItem
+class CORE_EXPORT QgsComposerPicture: public QObject, public QgsComposerItem
 {
   Q_OBJECT
  public:

diff --git a/src/core/composer/qgscomposerscalebar.h b/src/core/composer/qgscomposerscalebar.h
@@ -26,7 +26,7 @@ class QgsScaleBarStyle;
  * A scale bar item that can be added to a map composition.
  */
 
-class QgsComposerScaleBar: public QObject, public QgsComposerItem
+class CORE_EXPORT QgsComposerScaleBar: public QObject, public QgsComposerItem
 {
 
  Q_OBJECT

diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -30,7 +30,7 @@ class QDomElement;
  * Graphics scene for map printing. It manages the paper item which always 
  * is the item in the back (z-value 0).
  * */
-class QgsComposition: public QGraphicsScene
+class CORE_EXPORT QgsComposition: public QGraphicsScene
 {
  public:
 

diff --git a/src/core/composer/qgsdoubleboxscalebarstyle.h b/src/core/composer/qgsdoubleboxscalebarstyle.h
@@ -22,7 +22,7 @@
 /** \ingroup MapComposer
   * Double box with alternating colors
   */
-class QgsDoubleBoxScaleBarStyle: public QgsScaleBarStyle
+class CORE_EXPORT QgsDoubleBoxScaleBarStyle: public QgsScaleBarStyle
 {
  public:
   QgsDoubleBoxScaleBarStyle(const QgsComposerScaleBar* bar);

diff --git a/src/core/composer/qgslegendmodel.h b/src/core/composer/qgslegendmodel.h
@@ -31,7 +31,7 @@ class QgsSymbol;
  * A model that provides layers as root items. The classification items are 
  * children of the layer items.
  */
-class QgsLegendModel: public QStandardItemModel
+class CORE_EXPORT QgsLegendModel: public QStandardItemModel
 {
   Q_OBJECT
 

diff --git a/src/core/composer/qgsnumericscalebarstyle.h b/src/core/composer/qgsnumericscalebarstyle.h
@@ -22,7 +22,7 @@
 /** \ingroup MapComposer
  * A scale bar style that draws text in the form of '1:XXXXX'
  */
-class QgsNumericScaleBarStyle: public QgsScaleBarStyle
+class CORE_EXPORT QgsNumericScaleBarStyle: public QgsScaleBarStyle
 {
  public:
   QgsNumericScaleBarStyle(QgsComposerScaleBar* bar);

diff --git a/src/core/composer/qgsscalebarstyle.h b/src/core/composer/qgsscalebarstyle.h
@@ -27,7 +27,7 @@ class QPainter;
  * Abstraction of composer scale bar style. Subclasses draw themselves, have the 
 possibility to implement custom labeling and calculate corresponding box size.
 */
-class QgsScaleBarStyle
+class CORE_EXPORT QgsScaleBarStyle
 {
  public:
   QgsScaleBarStyle(const QgsComposerScaleBar* bar);

diff --git a/src/core/composer/qgssingleboxscalebarstyle.h b/src/core/composer/qgssingleboxscalebarstyle.h
@@ -23,7 +23,7 @@
  * Scalebar style that draws a single box with alternating
  * color for the segments.
  */
-class QgsSingleBoxScaleBarStyle: public QgsScaleBarStyle
+class CORE_EXPORT QgsSingleBoxScaleBarStyle: public QgsScaleBarStyle
 {
  public:
   QgsSingleBoxScaleBarStyle(const QgsComposerScaleBar* bar);

diff --git a/src/core/composer/qgsticksscalebarstyle.h b/src/core/composer/qgsticksscalebarstyle.h
@@ -22,7 +22,7 @@
 /** \ingroup MapComposer
  * A scale bar that draws segments using short ticks.
  */
-class QgsTicksScaleBarStyle: public QgsScaleBarStyle
+class CORE_EXPORT QgsTicksScaleBarStyle: public QgsScaleBarStyle
 {
   public:
   enum TickPosition