make qgis_app a shared library and fix some more stl warnings with msvc

This commit is contained in:
Juergen E. Fischer 2013-09-06 22:07:42 +02:00
parent 1632730ee1
commit 0a1d44fc63
128 changed files with 248 additions and 237 deletions

View File

@ -494,6 +494,7 @@ ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
#############################################################
# user-changeable settings which can be used to customize

View File

@ -50,8 +50,8 @@ public:
QString featureFilter() const;
void setFeatureFilter( const QString& expression );
size_t sortKeyAttributeIndex() const;
void setSortKeyAttributeIndex( size_t idx );
int sortKeyAttributeIndex() const;
void setSortKeyAttributeIndex( int idx );
/** Begins the rendering. */
void beginRender();
@ -59,10 +59,10 @@ public:
void endRender();
/** Returns the number of features in the coverage layer */
size_t numFeatures() const;
int numFeatures() const;
/** Prepare the atlas map for the given feature. Sets the extent and context variables */
void prepareForFeature( size_t i );
void prepareForFeature( int i );
/** Returns the current filename. Must be called after prepareForFeature( i ) */
const QString& currentFilename() const;

View File

@ -61,7 +61,7 @@ class QgsGeometry
/**
Set the geometry, feeding in the buffer containing OGC Well-Known Binary and the buffer's length.
This class will take ownership of the buffer.
*/
*/
void fromWkb( unsigned char * wkb /Array/, size_t length /ArraySize/ );
%MethodCode
// create copy of Python's string and pass it to fromWkb()

View File

@ -13,7 +13,7 @@ class QgsProperty
@param tabs is number of tabs to print; used for pretty-printing
hierarchy
*/
virtual void dump( size_t tabs = 0 ) const = 0;
virtual void dump( int tabs = 0 ) const = 0;
/** returns true if is a QgsPropertyKey */
virtual bool isKey() const = 0;
@ -90,7 +90,7 @@ class QgsPropertyValue : QgsProperty
*/
bool isLeaf() const;
void dump( size_t tabs = 0 ) const;
void dump( int tabs = 0 ) const;
bool readXML( QDomNode & keyNode );
@ -98,7 +98,7 @@ class QgsPropertyValue : QgsProperty
QDomElement & element,
QDomDocument & document );
size_t count() const;
int count() const;
/** return keys that do not contain other keys
@ -148,14 +148,14 @@ class QgsPropertyKey : QgsProperty
QgsPropertyValue * setValue( const QVariant & value );
void dump( size_t tabs = 0 ) const;
void dump( int tabs = 0 ) const;
bool readXML( QDomNode & keyNode );
bool writeXML( const QString &nodeName, QDomElement & element, QDomDocument & document );
/// how many elements are contained within this one?
size_t count() const;
int count() const;
/// Does this property not have any subkeys or values?
/* virtual */ bool isEmpty() const;

View File

@ -30,12 +30,9 @@ class QgsRasterBandStats
/** \brief The gdal band number (starts at 1)*/
int bandNumber;
/** Color table */
// QList<QgsColorRampShader::ColorRampItem> colorTable;
/** \brief The number of cells in the band. Equivalent to height x width.
* TODO: check if NO_DATA are excluded!*/
int elementCount;
/** \brief The number of not no data cells in the band. */
// TODO: check if no data are excluded in stats calculation
size_t elementCount;
/** \brief The maximum cell value in the raster band. NO_DATA values
* are ignored. This does not use the gdal GetMaximmum function. */

View File

@ -142,9 +142,9 @@ INCLUDE_DIRECTORIES(
IF (WIN32)
IF (MSVC)
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllexport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLEXPORT}")
ELSE (MSVC)
ADD_DEFINITIONS("-UANALYSIS_EXPORT \"-DANALYSIS_EXPORT=__declspec(dllexport)\"")
ADD_DEFINITIONS("-UANALYSIS_EXPORT \"-DANALYSIS_EXPORT=${DLLEXPORT}\"")
ENDIF (MSVC)
ENDIF (WIN32)

View File

@ -737,7 +737,7 @@ void QgsGeometryAnalyzer::dissolveFeature( QgsFeature& f, int nProcessedFeatures
if ( nProcessedFeatures == 0 )
{
int geomSize = featureGeometry->wkbSize();
size_t geomSize = featureGeometry->wkbSize();
*dissolveGeometry = new QgsGeometry();
unsigned char* wkb = new unsigned char[geomSize];
memcpy( wkb, featureGeometry->asWkb(), geomSize );

View File

@ -456,8 +456,16 @@ ELSE (ANDROID)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 main.cpp ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ENDIF (ANDROID)
IF (WIN32)
IF (MSVC)
ADD_DEFINITIONS("-DAPP_EXPORT=${DLLEXPORT}")
ELSE (MSVC)
ADD_DEFINITIONS("-UAPP_EXPORT \"-DAPP_EXPORT=${DLLEXPORT}\"")
ENDIF (MSVC)
ENDIF (WIN32)
# shared library used by tests - TODO: use it also for qgis executable?
ADD_LIBRARY(qgis_app STATIC ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS})
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS})
TARGET_LINK_LIBRARIES(qgis_app
${QWT_LIBRARY}
@ -498,6 +506,7 @@ ENDIF (ANDROID)
IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} DbgHelp)
TARGET_LINK_LIBRARIES(qgis_app DbgHelp)
ENDIF(WIN32)
IF (APPLE)
@ -511,7 +520,7 @@ ENDIF(APPLE)
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FIND_LIBRARY(EXECINFO_LIBRARY NAMES execinfo)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${EXECINFO_LIBRARY})
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${EXECINFO_LIBRARY})
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
IF (POSTGRES_FOUND)

View File

@ -149,49 +149,6 @@ bool bundleclicked( int argc, char *argv[] )
return ( argc > 1 && memcmp( argv[1], "-psn_", 5 ) == 0 );
}
#ifdef Q_OS_WIN
LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )
{
QString dumpName = QDir::toNativeSeparators(
QString( "%1\\qgis-%2-%3-%4-%5.dmp" )
.arg( QDir::tempPath() )
.arg( QDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" ) )
.arg( GetCurrentProcessId() )
.arg( GetCurrentThreadId() )
.arg( QGis::QGIS_DEV_VERSION )
);
QString msg;
HANDLE hDumpFile = CreateFile( dumpName.toLocal8Bit(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0 );
if ( hDumpFile != INVALID_HANDLE_VALUE )
{
MINIDUMP_EXCEPTION_INFORMATION ExpParam;
ExpParam.ThreadId = GetCurrentThreadId();
ExpParam.ExceptionPointers = ExceptionInfo;
ExpParam.ClientPointers = TRUE;
if ( MiniDumpWriteDump( GetCurrentProcess(), GetCurrentProcessId(), hDumpFile, MiniDumpWithDataSegs, ExceptionInfo ? &ExpParam : NULL, NULL, NULL ) )
{
msg = QObject::tr( "minidump written to %1" ).arg( dumpName );
}
else
{
msg = QObject::tr( "writing of minidump to %1 failed (%2)" ).arg( dumpName ).arg( GetLastError(), 0, 16 );
}
CloseHandle( hDumpFile );
}
else
{
msg = QObject::tr( "creation of minidump to %1 failed (%2)" ).arg( dumpName ).arg( GetLastError(), 0, 16 );
}
QMessageBox::critical( 0, QObject::tr( "Crash dumped" ), msg );
return EXCEPTION_EXECUTE_HANDLER;
}
#endif
void myPrint( const char *fmt, ... )
{
va_list ap;
@ -421,7 +378,7 @@ int main( int argc, char *argv[] )
#endif
#ifdef Q_OS_WIN
SetUnhandledExceptionFilter( qgisCrashDump );
SetUnhandledExceptionFilter( QgisApp::qgisCrashDump );
#endif
// initialize random number seed

View File

@ -277,10 +277,11 @@ extern "C"
#include "qgspythonutils.h"
#ifndef WIN32
#ifndef Q_OS_WIN
#include <dlfcn.h>
#else
#include <windows.h>
#include <DbgHelp.h>
#endif
#ifdef HAVE_TOUCH
@ -8864,14 +8865,11 @@ void QgisApp::keyPressEvent( QKeyEvent * e )
{
stopRendering();
}
#if 0
#if defined(Q_OS_WIN)&& defined(QGISDEBUG)
else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
{
extern LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo );
qgisCrashDump( 0 );
}
#endif
#endif
else
{
@ -9403,3 +9401,46 @@ void QgisApp::tapAndHoldTriggered( QTapAndHoldGesture *gesture )
}
}
#endif
#ifdef Q_OS_WIN
LONG WINAPI QgisApp::qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo )
{
QString dumpName = QDir::toNativeSeparators(
QString( "%1\\qgis-%2-%3-%4-%5.dmp" )
.arg( QDir::tempPath() )
.arg( QDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" ) )
.arg( GetCurrentProcessId() )
.arg( GetCurrentThreadId() )
.arg( QGis::QGIS_DEV_VERSION )
);
QString msg;
HANDLE hDumpFile = CreateFile( dumpName.toLocal8Bit(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, 0, CREATE_ALWAYS, 0, 0 );
if ( hDumpFile != INVALID_HANDLE_VALUE )
{
MINIDUMP_EXCEPTION_INFORMATION ExpParam;
ExpParam.ThreadId = GetCurrentThreadId();
ExpParam.ExceptionPointers = ExceptionInfo;
ExpParam.ClientPointers = TRUE;
if ( MiniDumpWriteDump( GetCurrentProcess(), GetCurrentProcessId(), hDumpFile, MiniDumpWithDataSegs, ExceptionInfo ? &ExpParam : NULL, NULL, NULL ) )
{
msg = QObject::tr( "minidump written to %1" ).arg( dumpName );
}
else
{
msg = QObject::tr( "writing of minidump to %1 failed (%2)" ).arg( dumpName ).arg( GetLastError(), 0, 16 );
}
CloseHandle( hDumpFile );
}
else
{
msg = QObject::tr( "creation of minidump to %1 failed (%2)" ).arg( dumpName ).arg( GetLastError(), 0, 16 );
}
QMessageBox::critical( 0, QObject::tr( "Crash dumped" ), msg );
return EXCEPTION_EXECUTE_HANDLER;
}
#endif

View File

@ -100,10 +100,14 @@ class QgsTileScaleWidget;
#include <QTapAndHoldGesture>
#endif
#ifdef Q_OS_WIN
#include <windows.h>
#endif
/*! \class QgisApp
* \brief Main window for the Qgis application
*/
class QgisApp : public QMainWindow, private Ui::MainWindow
class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
{
Q_OBJECT
public:
@ -425,11 +429,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
* @note added in 1.9 */
int messageTimeout();
#ifdef Q_OS_WIN
//! ugly hack
void skipNextContextMenuEvent();
#endif
//! emit initializationCompleted signal
//! @note added in 1.6
void completeInitialization();
@ -439,6 +438,13 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
QList<QgsDecorationItem*> decorationItems() { return mDecorationItems; }
void addDecorationItem( QgsDecorationItem* item ) { mDecorationItems.append( item ); }
#ifdef Q_OS_WIN
//! ugly hack
void skipNextContextMenuEvent();
static LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo );
#endif
public slots:
//! Zoom to full extent
void zoomFull();

View File

@ -36,7 +36,7 @@ class QgisApp;
* Only those functions "exposed" by QgisInterface can be called from within a
* plugin.
*/
class QgisAppInterface : public QgisInterface
class APP_EXPORT QgisAppInterface : public QgisInterface
{
Q_OBJECT

View File

@ -25,7 +25,7 @@
/** @class QgisAppStyleSheet
* @brief Adjustable stylesheet for the Qgis application
*/
class QgisAppStyleSheet: public QObject
class APP_EXPORT QgisAppStyleSheet: public QObject
{
Q_OBJECT

View File

@ -19,7 +19,7 @@
#include "ui_qgsabout.h"
class QgsAbout : public QDialog, private Ui::QgsAbout
class APP_EXPORT QgsAbout : public QDialog, private Ui::QgsAbout
{
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@
class QgsVectorLayer;
class QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogBase
class APP_EXPORT QgsAddAttrDialog: public QDialog, private Ui::QgsAddAttrDialogBase
{
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include "ui_qgsaddjoindialogbase.h"
class QgsVectorLayer;
class QgsAddJoinDialog: public QDialog, private Ui::QgsAddJoinDialogBase
class APP_EXPORT QgsAddJoinDialog: public QDialog, private Ui::QgsAddJoinDialogBase
{
Q_OBJECT
public:

View File

@ -25,7 +25,7 @@
class QTreeWidgetItem;
class QgsVectorLayer;
class QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroupBase
class APP_EXPORT QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroupBase
{
Q_OBJECT

View File

@ -25,7 +25,7 @@ class QgsMarkerSymbolV2;
/**A configuration widget to configure the annotation item properties. Usually embedded by QgsAnnotationItem
subclass configuration dialogs*/
class QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationWidgetBase
class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationWidgetBase
{
Q_OBJECT
public:

View File

@ -30,7 +30,7 @@ back to QgsVectorLayer.
class QgsAttributeAction;
class QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase
class APP_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttributeActionDialogBase
{
Q_OBJECT

View File

@ -41,7 +41,7 @@ class QgsAttributeTableModel;
class QgsAttributeTableFilterModel;
class QgsAttributeTableView;
class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDialog
class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDialog
{
Q_OBJECT

View File

@ -25,7 +25,7 @@ class QDialog;
class QLayout;
class QgsField;
class QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog
class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog
{
Q_OBJECT

View File

@ -28,7 +28,7 @@ class QLayout;
class QgsField;
class QgsMapCanvas;
class QgsAttributeTypeLoadDialog: public QDialog, private Ui::QgsAttributeLoadValues
class APP_EXPORT QgsAttributeTypeLoadDialog: public QDialog, private Ui::QgsAttributeLoadValues
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
#include <QDialog>
class QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
class APP_EXPORT QgsBookmarks : public QDialog, private Ui::QgsBookmarksBase
{
Q_OBJECT

View File

@ -25,7 +25,7 @@ class QgsLayerItem;
class QgsDataItem;
class QgsBrowserTreeFilterProxyModel;
class QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
{
Q_OBJECT
public:

View File

@ -50,7 +50,7 @@ class QgsVectorLayer;
*/
#define QGSCLIPBOARD_STYLE_MIME "application/qgis.style"
class QgsClipboard : public QObject
class APP_EXPORT QgsClipboard : public QObject
{
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@
#include "ui_qgsconfigureshortcutsdialog.h"
class QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShortcutsDialog
class APP_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShortcutsDialog
{
Q_OBJECT

View File

@ -30,7 +30,7 @@ class QString;
class QWidget;
class QTreeWidgetItem;
class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationDialogBase
class APP_EXPORT QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationDialogBase
{
Q_OBJECT
public:
@ -100,7 +100,7 @@ class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationD
QSettings* mSettings;
};
class QgsCustomization : public QObject
class APP_EXPORT QgsCustomization : public QObject
{
Q_OBJECT

View File

@ -29,7 +29,7 @@ The custom projection widget is used to define the projection family, ellipsoid
@author Tim Sutton
*/
class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
{
Q_OBJECT
public:

View File

@ -29,7 +29,7 @@ class QPainter;
class QgsDecorationCopyrightDialog;
class QgsDecorationCopyright : public QgsDecorationItem
class APP_EXPORT QgsDecorationCopyright : public QgsDecorationItem
{
Q_OBJECT
public:

View File

@ -19,7 +19,7 @@ class QFont;
class QgsDecorationCopyright;
class QgsDecorationCopyrightDialog : public QDialog, private Ui::QgsDecorationCopyrightDialog
class APP_EXPORT QgsDecorationCopyrightDialog : public QDialog, private Ui::QgsDecorationCopyrightDialog
{
Q_OBJECT

View File

@ -29,7 +29,7 @@ class QgsMarkerSymbolV2;
#include <QPen>
#include <QFont>
class QgsDecorationGrid: public QgsDecorationItem
class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
{
Q_OBJECT
public:

View File

@ -28,7 +28,7 @@ class QgsMarkerSymbolV2;
/**
@author Etienne Tourigny
*/
class QgsDecorationGridDialog : public QDialog, private Ui::QgsDecorationGridDialog
class APP_EXPORT QgsDecorationGridDialog : public QDialog, private Ui::QgsDecorationGridDialog
{
Q_OBJECT

View File

@ -23,7 +23,7 @@
class QPainter;
class QgsDecorationItem: public QObject
class APP_EXPORT QgsDecorationItem: public QObject
{
Q_OBJECT
public:

View File

@ -27,7 +27,7 @@ class QAction;
class QToolBar;
class QPainter;
class QgsDecorationNorthArrow: public QgsDecorationItem
class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem
{
Q_OBJECT

View File

@ -16,7 +16,7 @@
class QgsDecorationNorthArrow;
class QgsDecorationNorthArrowDialog : public QDialog, private Ui::QgsDecorationNorthArrowDialog
class APP_EXPORT QgsDecorationNorthArrowDialog : public QDialog, private Ui::QgsDecorationNorthArrowDialog
{
Q_OBJECT

View File

@ -28,7 +28,7 @@ class QPainter;
#include <QColor>
class QgsDecorationScaleBar: public QgsDecorationItem
class APP_EXPORT QgsDecorationScaleBar: public QgsDecorationItem
{
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@ class QgsDecorationScaleBar;
/**
@author Peter Brewer
*/
class QgsDecorationScaleBarDialog : public QDialog, private Ui::QgsDecorationScaleBarDialog
class APP_EXPORT QgsDecorationScaleBarDialog : public QDialog, private Ui::QgsDecorationScaleBarDialog
{
Q_OBJECT

View File

@ -24,7 +24,7 @@
class QgsVectorLayer;
class QgsDelAttrDialog: public QDialog, private Ui::QgsDelAttrDialogBase
class APP_EXPORT QgsDelAttrDialog: public QDialog, private Ui::QgsDelAttrDialogBase
{
Q_OBJECT
public:

View File

@ -23,7 +23,7 @@
class QgsVectorLayer;
class QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPropertiesBase
class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPropertiesBase
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
#include "ui_qgsdisplayanglebase.h"
/**A class that displays results of angle measurements with the proper unit*/
class QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase
{
Q_OBJECT

View File

@ -28,7 +28,7 @@ class QgsVectorLayer;
class QgsHighlight;
class QgsAttributeDialog;
class QgsFeatureAction : public QAction
class APP_EXPORT QgsFeatureAction : public QAction
{
Q_OBJECT

View File

@ -22,7 +22,7 @@
class QgsVectorLayer;
/**A dialog class that provides calculation of new fields using existing fields, values and a set of operators*/
class QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalculatorBase
class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalculatorBase
{
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@
#include "qgsvectorlayer.h"
#include "ui_qgsfieldspropertiesbase.h"
class QgsAttributesTree : public QTreeWidget
class APP_EXPORT QgsAttributesTree : public QTreeWidget
{
Q_OBJECT
public:
@ -42,7 +42,7 @@ class QgsAttributesTree : public QTreeWidget
};
class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
class QgsAnnotationWidget;
class QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
{
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@
#include "ui_qgshandlebadlayersbase.h"
#include "qgsproject.h"
class QgsHandleBadLayersHandler
class APP_EXPORT QgsHandleBadLayersHandler
: public QObject
, public QgsProjectBadLayerHandler
{
@ -36,7 +36,7 @@ class QgsHandleBadLayersHandler
class QPushButton;
class QgsHandleBadLayers
class APP_EXPORT QgsHandleBadLayers
: public QDialog
, private Ui::QgsHandleBadLayersBase
{

View File

@ -20,7 +20,7 @@
class QgsAnnotationWidget;
class QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
{
Q_OBJECT
public:

View File

@ -46,7 +46,7 @@ class QDockWidget;
*@author Gary E.Sherman
*/
class QgsIdentifyResultsWebView : public QWebView
class APP_EXPORT QgsIdentifyResultsWebView : public QWebView
{
Q_OBJECT;
public:
@ -59,7 +59,7 @@ class QgsIdentifyResultsWebView : public QWebView
QWebView *createWindow( QWebPage::WebWindowType type );
};
class QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
class APP_EXPORT QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
{
public:
QgsIdentifyResultsFeatureItem( const QgsFields &fields, const QgsFeature &feature, const QgsCoordinateReferenceSystem &crs, const QStringList & strings = QStringList() );
@ -73,7 +73,7 @@ class QgsIdentifyResultsFeatureItem: public QTreeWidgetItem
QgsCoordinateReferenceSystem mCrs;
};
class QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
class APP_EXPORT QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
{
Q_OBJECT
@ -89,7 +89,7 @@ class QgsIdentifyResultsWebViewItem: public QObject, public QTreeWidgetItem
QgsIdentifyResultsWebView *mWebView;
};
class QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdentifyResultsBase
class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdentifyResultsBase
{
Q_OBJECT

View File

@ -23,7 +23,7 @@ class QgsLabel;
/** QgsLabelDialog is the dialog for label. */
class QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
class APP_EXPORT QgsLabelDialog: public QWidget, private Ui::QgsLabelDialogBase
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
class QgsPalLabeling;
class QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
class APP_EXPORT QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDialog
{
Q_OBJECT
public:

View File

@ -28,7 +28,7 @@ class QgsCharacterSelectorDialog;
#include "qgspallabeling.h"
class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
class APP_EXPORT QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
class QgsRenderContext;
class QgsLabelPreview : public QLabel
class APP_EXPORT QgsLabelPreview : public QLabel
{
public:
QgsLabelPreview( QWidget* parent = NULL );

View File

@ -26,7 +26,7 @@
class QgsMapRenderer;
/**A dialog to enter data defined label attributes*/
class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase
class APP_EXPORT QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialogBase
{
Q_OBJECT
public:

View File

@ -14,7 +14,7 @@
#include "qgisgui.h"
#include "qgsfield.h"
class QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout
{
QString mSelectedStyleId;
int mSectionLimit;

View File

@ -17,7 +17,7 @@
#include "qgsfeature.h"
/**This tool adds new point/line/polygon features to already existing vector layers*/
class QgsMapToolAddFeature : public QgsMapToolCapture
class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
{
Q_OBJECT
public:

View File

@ -16,7 +16,7 @@
#include "qgsmaptoolcapture.h"
/**A map tool that adds new parts to multipart features*/
class QgsMapToolAddPart : public QgsMapToolCapture
class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture
{
Q_OBJECT
public:

View File

@ -16,7 +16,7 @@
#include "qgsmaptoolcapture.h"
/**A tool to cut holes into polygons and multipolygon features*/
class QgsMapToolAddRing: public QgsMapToolCapture
class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture
{
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include "qgsmaptool.h"
#include "qgsannotationitem.h"
class QgsMapToolAnnotation: public QgsMapTool
class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool
{
public:
QgsMapToolAnnotation( QgsMapCanvas* canvas );

View File

@ -30,7 +30,7 @@ class QgsVertexMarker;
class QgsMapLayer;
class QgsGeometryValidator;
class QgsMapToolCapture : public QgsMapToolEdit
class APP_EXPORT QgsMapToolCapture : public QgsMapToolEdit
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
#include "qgsmaptoollabel.h"
class QgsMapToolChangeLabelProperties: public QgsMapToolLabel
class APP_EXPORT QgsMapToolChangeLabelProperties: public QgsMapToolLabel
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
class QgsVertexMarker;
/**Map tool to delete vertices from line/polygon features*/
class QgsMapToolDeletePart: public QgsMapToolVertexEdit
class APP_EXPORT QgsMapToolDeletePart: public QgsMapToolVertexEdit
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
class QgsVertexMarker;
/**Map tool to delete vertices from line/polygon features*/
class QgsMapToolDeleteRing : public QgsMapToolVertexEdit
class APP_EXPORT QgsMapToolDeleteRing : public QgsMapToolVertexEdit
{
Q_OBJECT

View File

@ -23,7 +23,7 @@ class QgsRubberBand;
class QKeyEvent;
/**Base class for map tools that edit vector geometry*/
class QgsMapToolEdit: public QgsMapTool
class APP_EXPORT QgsMapToolEdit: public QgsMapTool
{
public:
QgsMapToolEdit( QgsMapCanvas* canvas );

View File

@ -27,7 +27,7 @@ class QgsVectorLayer;
/**
\brief Map tool for running feature actions on the current layer
*/
class QgsMapToolFeatureAction : public QgsMapTool
class APP_EXPORT QgsMapToolFeatureAction : public QgsMapTool
{
Q_OBJECT

View File

@ -20,7 +20,7 @@
#include "qgsmaptoolannotation.h"
class QgsMapToolFormAnnotation: public QgsMapToolAnnotation
class APP_EXPORT QgsMapToolFormAnnotation: public QgsMapToolAnnotation
{
public:
QgsMapToolFormAnnotation( QgsMapCanvas* canvas );

View File

@ -20,7 +20,7 @@
#include "qgsmaptoolannotation.h"
class QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation
class APP_EXPORT QgsMapToolHtmlAnnotation: public QgsMapToolAnnotation
{
public:
QgsMapToolHtmlAnnotation( QgsMapCanvas* canvas );

View File

@ -41,7 +41,7 @@ class QgsVectorLayer;
- for vector layers shows feature attributes within search radius
(allows to edit values when vector layer is in editing mode)
*/
class QgsMapToolIdentifyAction : public QgsMapToolIdentify
class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
{
Q_OBJECT

View File

@ -25,7 +25,7 @@
class QgsRubberBand;
/**Base class for map tools that modify label properties*/
class QgsMapToolLabel: public QgsMapTool
class APP_EXPORT QgsMapToolLabel: public QgsMapTool
{
public:
QgsMapToolLabel( QgsMapCanvas* canvas );

View File

@ -25,7 +25,7 @@ class QgsDisplayAngle;
class QgsRubberBand;
/**Map tool to measure angle between two segments*/
class QgsMapToolMeasureAngle: public QgsMapTool
class APP_EXPORT QgsMapToolMeasureAngle: public QgsMapTool
{
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@
#include "qgsvectorlayer.h"
/**Map tool for translating feature position by mouse drag*/
class QgsMapToolMoveFeature: public QgsMapToolEdit
class APP_EXPORT QgsMapToolMoveFeature: public QgsMapToolEdit
{
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include "qgsmaptoollabel.h"
/**A map tool for dragging label positions*/
class QgsMapToolMoveLabel: public QgsMapToolLabel
class APP_EXPORT QgsMapToolMoveLabel: public QgsMapToolLabel
{
Q_OBJECT

View File

@ -24,7 +24,7 @@ class QgsVertexMarker;
class QDoubleSpinBox;
class QGraphicsProxyWidget;
class QgsMapToolOffsetCurve: public QgsMapToolEdit
class APP_EXPORT QgsMapToolOffsetCurve: public QgsMapToolEdit
{
Q_OBJECT
public:

View File

@ -27,7 +27,7 @@ class QgsHighlight;
class QgsLabelPosition;
/**A map tool for pinning (writing to attribute table) and unpinning labelpositions and rotation*/
class QgsMapToolPinLabels: public QgsMapToolLabel
class APP_EXPORT QgsMapToolPinLabels: public QgsMapToolLabel
{
Q_OBJECT

View File

@ -19,7 +19,7 @@
#include "qgsmaptoolcapture.h"
/**A map tool that draws a line and splits the features cut by the line*/
class QgsMapToolReshape: public QgsMapToolCapture
class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture
{
Q_OBJECT

View File

@ -22,7 +22,7 @@
class QgsVertexMarker;
/**Map tool for translating feature position by mouse drag*/
class QgsMapToolRotateFeature: public QgsMapToolEdit
class APP_EXPORT QgsMapToolRotateFeature: public QgsMapToolEdit
{
Q_OBJECT
public:

View File

@ -21,7 +21,7 @@
#include "qgsmaptoollabel.h"
class QgsPointRotationItem;
class QgsMapToolRotateLabel: public QgsMapToolLabel
class APP_EXPORT QgsMapToolRotateLabel: public QgsMapToolLabel
{
Q_OBJECT

View File

@ -22,7 +22,7 @@
class QgsPointRotationItem;
/**A class that allows to interactively manipulate the value of the rotation field(s) for point layers*/
class QgsMapToolRotatePointSymbols: public QgsMapToolEdit
class APP_EXPORT QgsMapToolRotatePointSymbols: public QgsMapToolEdit
{
Q_OBJECT

View File

@ -21,7 +21,7 @@
class QgsMapCanvas;
class QMouseEvent;
class QgsMapToolSelect : public QgsMapTool
class APP_EXPORT QgsMapToolSelect : public QgsMapTool
{
Q_OBJECT
public:

View File

@ -22,7 +22,7 @@ class QgsMapCanvas;
class QgsRubberBand;
class QgsMapToolSelectFreehand : public QgsMapTool
class APP_EXPORT QgsMapToolSelectFreehand : public QgsMapTool
{
Q_OBJECT
public:

View File

@ -22,7 +22,7 @@ class QgsMapCanvas;
class QgsRubberBand;
class QgsMapToolSelectPolygon : public QgsMapTool
class APP_EXPORT QgsMapToolSelectPolygon : public QgsMapTool
{
Q_OBJECT
public:

View File

@ -24,7 +24,7 @@ class QgsMapCanvas;
class QgsRubberBand;
class QgsMapToolSelectRadius : public QgsMapTool
class APP_EXPORT QgsMapToolSelectRadius : public QgsMapTool
{
Q_OBJECT
public:

View File

@ -28,7 +28,7 @@ class QgsGeometry;
class QgsRubberBand;
class QgsMapToolSelectRectangle : public QgsMapTool
class APP_EXPORT QgsMapToolSelectRectangle : public QgsMapTool
{
Q_OBJECT
public:

View File

@ -23,7 +23,7 @@
/**A map tool for showing or hidding a feature's label*/
class QgsMapToolShowHideLabels : public QgsMapToolLabel
class APP_EXPORT QgsMapToolShowHideLabels : public QgsMapToolLabel
{
Q_OBJECT

View File

@ -25,7 +25,7 @@
class QgsRubberBand;
class QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
class APP_EXPORT QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
{
Q_OBJECT
@ -52,7 +52,7 @@ class QgsSimplifyDialog : public QDialog, private Ui::SimplifyLineDialog
/** Map tool to simplify line/polygon features */
class QgsMapToolSimplify: public QgsMapToolEdit
class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit
{
Q_OBJECT
@ -106,7 +106,7 @@ class QgsMapToolSimplify: public QgsMapToolEdit
/**
Implementation of Douglas-Peucker simplification algorithm.
*/
class QgsSimplifyFeature
class APP_EXPORT QgsSimplifyFeature
{
/** structure for one entry in stack for simplification algorithm */
struct StackEntry

View File

@ -19,7 +19,7 @@
#include "qgsmaptoolcapture.h"
/**A map tool that draws a line and splits the features cut by the line*/
class QgsMapToolSplitFeatures: public QgsMapToolCapture
class APP_EXPORT QgsMapToolSplitFeatures: public QgsMapToolCapture
{
Q_OBJECT
public:

View File

@ -20,7 +20,7 @@
#include "qgsmaptoolannotation.h"
class QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
class APP_EXPORT QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
{
public:
QgsMapToolSvgAnnotation( QgsMapCanvas* canvas );

View File

@ -20,7 +20,7 @@
#include "qgsmaptoolannotation.h"
class QgsMapToolTextAnnotation: public QgsMapToolAnnotation
class APP_EXPORT QgsMapToolTextAnnotation: public QgsMapToolAnnotation
{
public:
QgsMapToolTextAnnotation( QgsMapCanvas* canvas );

View File

@ -23,7 +23,7 @@
/**Base class for vertex manipulation tools.
Inherited by QgsMapToolMoveVertex, QgsMapToolAddVertex,
QgsMapToolDeleteVertex*/
class QgsMapToolVertexEdit: public QgsMapToolEdit
class APP_EXPORT QgsMapToolVertexEdit: public QgsMapToolEdit
{
Q_OBJECT

View File

@ -26,7 +26,7 @@
class QCloseEvent;
class QgsMeasureTool;
class QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
class APP_EXPORT QgsMeasureDialog : public QDialog, private Ui::QgsMeasureBase
{
Q_OBJECT

View File

@ -27,7 +27,7 @@ class QgsRubberBand;
class QgsMeasureTool : public QgsMapTool
class APP_EXPORT QgsMeasureTool : public QgsMapTool
{
Q_OBJECT

View File

@ -29,7 +29,7 @@ class QComboBox;
/**A dialog to insert the merge behaviour for attributes (e.g. for the union features editing tool)*/
class QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeAttributesDialogBase
class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeAttributesDialogBase
{
Q_OBJECT
public:

View File

@ -29,7 +29,7 @@ extern "C"
#include <spatialite.h>
}
class QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNewSpatialiteLayerDialogBase
class APP_EXPORT QgsNewSpatialiteLayerDialog: public QDialog, private Ui::QgsNewSpatialiteLayerDialogBase
{
Q_OBJECT

View File

@ -33,7 +33,7 @@
* \class QgsOptions
* \brief Set user options and preferences
*/
class QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOptionsBase
class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOptionsBase
{
Q_OBJECT
public:

View File

@ -27,7 +27,7 @@ class QPushButton;
/*!
* \brief Dialog to allow the user to set up how source fields are transformed to destination fields in copy/paste operations
*/
class QgsPasteTransformations : public QDialog, private Ui::QgsPasteTransformationsBase
class APP_EXPORT QgsPasteTransformations : public QDialog, private Ui::QgsPasteTransformationsBase
{
Q_OBJECT

View File

@ -26,7 +26,7 @@ class QgisPlugin;
* the instantiated object. This allows the plugin manager to tell the plugin to
* unload itself.
*/
class QgsPluginMetadata
class APP_EXPORT QgsPluginMetadata
{
public:
QgsPluginMetadata( QString _libraryPath, QString _name, QgisPlugin *_plugin );

View File

@ -20,8 +20,8 @@
#define QGSPLUGINREGISTRY_H
#include <QMap>
#include "qgspluginmetadata.h"
class QgsPluginMetadata;
class QgsPythonUtils;
class QgisPlugin;
class QgisInterface;
@ -36,7 +36,7 @@ class QString;
* - C++ plugins: base name of plugin library, e.g. libgrassplugin
* - Python plugins: module name (directory) of plugin, e.g. db_manager
*/
class QgsPluginRegistry
class APP_EXPORT QgsPluginRegistry
{
public:
//! Returns the instance pointer, creating the object on the first call

View File

@ -21,7 +21,7 @@
#include <QPixmap>
/**An item that shows a rotated point symbol (e.g. arrow) centered to a map location together with a text displaying the rotation value*/
class QgsPointRotationItem: public QgsMapCanvasItem
class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem
{
public:

View File

@ -21,7 +21,7 @@
class QDomElement;
/**A dialog to select layers and groups from a qgs project*/
class QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProjectLayerGroupDialogBase
class APP_EXPORT QgsProjectLayerGroupDialog: public QDialog, private Ui::QgsProjectLayerGroupDialogBase
{
Q_OBJECT
public:

View File

@ -31,7 +31,7 @@ class QgsStyleV2;
@note actual state is stored in QgsProject singleton instance
*/
class QgsProjectProperties : public QgsOptionsDialogBase, private Ui::QgsProjectPropertiesBase
class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui::QgsProjectPropertiesBase
{
Q_OBJECT

View File

@ -22,7 +22,7 @@
#include "qgsrastercalculator.h"
/**A dialog to enter a raster calculation expression*/
class QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
class APP_EXPORT QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
{
Q_OBJECT
public:

View File

@ -38,7 +38,7 @@ class QgsRasterHistogramWidget;
*@author Tim Sutton
*/
class QgsRasterLayerProperties : public QgsOptionsDialogBase, private Ui::QgsRasterLayerPropertiesBase
class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private Ui::QgsRasterLayerPropertiesBase
{
Q_OBJECT

Some files were not shown because too many files have changed in this diff Show More