Skip to content
Permalink
Browse files

Add qgis_gui.h with GUI_EXPORT macro

  • Loading branch information
m-kuhn committed Jan 4, 2017
1 parent 0302719 commit 4c1f178ac9657079f90452edd5c8c48b416fb12d
Showing 356 changed files with 369 additions and 8 deletions.
@@ -581,7 +581,6 @@ ELSE (WIN32)

ENDIF(WIN32)

ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
@@ -525,6 +525,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES(SYSTEM
${QWT_INCLUDE_DIR}
@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
../../core/auth
../../core/geometry
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
../../core/auth
../../core/geometry
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
../../core/auth
../../core/geometry
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES (
../../core/auth
../../core/geometry
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES (SYSTEM
${QCA_INCLUDE_DIR}
@@ -66,6 +66,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
@@ -789,6 +789,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/layertree
${CMAKE_CURRENT_SOURCE_DIR}/effects
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui
../core
../core/auth
../core/composer
@@ -810,9 +811,6 @@ INCLUDE_DIRECTORIES(SYSTEM
${GDAL_INCLUDE_DIR}
)

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

# disable deprecation warnings for classes re-exporting deprecated methods
IF(MSVC)
SET_SOURCE_FILES_PROPERTIES(
@@ -869,6 +867,14 @@ TARGET_LINK_LIBRARIES(qgis_gui
${QSCINTILLA_LIBRARY}
)

GENERATE_EXPORT_HEADER(
qgis_gui
BASE_NAME GUI
EXPORT_FILE_NAME qgis_gui.h
)

SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${PROJECT_BINARY_DIR}/qgis_gui.h)

IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
ADD_DEFINITIONS(-DQSCINTILLA_DLL)
@@ -17,6 +17,7 @@
#define QGSATTRIBUTETABLEDELEGATE_H

#include <QItemDelegate>
#include "qgis_gui.h"

class QgsFeatureSelectionModel;
class QPainter;
@@ -22,6 +22,7 @@

#include "qgsattributetablemodel.h"
#include "qgsfeaturemodel.h"
#include "qgis_gui.h"

class QgsVectorLayerCache;
class QgsMapCanvas;
@@ -28,6 +28,7 @@
#include "qgsconditionalstyle.h"
#include "qgsattributeeditorcontext.h"
#include "qgsvectorlayercache.h"
#include "qgis_gui.h"

class QgsMapCanvas;
class QgsMapLayerAction;
@@ -20,6 +20,7 @@
#include <QAction>

#include "qgsfeature.h" // For QgsFeatureIds
#include "qgis_gui.h"

class QgsAttributeTableDelegate;
class QgsAttributeTableFilterModel;
@@ -24,6 +24,7 @@
#include "qgsattributetablefiltermodel.h"
#include "qgsdistancearea.h"
#include "qgsattributeform.h"
#include "qgis_gui.h"

class QgsFeatureRequest;
class QSignalMapper;
@@ -23,6 +23,7 @@

#include "qgsfeaturemodel.h"
#include "qgsfeature.h" // QgsFeatureId
#include "qgis_gui.h"

class QgsAttributeTableFilterModel;
class QgsAttributeTableModel;
@@ -20,6 +20,7 @@
#include <qdebug.h>

#include "qgsfeature.h" // For QgsFeatureIds
#include "qgis_gui.h"

class QgsAttributeTableFilterModel;
class QgsFeatureListModel;
@@ -17,6 +17,7 @@

#include <QItemDelegate>
#include <QItemSelectionModel>
#include "qgis_gui.h"

class QgsVectorLayer;
class QgsFeatureListModel;
@@ -18,6 +18,7 @@
#include <QItemSelectionModel>

#include "qgsfeature.h"
#include "qgis_gui.h"

class QgsVectorLayer;
class QgsFeatureModel;
@@ -24,6 +24,7 @@

#include "ui_qgsfieldconditionalformatwidget.h"
#include "qgsconditionalstyle.h"
#include "qgis_gui.h"

/** \ingroup gui
* \class QgsFieldConditionalFormatWidget
@@ -18,6 +18,7 @@

#include "qgsfeature.h"
#include "qgsifeatureselectionmanager.h"
#include "qgis_gui.h"

/** \ingroup gui
* This selection manager synchronizes a local set of selected features with an attribute table.
@@ -19,6 +19,7 @@
#include <QObject>

#include "qgsfeature.h"
#include "qgis_gui.h"

/** \ingroup gui
* Is an interface class to abstract feature selection handling.
@@ -22,6 +22,7 @@
#include "ui_qgsorganizetablecolumnsdialog.h"

#include "qgsattributetableconfig.h"
#include "qgis_gui.h"

class QgsVectorLayer;

@@ -17,6 +17,7 @@
#define QGSVECTORLAYERSELECTIONMANAGER_H

#include "qgsifeatureselectionmanager.h"
#include "qgis_gui.h"

class QgsVectorLayer;

@@ -23,6 +23,7 @@
#include "ui_qgsauthauthoritieseditor.h"
#include "qgsauthcertutils.h"
#include "qgsauthmanager.h"
#include "qgis_gui.h"

class QgsMessageBar;
class QMenu;
@@ -29,6 +29,7 @@
#include <QWidget>
#include "ui_qgsauthcertificateinfo.h"
#include "qgsauthcertutils.h"
#include "qgis_gui.h"

/** \ingroup gui
* Widget for viewing detailed info on a certificate and its hierarchical trust chain
@@ -21,6 +21,7 @@

#include <QWidget>
#include <QDialog>
#include "qgis_gui.h"


/** \ingroup gui
@@ -19,6 +19,7 @@

#include <QComboBox>
#include "qgsauthcertutils.h"
#include "qgis_gui.h"

/** \ingroup gui
* Widget for editing the trust policy associated with a Certificate (Intermediate) Authority
@@ -21,6 +21,7 @@
#include <QDialog>

#include "ui_qgsauthconfigedit.h"
#include "qgis_gui.h"

class QgsAuthMethodEdit;

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

#include "ui_qgsauthconfigeditor.h"
#include "qgsauthmanager.h"
#include "qgis_gui.h"

class QgsMessageBar;

@@ -20,6 +20,7 @@
#include "ui_qgsauthconfigidedit.h"

#include <QWidget>
#include "qgis_gui.h"

/** \ingroup gui
* \brief Custom widget for editing an authentication configuration ID
@@ -21,6 +21,7 @@

#include "ui_qgsauthconfigselect.h"
#include "qgsauthconfig.h"
#include "qgis_gui.h"


/** \ingroup gui
@@ -20,6 +20,7 @@
#include <QWidget>
#include "ui_qgsautheditorwidgets.h"
#include "ui_qgsauthmethodplugins.h"
#include "qgis_gui.h"

/** \ingroup gui
* Dialog for viewing available authentication method plugins
@@ -18,6 +18,7 @@
#define QGSAUTHGUIUTILS_H

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

class QWidget;
class QgsMessageBar;
@@ -22,6 +22,7 @@

#include "ui_qgsauthidentitieseditor.h"
#include "qgsauthmanager.h"
#include "qgis_gui.h"

class QgsMessageBar;

@@ -21,6 +21,7 @@
#include "ui_qgsauthimportcertdialog.h"

#include <QSslCertificate>
#include "qgis_gui.h"

class QPushButton;

@@ -24,6 +24,7 @@
#include <QSslKey>

#include "qgsauthconfig.h"
#include "qgis_gui.h"

/** \ingroup gui
* Widget for importing an identity certificate/key bundle into the authentication database
@@ -20,6 +20,7 @@
#include <QDialog>

#include "ui_qgsauthmasterpassresetdialog.h"
#include "qgis_gui.h"

class QLabel;
class QVBoxLayout;
@@ -20,6 +20,7 @@
#include <QWidget>

#include "qgis.h"
#include "qgis_gui.h"

/** \ingroup gui
* Abstract base class for the edit widget of authentication method plugins
@@ -21,6 +21,7 @@

#include "ui_qgsauthserverseditor.h"
#include "qgsauthmanager.h"
#include "qgis_gui.h"

class QgsMessageBar;

@@ -25,6 +25,7 @@
#include <QSslConfiguration>

#include "qgsauthconfig.h"
#include "qgis_gui.h"

class QComboBox;
class QGroupBox;
@@ -21,6 +21,7 @@
#include <QDialog>
#include <QSslError>
#include "ui_qgsauthsslerrorsdialog.h"
#include "qgis_gui.h"

class QNetworkReply;
class QPushButton;
@@ -67,6 +67,7 @@
#include <QDialog>
#include <QAbstractSocket>
#include <QSslSocket>
#include "qgis_gui.h"

class QPushButton;
class QSslSocket;
@@ -23,6 +23,7 @@
#include <QSslCertificate>

#include "qgsauthmanager.h"
#include "qgis_gui.h"

class QgsMessageBar;

@@ -17,6 +17,7 @@
#define QGSEDITORCONFIGWIDGET_H

#include <QWidget>
#include "qgis_gui.h"


class QgsVectorLayer;
@@ -17,6 +17,7 @@

#include <QList>
#include <QSharedPointer>
#include "qgis_gui.h"

class QgsVectorLayer;
class QgsEditorWidgetSetup;
@@ -88,4 +89,4 @@ class GUI_EXPORT QgsEditorWidgetAutoConf
};
///@endcond

#endif // QGSEDITORWIDGETAUTOCONF_H
#endif // QGSEDITORWIDGETAUTOCONF_H
@@ -20,6 +20,7 @@
#include <QMap>
#include <QString>
#include <QVariant>
#include "qgis_gui.h"

class QgsEditorConfigWidget;
class QgsEditorWidgetWrapper;
@@ -21,6 +21,7 @@
#include "qgseditorwidgetfactory.h"
#include "qgsattributeeditorcontext.h"
#include "qgseditorwidgetautoconf.h"
#include "qgis_gui.h"

class QgsMapLayer;
class QDomNode;

0 comments on commit 4c1f178

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