[QGIS Commit] r9127 - in trunk/qgis/src: app app/composer
core/composer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Aug 23 06:57:38 EDT 2008
Author: jef
Date: 2008-08-23 06:57:38 -0400 (Sat, 23 Aug 2008)
New Revision: 9127
Modified:
trunk/qgis/src/app/composer/qgscomposeritemwidget.cpp
trunk/qgis/src/app/qgsmaptooladdfeature.cpp
trunk/qgis/src/core/composer/qgscomposeritem.h
trunk/qgis/src/core/composer/qgscomposeritemgroup.h
trunk/qgis/src/core/composer/qgscomposerlabel.h
trunk/qgis/src/core/composer/qgscomposerlegend.h
trunk/qgis/src/core/composer/qgscomposermap.h
trunk/qgis/src/core/composer/qgscomposerpicture.h
trunk/qgis/src/core/composer/qgscomposerscalebar.h
trunk/qgis/src/core/composer/qgscomposition.h
trunk/qgis/src/core/composer/qgsdoubleboxscalebarstyle.h
trunk/qgis/src/core/composer/qgslegendmodel.h
trunk/qgis/src/core/composer/qgsnumericscalebarstyle.h
trunk/qgis/src/core/composer/qgsscalebarstyle.h
trunk/qgis/src/core/composer/qgssingleboxscalebarstyle.h
trunk/qgis/src/core/composer/qgsticksscalebarstyle.h
Log:
add CORE_EXPORT to composer
Modified: trunk/qgis/src/app/composer/qgscomposeritemwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposeritemwidget.cpp 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/app/composer/qgscomposeritemwidget.cpp 2008-08-23 10:57:38 UTC (rev 9127)
@@ -30,7 +30,7 @@
}
-QgsComposerItemWidget::QgsComposerItemWidget::~QgsComposerItemWidget()
+QgsComposerItemWidget::~QgsComposerItemWidget()
{
}
Modified: trunk/qgis/src/app/qgsmaptooladdfeature.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/app/qgsmaptooladdfeature.cpp 2008-08-23 10:57:38 UTC (rev 9127)
@@ -104,7 +104,7 @@
try
{
savePoint = toLayerCoords(vlayer, idPoint);
- QgsDebugMsg("savePoint = " + savePoint.stringRep());
+ QgsDebugMsg("savePoint = " + savePoint.toString());
}
catch(QgsCsException &cse)
{
Modified: trunk/qgis/src/core/composer/qgscomposeritem.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposeritem.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -29,7 +29,7 @@
/** \ingroup MapComposer
* A item that forms part of a map composition.
*/
-class QgsComposerItem: public QGraphicsRectItem
+class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
{
public:
Modified: trunk/qgis/src/core/composer/qgscomposeritemgroup.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritemgroup.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposeritemgroup.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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:
Modified: trunk/qgis/src/core/composer/qgscomposerlabel.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlabel.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposerlabel.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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);
Modified: trunk/qgis/src/core/composer/qgscomposerlegend.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlegend.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposerlegend.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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
Modified: trunk/qgis/src/core/composer/qgscomposermap.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposermap.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -36,7 +36,7 @@
* \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
Modified: trunk/qgis/src/core/composer/qgscomposerpicture.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerpicture.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposerpicture.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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:
Modified: trunk/qgis/src/core/composer/qgscomposerscalebar.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerscalebar.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposerscalebar.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -26,7 +26,7 @@
* 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
Modified: trunk/qgis/src/core/composer/qgscomposition.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposition.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgscomposition.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -30,7 +30,7 @@
* 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:
Modified: trunk/qgis/src/core/composer/qgsdoubleboxscalebarstyle.h
===================================================================
--- trunk/qgis/src/core/composer/qgsdoubleboxscalebarstyle.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgsdoubleboxscalebarstyle.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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);
Modified: trunk/qgis/src/core/composer/qgslegendmodel.h
===================================================================
--- trunk/qgis/src/core/composer/qgslegendmodel.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgslegendmodel.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -31,7 +31,7 @@
* 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
Modified: trunk/qgis/src/core/composer/qgsnumericscalebarstyle.h
===================================================================
--- trunk/qgis/src/core/composer/qgsnumericscalebarstyle.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgsnumericscalebarstyle.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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);
Modified: trunk/qgis/src/core/composer/qgsscalebarstyle.h
===================================================================
--- trunk/qgis/src/core/composer/qgsscalebarstyle.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgsscalebarstyle.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -27,7 +27,7 @@
* 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);
Modified: trunk/qgis/src/core/composer/qgssingleboxscalebarstyle.h
===================================================================
--- trunk/qgis/src/core/composer/qgssingleboxscalebarstyle.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgssingleboxscalebarstyle.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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);
Modified: trunk/qgis/src/core/composer/qgsticksscalebarstyle.h
===================================================================
--- trunk/qgis/src/core/composer/qgsticksscalebarstyle.h 2008-08-23 10:22:31 UTC (rev 9126)
+++ trunk/qgis/src/core/composer/qgsticksscalebarstyle.h 2008-08-23 10:57:38 UTC (rev 9127)
@@ -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
More information about the QGIS-commit
mailing list