Add qgis_app.h with APP_EXPORT macro

qgis · Jan 4, 2017 · 38a8dda · 38a8dda
1 parent d006784
commit 38a8dda
Show file tree

Hide file tree

Showing 114 changed files with 119 additions and 4 deletions.
diff --git a/CMakeLists.txt b/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}")
 

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -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}

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -99,6 +99,7 @@ typedef SInt32 SRefCon;
 #include "qgsdxfexport.h"
 #include "qgsmapthemes.h"
 #include "qgsvectorlayer.h"
+#include "qgis_app.h"
 
 /** Print usage text
  */

diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h
@@ -23,6 +23,7 @@
 #include "qgscontexthelp.h"
 #include "qgsfields.h"
 #include "qgsvectorfilewriter.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -128,6 +128,7 @@ class QgsDiagramProperties;
 #include "qgsrasterminmaxorigin.h"
 
 #include "ui_qgisapp.h"
+#include "qgis_app.h"
 
 #ifdef HAVE_TOUCH
 #include <QGestureEvent>

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -20,6 +20,7 @@
 
 #include "qgisinterface.h"
 #include "qgsapppluginmanagerinterface.h"
+#include "qgis_app.h"
 
 class QgisApp;
 

diff --git a/src/app/qgisappstylesheet.h b/src/app/qgisappstylesheet.h
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QFont>
 #include <QMap>
+#include "qgis_app.h"
 
 /** @class QgisAppStyleSheet
  * @brief Adjustable stylesheet for the Qgis application

diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h
@@ -19,6 +19,7 @@
 
 #include "ui_qgsabout.h"
 #include "qgsoptionsdialogbase.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsAbout : public QgsOptionsDialogBase, private Ui::QgsAbout
 {

diff --git a/src/app/qgsaddattrdialog.h b/src/app/qgsaddattrdialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgsaddattrdialogbase.h"
 #include "qgisgui.h"
 #include "qgsfields.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 

diff --git a/src/app/qgsaddtaborgroup.h b/src/app/qgsaddtaborgroup.h
@@ -21,6 +21,7 @@
 
 #include "ui_qgsaddtaborgroupbase.h"
 #include "qgisgui.h"
+#include "qgis_app.h"
 
 class QTreeWidgetItem;
 class QgsVectorLayer;

diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
@@ -19,6 +19,7 @@
 #define QGSANNOTATIONWIDGET_H
 
 #include "ui_qgsannotationwidgetbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationItem;
 class QgsMarkerSymbol;

diff --git a/src/app/qgsattributeactiondialog.h b/src/app/qgsattributeactiondialog.h
@@ -27,6 +27,7 @@ back to QgsVectorLayer.
 #include "qgsattributetableconfig.h"
 #include "qgsaction.h"
 #include <QMap>
+#include "qgis_app.h"
 
 class QgsActionManager;
 class QgsVectorLayer;

diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
@@ -26,6 +26,7 @@
 #include "ui_qgsattributetabledialog.h"
 #include "qgssearchwidgetwrapper.h"
 #include "qgsdockwidget.h"
+#include "qgis_app.h"
 
 class QDialogButtonBox;
 class QPushButton;

diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
@@ -22,6 +22,7 @@
 #include "qgseditorconfigwidget.h"
 #include "qgsfeature.h"
 #include "qgsvectordataprovider.h"
+#include "qgis_app.h"
 
 class QDialog;
 

diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h
@@ -22,6 +22,7 @@
 
 #include "ui_qgsbookmarksbase.h"
 #include "qgsdockwidget.h"
+#include "qgis_app.h"
 
 /*
  * Model for project bookmarks

diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
@@ -24,6 +24,7 @@
 #include "qgsbrowsertreeview.h"
 #include "qgsdockwidget.h"
 #include <QSortFilterProxyModel>
+#include "qgis_app.h"
 
 class QgsBrowserModel;
 class QModelIndex;

diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h
@@ -25,6 +25,7 @@
 #include "qgsfields.h"
 #include "qgsfeature.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgis_app.h"
 
 /**
   \brief QGIS internal clipboard for features.

diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
@@ -25,6 +25,7 @@
 #include <QMouseEvent>
 #include <QSettings>
 #include <QTreeWidgetItem>
+#include "qgis_app.h"
 
 class QString;
 class QWidget;

diff --git a/src/app/qgscustomprojectiondialog.h b/src/app/qgscustomprojectiondialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgscustomprojectiondialogbase.h"
 #include "qgscontexthelp.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgis_app.h"
 
 class QDir;
 

diff --git a/src/app/qgsdecorationcopyright.h b/src/app/qgsdecorationcopyright.h
@@ -24,6 +24,7 @@
 #include <QColor>
 #include <QFont>
 #include <QObject>
+#include "qgis_app.h"
 class QAction;
 class QPainter;
 

diff --git a/src/app/qgsdecorationcopyrightdialog.h b/src/app/qgsdecorationcopyrightdialog.h
@@ -13,6 +13,7 @@
 #define QGSCOPYRIGHTLABELPLUGINGUI_H
 
 #include "ui_qgsdecorationcopyrightdialog.h"
+#include "qgis_app.h"
 
 class QColor;
 class QFont;

diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
@@ -28,6 +28,7 @@ class QgsMarkerSymbol;
 #include <QColor>
 #include <QPen>
 #include <QFont>
+#include "qgis_app.h"
 
 class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
 {

diff --git a/src/app/qgsdecorationgriddialog.h b/src/app/qgsdecorationgriddialog.h
@@ -20,6 +20,7 @@
 
 #include "ui_qgsdecorationgriddialog.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 class QgsDecorationGrid;
 class QgsLineSymbol;

diff --git a/src/app/qgsdecorationitem.h b/src/app/qgsdecorationitem.h
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include "qgsunittypes.h"
+#include "qgis_app.h"
 
 class QPainter;
 

diff --git a/src/app/qgsdecorationnortharrow.h b/src/app/qgsdecorationnortharrow.h
@@ -22,6 +22,7 @@
 #include "qgsdecorationitem.h"
 
 #include <QStringList>
+#include "qgis_app.h"
 
 class QAction;
 class QToolBar;

diff --git a/src/app/qgsdecorationnortharrowdialog.h b/src/app/qgsdecorationnortharrowdialog.h
@@ -13,6 +13,7 @@
 #define QGSNORTHARROWPLUGINGUI_H
 
 #include "ui_qgsdecorationnortharrowdialog.h"
+#include "qgis_app.h"
 
 class QgsDecorationNorthArrow;
 

diff --git a/src/app/qgsdecorationscalebar.h b/src/app/qgsdecorationscalebar.h
@@ -27,6 +27,7 @@ email                : sbr00pwb@users.sourceforge.net
 class QPainter;
 
 #include <QColor>
+#include "qgis_app.h"
 
 class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem
 {

diff --git a/src/app/qgsdecorationscalebardialog.h b/src/app/qgsdecorationscalebardialog.h
@@ -14,6 +14,7 @@
 
 #include "ui_qgsdecorationscalebardialog.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 class QgsDecorationScaleBar;
 

diff --git a/src/app/qgsdelattrdialog.h b/src/app/qgsdelattrdialog.h
@@ -21,6 +21,7 @@
 #include "ui_qgsdelattrdialogbase.h"
 #include <QDialog>
 #include <list>
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 

diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
@@ -21,6 +21,7 @@
 #include <QDialog>
 #include <ui_qgsdiagrampropertiesbase.h>
 #include <QStyledItemDelegate>
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 class QgsMapCanvas;

diff --git a/src/app/qgsdiscoverrelationsdlg.h b/src/app/qgsdiscoverrelationsdlg.h
@@ -18,6 +18,7 @@
 #include <QDialog>
 #include "ui_qgsdiscoverrelationsdlgbase.h"
 #include "qgsrelation.h"
+#include "qgis_app.h"
 
 class QgsRelationManager;
 class QgsVectorLayer;

diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h
@@ -17,6 +17,7 @@
 #define QGSDISPLAYANGLE_H
 
 #include "ui_qgsdisplayanglebase.h"
+#include "qgis_app.h"
 
 class QgsMapToolMeasureAngle;
 

diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h
@@ -23,6 +23,7 @@
 #include <QPair>
 #include <QAction>
 #include <QUuid>
+#include "qgis_app.h"
 
 class QgsIdentifyResultsDialog;
 class QgsVectorLayer;

diff --git a/src/app/qgsfieldcalculator.h b/src/app/qgsfieldcalculator.h
@@ -19,6 +19,7 @@
 #include "ui_qgsfieldcalculatorbase.h"
 #include "qgscontexthelp.h"
 #include "qgsfields.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 

diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
@@ -26,6 +26,7 @@
 
 #include "qgsvectorlayer.h"
 #include "ui_qgsfieldspropertiesbase.h"
+#include "qgis_app.h"
 
 class DesignerTree;
 class DragList;

diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h
@@ -16,6 +16,7 @@
 #define QGSFORMANNOTATIONDIALOG_H
 
 #include "ui_qgsformannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationWidget;
 class QgsFormAnnotationItem;

diff --git a/src/app/qgshandlebadlayers.h b/src/app/qgshandlebadlayers.h
@@ -20,6 +20,7 @@
 #include "ui_qgshandlebadlayersbase.h"
 #include "qgsproject.h"
 #include "qgsprojectbadlayerhandler.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsHandleBadLayersHandler
       : public QObject

diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h
@@ -16,6 +16,7 @@
 #define QgsHTMLAnnotationDialog_H
 
 #include "ui_qgsformannotationdialogbase.h"
+#include "qgis_app.h"
 
 class QgsAnnotationWidget;
 class QgsHtmlAnnotationItem;

diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -31,6 +31,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QUrl>
+#include "qgis_app.h"
 
 class QCloseEvent;
 class QTreeWidgetItem;

diff --git a/src/app/qgsjoindialog.h b/src/app/qgsjoindialog.h
@@ -19,6 +19,7 @@
 #define QgsJoinDIALOG_H
 
 #include "ui_qgsjoindialogbase.h"
+#include "qgis_app.h"
 
 class QgsVectorLayer;
 struct QgsVectorJoinInfo;

diff --git a/src/app/qgslabelengineconfigdialog.h b/src/app/qgslabelengineconfigdialog.h
@@ -18,6 +18,7 @@
 #include <QDialog>
 
 #include "ui_qgsengineconfigdialog.h"
+#include "qgis_app.h"
 
 
 class APP_EXPORT QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog

diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
@@ -20,6 +20,7 @@
 
 #include "qgspallabeling.h"
 #include "qgstextformatwidget.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpressionContextGenerator
 {

diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h
@@ -22,6 +22,7 @@
 #include "qgsfeature.h"
 #include "qgspallabeling.h"
 #include <QDialog>
+#include "qgis_app.h"
 
 
 //! A dialog to enter data defined label attributes

diff --git a/src/app/qgslayerstylingwidget.h b/src/app/qgslayerstylingwidget.h
@@ -29,6 +29,7 @@
 
 #include "ui_qgsmapstylingwidgetbase.h"
 #include "qgsmaplayerconfigwidgetfactory.h"
+#include "qgis_app.h"
 
 class QgsLabelingWidget;
 class QgsMapLayer;

diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h
@@ -18,6 +18,7 @@
 
 #include "ui_qgsloadstylefromdbdialog.h"
 #include "qgisgui.h"
+#include "qgis_app.h"
 
 class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
 {

diff --git a/src/app/qgsmapthemes.h b/src/app/qgsmapthemes.h
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QSet>
 #include <QStringList>
+#include "qgis_app.h"
 
 class QAction;
 class QDomDocument;

diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h
@@ -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