Skip to content
Permalink
Browse files

Add qgis_app.h with APP_EXPORT macro

  • Loading branch information
m-kuhn committed Jan 4, 2017
1 parent d006784 commit 38a8ddacd9bdd4c04f5a80b171ca0c6c3db76f9c
Showing with 119 additions and 4 deletions.
  1. +0 −1 CMakeLists.txt
  2. +7 −3 src/app/CMakeLists.txt
  3. +1 −0 src/app/main.cpp
  4. +1 −0 src/app/ogr/qgsvectorlayersaveasdialog.h
  5. +1 −0 src/app/qgisapp.h
  6. +1 −0 src/app/qgisappinterface.h
  7. +1 −0 src/app/qgisappstylesheet.h
  8. +1 −0 src/app/qgsabout.h
  9. +1 −0 src/app/qgsaddattrdialog.h
  10. +1 −0 src/app/qgsaddtaborgroup.h
  11. +1 −0 src/app/qgsannotationwidget.h
  12. +1 −0 src/app/qgsattributeactiondialog.h
  13. +1 −0 src/app/qgsattributetabledialog.h
  14. +1 −0 src/app/qgsattributetypedialog.h
  15. +1 −0 src/app/qgsbookmarks.h
  16. +1 −0 src/app/qgsbrowserdockwidget.h
  17. +1 −0 src/app/qgsclipboard.h
  18. +1 −0 src/app/qgscustomization.h
  19. +1 −0 src/app/qgscustomprojectiondialog.h
  20. +1 −0 src/app/qgsdecorationcopyright.h
  21. +1 −0 src/app/qgsdecorationcopyrightdialog.h
  22. +1 −0 src/app/qgsdecorationgrid.h
  23. +1 −0 src/app/qgsdecorationgriddialog.h
  24. +1 −0 src/app/qgsdecorationitem.h
  25. +1 −0 src/app/qgsdecorationnortharrow.h
  26. +1 −0 src/app/qgsdecorationnortharrowdialog.h
  27. +1 −0 src/app/qgsdecorationscalebar.h
  28. +1 −0 src/app/qgsdecorationscalebardialog.h
  29. +1 −0 src/app/qgsdelattrdialog.h
  30. +1 −0 src/app/qgsdiagramproperties.h
  31. +1 −0 src/app/qgsdiscoverrelationsdlg.h
  32. +1 −0 src/app/qgsdisplayangle.h
  33. +1 −0 src/app/qgsfeatureaction.h
  34. +1 −0 src/app/qgsfieldcalculator.h
  35. +1 −0 src/app/qgsfieldsproperties.h
  36. +1 −0 src/app/qgsformannotationdialog.h
  37. +1 −0 src/app/qgshandlebadlayers.h
  38. +1 −0 src/app/qgshtmlannotationdialog.h
  39. +1 −0 src/app/qgsidentifyresultsdialog.h
  40. +1 −0 src/app/qgsjoindialog.h
  41. +1 −0 src/app/qgslabelengineconfigdialog.h
  42. +1 −0 src/app/qgslabelinggui.h
  43. +1 −0 src/app/qgslabelpropertydialog.h
  44. +1 −0 src/app/qgslayerstylingwidget.h
  45. +1 −0 src/app/qgsloadstylefromdbdialog.h
  46. +1 −0 src/app/qgsmapthemes.h
  47. +1 −0 src/app/qgsmaptooladdfeature.h
  48. +1 −0 src/app/qgsmaptooladdpart.h
  49. +1 −0 src/app/qgsmaptooladdring.h
  50. +1 −0 src/app/qgsmaptoolannotation.h
  51. +1 −0 src/app/qgsmaptoolchangelabelproperties.h
  52. +1 −0 src/app/qgsmaptooldeletepart.h
  53. +1 −0 src/app/qgsmaptooldeletering.h
  54. +1 −0 src/app/qgsmaptoolfeatureaction.h
  55. +1 −0 src/app/qgsmaptoolfillring.h
  56. +1 −0 src/app/qgsmaptoolformannotation.h
  57. +1 −0 src/app/qgsmaptoolhtmlannotation.h
  58. +1 −0 src/app/qgsmaptoolidentifyaction.h
  59. +1 −0 src/app/qgsmaptoollabel.h
  60. +1 −0 src/app/qgsmaptoolmeasureangle.h
  61. +1 −0 src/app/qgsmaptoolmovefeature.h
  62. +1 −0 src/app/qgsmaptoolmovelabel.h
  63. +1 −0 src/app/qgsmaptooloffsetcurve.h
  64. +1 −0 src/app/qgsmaptooloffsetpointsymbol.h
  65. +1 −0 src/app/qgsmaptoolpinlabels.h
  66. +1 −0 src/app/qgsmaptoolpointsymbol.h
  67. +1 −0 src/app/qgsmaptoolreshape.h
  68. +1 −0 src/app/qgsmaptoolrotatefeature.h
  69. +1 −0 src/app/qgsmaptoolrotatelabel.h
  70. +1 −0 src/app/qgsmaptoolrotatepointsymbols.h
  71. +1 −0 src/app/qgsmaptoolselect.h
  72. +1 −0 src/app/qgsmaptoolselectfreehand.h
  73. +1 −0 src/app/qgsmaptoolselectpolygon.h
  74. +1 −0 src/app/qgsmaptoolselectradius.h
  75. +1 −0 src/app/qgsmaptoolselectrectangle.h
  76. +1 −0 src/app/qgsmaptoolshowhidelabels.h
  77. +1 −0 src/app/qgsmaptoolsimplify.h
  78. +1 −0 src/app/qgsmaptoolsplitfeatures.h
  79. +1 −0 src/app/qgsmaptoolsvgannotation.h
  80. +1 −0 src/app/qgsmaptooltextannotation.h
  81. +1 −0 src/app/qgsmeasuredialog.h
  82. +1 −0 src/app/qgsmeasuretool.h
  83. +1 −0 src/app/qgsmergeattributesdialog.h
  84. +1 −0 src/app/qgsnewspatialitelayerdialog.h
  85. +1 −0 src/app/qgsoptions.h
  86. +1 −0 src/app/qgspluginmetadata.h
  87. +1 −0 src/app/qgspluginregistry.h
  88. +1 −0 src/app/qgspointmarkeritem.h
  89. +1 −0 src/app/qgspointrotationitem.h
  90. +1 −0 src/app/qgsprojectlayergroupdialog.h
  91. +1 −0 src/app/qgsprojectproperties.h
  92. +1 −0 src/app/qgsrastercalcdialog.h
  93. +1 −0 src/app/qgsrasterlayerproperties.h
  94. +1 −0 src/app/qgsrelationadddlg.h
  95. +1 −0 src/app/qgsrelationmanagerdialog.h
  96. +1 −0 src/app/qgsrulebasedlabelingwidget.h
  97. +1 −0 src/app/qgssavestyletodbdialog.h
  98. +1 −0 src/app/qgsselectbyformdialog.h
  99. +1 −0 src/app/qgssnappinglayertreemodel.h
  100. +1 −0 src/app/qgssnappingwidget.h
  101. +1 −0 src/app/qgssponsors.h
  102. +1 −0 src/app/qgsstatisticalsummarydockwidget.h
  103. +1 −0 src/app/qgsstatusbarcoordinateswidget.h
  104. +1 −0 src/app/qgsstatusbarmagnifierwidget.h
  105. +1 −0 src/app/qgsstatusbarscalewidget.h
  106. +1 −0 src/app/qgssvgannotationdialog.h
  107. +1 −0 src/app/qgstextannotationdialog.h
  108. +1 −0 src/app/qgstip.h
  109. +1 −0 src/app/qgstipfactory.h
  110. +1 −0 src/app/qgstipgui.h
  111. +1 −0 src/app/qgsundowidget.h
  112. +1 −0 src/app/qgsvectorlayerproperties.h
  113. +1 −0 src/plugins/georeferencer/CMakeLists.txt
  114. +1 −0 tests/src/app/CMakeLists.txt
@@ -581,7 +581,6 @@ ELSE (WIN32)

ENDIF(WIN32)

ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")

@@ -528,6 +528,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/python
${CMAKE_BINARY_DIR}/src/analysis
${CMAKE_BINARY_DIR}/src/app
)
INCLUDE_DIRECTORIES(SYSTEM
${QWT_INCLUDE_DIR}
@@ -591,9 +592,6 @@ ELSE (ANDROID)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APPMAIN_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ENDIF (ANDROID)

REMOVE_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("\"-DAPP_EXPORT=${DLLEXPORT}\"")

# Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is
# loaded (by plugin for example) in test unit (qgis_composerpicturetest).
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})
@@ -613,6 +611,12 @@ TARGET_LINK_LIBRARIES(qgis_app
libdxfrw
)

GENERATE_EXPORT_HEADER(
qgis_app
BASE_NAME APP
EXPORT_FILE_NAME qgis_app.h
)

IF (NOT ANDROID)
SET_TARGET_PROPERTIES(qgis_app PROPERTIES
VERSION ${COMPLETE_VERSION}
@@ -99,6 +99,7 @@ typedef SInt32 SRefCon;
#include "qgsdxfexport.h"
#include "qgsmapthemes.h"
#include "qgsvectorlayer.h"
#include "qgis_app.h"

/** Print usage text
*/
@@ -23,6 +23,7 @@
#include "qgscontexthelp.h"
#include "qgsfields.h"
#include "qgsvectorfilewriter.h"
#include "qgis_app.h"

class QgsVectorLayer;

@@ -128,6 +128,7 @@ class QgsDiagramProperties;
#include "qgsrasterminmaxorigin.h"

#include "ui_qgisapp.h"
#include "qgis_app.h"

#ifdef HAVE_TOUCH
#include <QGestureEvent>
@@ -20,6 +20,7 @@

#include "qgisinterface.h"
#include "qgsapppluginmanagerinterface.h"
#include "qgis_app.h"

class QgisApp;

@@ -21,6 +21,7 @@
#include <QObject>
#include <QFont>
#include <QMap>
#include "qgis_app.h"

/** @class QgisAppStyleSheet
* @brief Adjustable stylesheet for the Qgis application
@@ -19,6 +19,7 @@

#include "ui_qgsabout.h"
#include "qgsoptionsdialogbase.h"
#include "qgis_app.h"

class APP_EXPORT QgsAbout : public QgsOptionsDialogBase, private Ui::QgsAbout
{
@@ -21,6 +21,7 @@
#include "ui_qgsaddattrdialogbase.h"
#include "qgisgui.h"
#include "qgsfields.h"
#include "qgis_app.h"

class QgsVectorLayer;

@@ -21,6 +21,7 @@

#include "ui_qgsaddtaborgroupbase.h"
#include "qgisgui.h"
#include "qgis_app.h"

class QTreeWidgetItem;
class QgsVectorLayer;
@@ -19,6 +19,7 @@
#define QGSANNOTATIONWIDGET_H

#include "ui_qgsannotationwidgetbase.h"
#include "qgis_app.h"

class QgsAnnotationItem;
class QgsMarkerSymbol;
@@ -27,6 +27,7 @@ back to QgsVectorLayer.
#include "qgsattributetableconfig.h"
#include "qgsaction.h"
#include <QMap>
#include "qgis_app.h"

class QgsActionManager;
class QgsVectorLayer;
@@ -26,6 +26,7 @@
#include "ui_qgsattributetabledialog.h"
#include "qgssearchwidgetwrapper.h"
#include "qgsdockwidget.h"
#include "qgis_app.h"

class QDialogButtonBox;
class QPushButton;
@@ -22,6 +22,7 @@
#include "qgseditorconfigwidget.h"
#include "qgsfeature.h"
#include "qgsvectordataprovider.h"
#include "qgis_app.h"

class QDialog;

@@ -22,6 +22,7 @@

#include "ui_qgsbookmarksbase.h"
#include "qgsdockwidget.h"
#include "qgis_app.h"

/*
* Model for project bookmarks
@@ -24,6 +24,7 @@
#include "qgsbrowsertreeview.h"
#include "qgsdockwidget.h"
#include <QSortFilterProxyModel>
#include "qgis_app.h"

class QgsBrowserModel;
class QModelIndex;
@@ -25,6 +25,7 @@
#include "qgsfields.h"
#include "qgsfeature.h"
#include "qgscoordinatereferencesystem.h"
#include "qgis_app.h"

/**
\brief QGIS internal clipboard for features.
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QSettings>
#include <QTreeWidgetItem>
#include "qgis_app.h"

class QString;
class QWidget;
@@ -21,6 +21,7 @@
#include "ui_qgscustomprojectiondialogbase.h"
#include "qgscontexthelp.h"
#include "qgscoordinatereferencesystem.h"
#include "qgis_app.h"

class QDir;

@@ -24,6 +24,7 @@
#include <QColor>
#include <QFont>
#include <QObject>
#include "qgis_app.h"
class QAction;
class QPainter;

@@ -13,6 +13,7 @@
#define QGSCOPYRIGHTLABELPLUGINGUI_H

#include "ui_qgsdecorationcopyrightdialog.h"
#include "qgis_app.h"

class QColor;
class QFont;
@@ -28,6 +28,7 @@ class QgsMarkerSymbol;
#include <QColor>
#include <QPen>
#include <QFont>
#include "qgis_app.h"

class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
{
@@ -20,6 +20,7 @@

#include "ui_qgsdecorationgriddialog.h"
#include <QDialog>
#include "qgis_app.h"

class QgsDecorationGrid;
class QgsLineSymbol;
@@ -20,6 +20,7 @@

#include <QObject>
#include "qgsunittypes.h"
#include "qgis_app.h"

class QPainter;

@@ -22,6 +22,7 @@
#include "qgsdecorationitem.h"

#include <QStringList>
#include "qgis_app.h"

class QAction;
class QToolBar;
@@ -13,6 +13,7 @@
#define QGSNORTHARROWPLUGINGUI_H

#include "ui_qgsdecorationnortharrowdialog.h"
#include "qgis_app.h"

class QgsDecorationNorthArrow;

@@ -27,6 +27,7 @@ email : sbr00pwb@users.sourceforge.net
class QPainter;

#include <QColor>
#include "qgis_app.h"

class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem
{
@@ -14,6 +14,7 @@

#include "ui_qgsdecorationscalebardialog.h"
#include <QDialog>
#include "qgis_app.h"

class QgsDecorationScaleBar;

@@ -21,6 +21,7 @@
#include "ui_qgsdelattrdialogbase.h"
#include <QDialog>
#include <list>
#include "qgis_app.h"

class QgsVectorLayer;

@@ -21,6 +21,7 @@
#include <QDialog>
#include <ui_qgsdiagrampropertiesbase.h>
#include <QStyledItemDelegate>
#include "qgis_app.h"

class QgsVectorLayer;
class QgsMapCanvas;
@@ -18,6 +18,7 @@
#include <QDialog>
#include "ui_qgsdiscoverrelationsdlgbase.h"
#include "qgsrelation.h"
#include "qgis_app.h"

class QgsRelationManager;
class QgsVectorLayer;
@@ -17,6 +17,7 @@
#define QGSDISPLAYANGLE_H

#include "ui_qgsdisplayanglebase.h"
#include "qgis_app.h"

class QgsMapToolMeasureAngle;

@@ -23,6 +23,7 @@
#include <QPair>
#include <QAction>
#include <QUuid>
#include "qgis_app.h"

class QgsIdentifyResultsDialog;
class QgsVectorLayer;
@@ -19,6 +19,7 @@
#include "ui_qgsfieldcalculatorbase.h"
#include "qgscontexthelp.h"
#include "qgsfields.h"
#include "qgis_app.h"

class QgsVectorLayer;

@@ -26,6 +26,7 @@

#include "qgsvectorlayer.h"
#include "ui_qgsfieldspropertiesbase.h"
#include "qgis_app.h"

class DesignerTree;
class DragList;
@@ -16,6 +16,7 @@
#define QGSFORMANNOTATIONDIALOG_H

#include "ui_qgsformannotationdialogbase.h"
#include "qgis_app.h"

class QgsAnnotationWidget;
class QgsFormAnnotationItem;
@@ -20,6 +20,7 @@
#include "ui_qgshandlebadlayersbase.h"
#include "qgsproject.h"
#include "qgsprojectbadlayerhandler.h"
#include "qgis_app.h"

class APP_EXPORT QgsHandleBadLayersHandler
: public QObject
@@ -16,6 +16,7 @@
#define QgsHTMLAnnotationDialog_H

#include "ui_qgsformannotationdialogbase.h"
#include "qgis_app.h"

class QgsAnnotationWidget;
class QgsHtmlAnnotationItem;
@@ -31,6 +31,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QUrl>
#include "qgis_app.h"

class QCloseEvent;
class QTreeWidgetItem;
@@ -19,6 +19,7 @@
#define QgsJoinDIALOG_H

#include "ui_qgsjoindialogbase.h"
#include "qgis_app.h"

class QgsVectorLayer;
struct QgsVectorJoinInfo;
@@ -18,6 +18,7 @@
#include <QDialog>

#include "ui_qgsengineconfigdialog.h"
#include "qgis_app.h"


class APP_EXPORT QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
@@ -20,6 +20,7 @@

#include "qgspallabeling.h"
#include "qgstextformatwidget.h"
#include "qgis_app.h"

class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpressionContextGenerator
{
@@ -22,6 +22,7 @@
#include "qgsfeature.h"
#include "qgspallabeling.h"
#include <QDialog>
#include "qgis_app.h"


//! A dialog to enter data defined label attributes
@@ -29,6 +29,7 @@

#include "ui_qgsmapstylingwidgetbase.h"
#include "qgsmaplayerconfigwidgetfactory.h"
#include "qgis_app.h"

class QgsLabelingWidget;
class QgsMapLayer;
@@ -18,6 +18,7 @@

#include "ui_qgsloadstylefromdbdialog.h"
#include "qgisgui.h"
#include "qgis_app.h"

class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
{
@@ -21,6 +21,7 @@
#include <QObject>
#include <QSet>
#include <QStringList>
#include "qgis_app.h"

class QAction;
class QDomDocument;
@@ -14,6 +14,7 @@
***************************************************************************/

#include "qgsmaptoolcapture.h"
#include "qgis_app.h"

//! This tool adds new point/line/polygon features to already existing vector layers
class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture

0 comments on commit 38a8dda

Please sign in to comment.
You can’t perform that action at this time.