sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add overrides (part 3)

Browse Source
This commit is contained in:
Nyall Dawson 2015-01-19 16:14:37 +11:00
parent 62612bd81b
commit cb409f7f6d
40 changed files with 331 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/composer/qgscomposerlegendwidget.cpp
View File

@ -49,7 +49,7 @@ class QgsComposerLegendMenuProvider : public QObject, public QgsLayerTreeViewMen
public:
QgsComposerLegendMenuProvider( QgsLayerTreeView* view, QgsComposerLegendWidget* w ) : mView( view ), mWidget( w ) {}
virtual QMenu* createContextMenu()
virtual QMenu* createContextMenu() override
{
if ( !mView->currentNode() )
return 0;

2
src/customwidgets/qgiscustomwidgets.h
View File

@ -32,7 +32,7 @@ class QgisCustomWidgets : public QObject, public QDesignerCustomWidgetCollection
public:
explicit QgisCustomWidgets( QObject *parent = 0 );
virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const override;
static QString groupName() { return tr( "QGIS custom widgets" ); }

22
src/customwidgets/qgscollapsiblegroupboxplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSCOLLAPSIBLEGROUPBOXPLUGIN_H

22
src/customwidgets/qgscolorbuttonplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsColorButtonPlugin : public QObject, public QDesign
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSCOLORBUTTONPLUGIN_H

22
src/customwidgets/qgscolorbuttonv2plugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsColorButtonV2Plugin : public QObject, public QDesi
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSCOLORBUTTONV2PLUGIN_H

22
src/customwidgets/qgsdatadefinedbuttonplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsDataDefinedButtonPlugin : public QObject, public Q
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSDATADEFINEDBUTTONPLUGIN_H

22
src/customwidgets/qgsdatetimeeditplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsDateTimeEditPlugin : public QObject, public QDesig
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSDATETIMEEDITPLUGIN_H

22
src/customwidgets/qgsdoublespinboxplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsDoubleSpinBoxPlugin : public QObject, public QDesi
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSDOUBLESPINBOXPLUGIN_H

22
src/customwidgets/qgsfieldcomboboxplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsFieldComboBoxPlugin : public QObject, public QDesi
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSFIELDCOMBOBOXPLUGIN_H

22
src/customwidgets/qgsfieldexpressionwidgetplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsFieldExpressionWidgetPlugin : public QObject, publ
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSFIELDEXPRESSIONWIDGETPLUGIN_H

22
src/customwidgets/qgsfilterlineeditplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsFilterLineEditPlugin : public QObject, public QDes
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSFILTERLINEEDITPLUGIN_H

22
src/customwidgets/qgsmaplayercomboboxplugin.h
View File

@ -33,17 +33,17 @@ class CUSTOMWIDGETS_EXPORT QgsMapLayerComboBoxPlugin : public QObject, public QD
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSMAPLAYERCOMBOBOXPLUGIN_H

22
src/customwidgets/qgsprojectionselectionwidgetplugin.h
View File

@ -33,17 +33,17 @@ class CUSTOMWIDGETS_EXPORT QgsProjectionSelectionWidgetPlugin : public QObject,
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSPROJECTIONSELECTIONWIDGETPLUGIN_H

22
src/customwidgets/qgsrelationeditorwidgetplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsRelationEditorWidgetPlugin : public QObject, publi
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSRELATIONEDITORWIDGETPLUGIN_H

22
src/customwidgets/qgsrelationreferencewidgetplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsRelationReferenceWidgetPlugin : public QObject, pu
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSRELATIONREFERENCEWIDGETPLUGIN_H

22
src/customwidgets/qgsscalerangewidgetplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QD
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSSCALERANGEWIDGETPLUGIN_H

22
src/customwidgets/qgsscalewidgetplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsScaleWidgetPlugin : public QObject, public QDesign
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSSCALEWIDGETPLUGIN_H

22
src/customwidgets/qgsspinboxplugin.h
View File

@ -33,16 +33,16 @@ class CUSTOMWIDGETS_EXPORT QgsSpinBoxPlugin : public QObject, public QDesignerCu
// QDesignerCustomWidgetInterface interface
public:
QString name() const;
QString group() const;
QString includeFile() const;
QIcon icon() const;
bool isContainer() const;
QWidget *createWidget( QWidget *parent );
bool isInitialized() const;
void initialize( QDesignerFormEditorInterface *core );
QString toolTip() const;
QString whatsThis() const;
QString domXml() const;
QString name() const override;
QString group() const override;
QString includeFile() const override;
QIcon icon() const override;
bool isContainer() const override;
QWidget *createWidget( QWidget *parent ) override;
bool isInitialized() const override;
void initialize( QDesignerFormEditorInterface *core ) override;
QString toolTip() const override;
QString whatsThis() const override;
QString domXml() const override;
};
#endif // QGSSPINBOXPLUGIN_H

2
src/gui/qgsmapcanvas.h
View File

@ -520,7 +520,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
protected:
#ifdef HAVE_TOUCH
//! Overridden standard event to be gestures aware
bool event( QEvent * e );
bool event( QEvent * e ) override;
#endif
//! Overridden key press event

14
src/gui/qgsmaptooltouch.h
View File

@ -35,21 +35,21 @@ class GUI_EXPORT QgsMapToolTouch : public QgsMapTool
~QgsMapToolTouch();
void activate();
void deactivate();
void activate() override;
void deactivate() override;
//! Overridden mouse move event
virtual void canvasMoveEvent( QMouseEvent * e );
virtual void canvasMoveEvent( QMouseEvent * e ) override;
//! Overridden mouse release event
virtual void canvasReleaseEvent( QMouseEvent * e );
virtual void canvasReleaseEvent( QMouseEvent * e ) override;
//! Overridden Mouse double click event.
virtual void canvasDoubleClickEvent( QMouseEvent * e );
virtual void canvasDoubleClickEvent( QMouseEvent * e ) override;
virtual bool isTransient() { return true; }
virtual bool isTransient() override { return true; }
bool gestureEvent( QGestureEvent *event );
bool gestureEvent( QGestureEvent *event ) override;
private:

12
src/plugins/globe/globe_plugin.cpp
View File

@ -166,7 +166,7 @@ GlobePlugin::~GlobePlugin()
struct PanControlHandler : public NavigationControlHandler
{
PanControlHandler( osgEarth::Util::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ )
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ ) override
{
_manip->pan( _dx, _dy );
}
@ -179,7 +179,7 @@ private:
struct RotateControlHandler : public NavigationControlHandler
{
RotateControlHandler( osgEarth::Util::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ )
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ ) override
{
if ( 0 == _dx && 0 == _dy )
{
@ -199,7 +199,7 @@ private:
struct ZoomControlHandler : public NavigationControlHandler
{
ZoomControlHandler( osgEarth::Util::EarthManipulator* manip, double dx, double dy ) : _manip( manip ), _dx( dx ), _dy( dy ) { }
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ )
virtual void onMouseDown( Control* /*control*/, int /*mouseButtonMask*/ ) override
{
_manip->zoom( _dx, _dy );
}
@ -212,7 +212,7 @@ private:
struct HomeControlHandler : public NavigationControlHandler
{
HomeControlHandler( osgEarth::Util::EarthManipulator* manip ) : _manip( manip ) { }
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) override
{
_manip->home( ea, aa );
}
@ -223,7 +223,7 @@ private:
struct RefreshControlHandler : public ControlEventHandler
{
RefreshControlHandler( GlobePlugin* globe ) : mGlobe( globe ) { }
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/ )
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/ ) override
{
mGlobe->imageLayersChanged();
}
@ -234,7 +234,7 @@ private:
struct SyncExtentControlHandler : public ControlEventHandler
{
SyncExtentControlHandler( GlobePlugin* globe ) : mGlobe( globe ) { }
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/ )
virtual void onClick( Control* /*control*/, int /*mouseButtonMask*/ ) override
{
mGlobe->syncExtent();
}

12
src/plugins/globe/globe_plugin.h
View File

@ -68,7 +68,7 @@ class GlobePlugin : public QObject, public QgisPlugin
public slots:
//! init the gui
virtual void initGui();
virtual void initGui() override;
//! Show the dialog box
void run();
//! Show the settings dialog box
@ -76,7 +76,7 @@ class GlobePlugin : public QObject, public QgisPlugin
//! Reset globe
void reset();
//! unload the plugin
void unload();
void unload() override;
//! show the help document
void help();
@ -198,7 +198,7 @@ class FlyToExtentHandler : public osgGA::GUIEventHandler
public:
FlyToExtentHandler( GlobePlugin* globe ) : mGlobe( globe ) { }
bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );
bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) override;
private:
GlobePlugin* mGlobe;
@ -231,7 +231,7 @@ class KeyboardControlHandler : public osgGA::GUIEventHandler
public:
KeyboardControlHandler( osgEarth::Util::EarthManipulator* manip ) : _manip( manip ) { }
bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );
bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) override;
private:
osg::observer_ptr<osgEarth::Util::EarthManipulator> _manip;
@ -253,7 +253,7 @@ namespace osgEarth
public:
virtual void onMouseDown( class Control* control, int mouseButtonMask ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); }
virtual void onClick( class Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); Q_UNUSED( ea ); Q_UNUSED( aa ); }
virtual void onClick( class Control* control, int mouseButtonMask ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); }
virtual void onClick( class Control* control, int mouseButtonMask ) override { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); }
};
class NavigationControl : public ImageControl
@ -262,7 +262,7 @@ namespace osgEarth
NavigationControl( osg::Image* image = 0L ) : ImageControl( image ), _mouse_down_event( NULL ) {}
protected:
virtual bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, ControlContext& cx );
virtual bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, ControlContext& cx ) override;
private:
osg::ref_ptr<const osgGA::GUIEventAdapter> _mouse_down_event;

8
src/plugins/globe/qgsosgearthtilesource.h
View File

@ -45,9 +45,9 @@ namespace osgEarth
void initialize( const std::string& referenceURI, const Profile* overrideProfile = NULL );
osg::Image* createImage( const TileKey& key, ProgressCallback* progress );
osg::Image* createImage( const TileKey& key, ProgressCallback* progress ) override;
virtual osg::HeightField* createHeightField( const TileKey &key, ProgressCallback* progress )
virtual osg::HeightField* createHeightField( const TileKey &key, ProgressCallback* progress ) override
{
Q_UNUSED( key );
Q_UNUSED( progress );
@ -56,11 +56,11 @@ namespace osgEarth
return NULL;
}
virtual std::string getExtension() const
virtual std::string getExtension() const override
{
//All QGIS tiles are in JPEG format
return "jpg";
}
}
virtual bool supportsPersistentCaching() const
{

4
src/python/qgspythonutilsimpl.h
View File

@ -41,8 +41,8 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
#ifdef HAVE_SERVER_PYTHON_PLUGINS
//! initialize python for server and import bindings
void initServerPython( QgsServerInterface* interface );
bool startServerPlugin( QString packageName );
void initServerPython( QgsServerInterface* interface ) override;
bool startServerPlugin( QString packageName ) override;
#endif
//! close python interpreter

2
src/server/qgsgetrequesthandler.h
View File

@ -26,7 +26,7 @@ class QgsGetRequestHandler: public QgsHttpRequestHandler
{
public:
QgsGetRequestHandler();
void parseInput();
void parseInput() override;
};
#endif

2
src/server/qgshostedrdsbuilder.h
View File

@ -26,7 +26,7 @@ class QgsHostedRDSBuilder: public QgsMSLayerBuilder
QgsHostedRDSBuilder();
~QgsHostedRDSBuilder();
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
};
#endif

2
src/server/qgshostedvdsbuilder.h
View File

@ -25,7 +25,7 @@ class QgsHostedVDSBuilder: public QgsMSLayerBuilder
public:
QgsHostedVDSBuilder();
~QgsHostedVDSBuilder();
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
};
#endif

52
src/server/qgshttprequesthandler.h
View File

@ -35,36 +35,36 @@ class QgsHttpRequestHandler: public QgsRequestHandler
QgsHttpRequestHandler();
~QgsHttpRequestHandler();
virtual void setGetMapResponse( const QString& service, QImage* img, int imageQuality );
virtual void setGetCapabilitiesResponse( const QDomDocument& doc );
virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat );
virtual void setServiceException( QgsMapServiceException ex );
virtual void setXmlResponse( const QDomDocument& doc );
virtual void setXmlResponse( const QDomDocument& doc, const QString& mimeType );
virtual void setGetPrintResponse( QByteArray* ba );
virtual bool startGetFeatureResponse( QByteArray* ba, const QString& infoFormat );
virtual void setGetFeatureResponse( QByteArray* ba );
virtual void endGetFeatureResponse( QByteArray* ba );
virtual void setGetCoverageResponse( QByteArray* ba );
virtual void setGetMapResponse( const QString& service, QImage* img, int imageQuality ) override;
virtual void setGetCapabilitiesResponse( const QDomDocument& doc ) override;
virtual void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) override;
virtual void setServiceException( QgsMapServiceException ex ) override;
virtual void setXmlResponse( const QDomDocument& doc ) override;
virtual void setXmlResponse( const QDomDocument& doc, const QString& mimeType ) override;
virtual void setGetPrintResponse( QByteArray* ba ) override;
virtual bool startGetFeatureResponse( QByteArray* ba, const QString& infoFormat ) override;
virtual void setGetFeatureResponse( QByteArray* ba ) override;
virtual void endGetFeatureResponse( QByteArray* ba ) override;
virtual void setGetCoverageResponse( QByteArray* ba ) override;
/**Send out HTTP headers and flush output buffer*/
virtual void sendResponse();
virtual void setHeader( const QString &name, const QString &value );
virtual int removeHeader( const QString &name );
virtual void clearHeaders( );
virtual void appendBody( const QByteArray &body );
virtual void clearBody( );
virtual void setInfoFormat( const QString &format );
virtual bool responseReady() const;
virtual bool exceptionRaised() const;
virtual void setParameter( const QString &key, const QString &value );
virtual QString parameter( const QString &key ) const;
virtual int removeParameter( const QString &key );
virtual void sendResponse() override;
virtual void setHeader( const QString &name, const QString &value ) override;
virtual int removeHeader( const QString &name ) override;
virtual void clearHeaders( ) override;
virtual void appendBody( const QByteArray &body ) override;
virtual void clearBody( ) override;
virtual void setInfoFormat( const QString &format ) override;
virtual bool responseReady() const override;
virtual bool exceptionRaised() const override;
virtual void setParameter( const QString &key, const QString &value ) override;
virtual QString parameter( const QString &key ) const override;
virtual int removeParameter( const QString &key ) override;
#ifdef HAVE_SERVER_PYTHON_PLUGINS
virtual void setPluginFilters( QgsServerFiltersMap pluginFilters );
virtual void setPluginFilters( QgsServerFiltersMap pluginFilters ) override;
#endif
protected:
virtual void sendHeaders( );
virtual void sendBody( ) const;
virtual void sendHeaders( ) override;
virtual void sendBody( ) const override;
void setHttpResponse( QByteArray *ba, const QString &format );
/**Converts format to official mimetype (e.g. 'jpg' to 'image/jpeg')
@return mime string (or the entered string if not found)*/

2
src/server/qgsinterpolationlayerbuilder.h
View File

@ -35,7 +35,7 @@ class QgsInterpolationLayerBuilder: public QgsMSLayerBuilder
@param layersToRemove list to append layers that should be removed after the request
@param allowCaching flag if layers are allowed to be fetched from layer cache or not
@return the created layer or 0 in case of error*/
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
private:
QgsInterpolationLayerBuilder(); //forbidden

2
src/server/qgspostrequesthandler.h
View File

@ -28,7 +28,7 @@ class QgsPostRequestHandler: public QgsHttpRequestHandler
~QgsPostRequestHandler();
/**Parses the input and creates a request neutral Parameter/Value map*/
void parseInput();
void parseInput() override;
};
#endif // QGSPOSTREQUESTHANDLER_H

2
src/server/qgsremotedatasourcebuilder.h
View File

@ -28,7 +28,7 @@ class QgsRemoteDataSourceBuilder: public QgsMSLayerBuilder
public:
QgsRemoteDataSourceBuilder();
~QgsRemoteDataSourceBuilder();
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
private:
/**Creates a raster layer from a <RemoteRDS>. This function loads the data into a temporary file and creates a rasterlayer from it. Returns a 0 pointer in case of error*/

2
src/server/qgsremoteowsbuilder.h
View File

@ -31,7 +31,7 @@ class QgsRemoteOWSBuilder: public QgsMSLayerBuilder
QgsRemoteOWSBuilder( const QMap<QString, QString>& parameterMap );
~QgsRemoteOWSBuilder();
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
private:
QgsRemoteOWSBuilder(); //forbidden

2
src/server/qgssentdatasourcebuilder.h
View File

@ -36,7 +36,7 @@ class QgsSentDataSourceBuilder: public QgsMSLayerBuilder
@param layersToRemove list to append layers that should be removed after the request
@param allowCaching flag if layers are allowed to be fetched from layer cache or not
@return the created layer or 0 in case of error*/
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const;
QgsMapLayer* createMapLayer( const QDomElement& elem, const QString& layerName, QList<QTemporaryFile*>& filesToRemove, QList<QgsMapLayer*>& layersToRemove, bool allowCaching = true ) const override;
private:
/**Creates a vector layer from a <SentVDS> tag. Returns a 0 pointer in case of error*/

12
src/server/qgsserverinterfaceimpl.h
View File

@ -44,12 +44,12 @@ class QgsServerInterfaceImpl : public QgsServerInterface
/** Destructor */
~QgsServerInterfaceImpl();
void setRequestHandler( QgsRequestHandler* requestHandler );
QgsCapabilitiesCache* capabiblitiesCache() { return mCapabilitiesCache; }
QgsRequestHandler* requestHandler( ) { return mRequestHandler; }
void registerFilter( QgsServerFilter *filter, int priority = 0 );
QgsServerFiltersMap filters( ) { return mFilters; }
QString getEnv( const QString& name ) const;
void setRequestHandler( QgsRequestHandler* requestHandler ) override;
QgsCapabilitiesCache* capabiblitiesCache() override { return mCapabilitiesCache; }
QgsRequestHandler* requestHandler( ) override { return mRequestHandler; }
void registerFilter( QgsServerFilter *filter, int priority = 0 ) override;
QgsServerFiltersMap filters( ) override { return mFilters; }
QString getEnv( const QString& name ) const override;
private:

78
src/server/qgssldconfigparser.h
View File

@ -38,68 +38,68 @@ class QgsSLDConfigParser : public QgsWMSConfigParser
/**Adds layer and style specific capabilities elements to the parent node. This includes the individual layers and styles, their description, native CRS, bounding boxes, etc.
@param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/
void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings = false ) const;
void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings = false ) const override;
/**Returns one or possibly several maplayers for a given layer name and style. If no layers/style are found, an empty list is returned*/
QList<QgsMapLayer*> mapLayerFromStyle( const QString& lName, const QString& styleName, bool useCache = true ) const;
QList<QgsMapLayer*> mapLayerFromStyle( const QString& lName, const QString& styleName, bool useCache = true ) const override;
/**Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/
int layersAndStyles( QStringList& layers, QStringList& styles ) const;
int layersAndStyles( QStringList& layers, QStringList& styles ) const override;
/**Returns the xml fragment of a style*/
QDomDocument getStyle( const QString& styleName, const QString& layerName ) const;
QDomDocument getStyle( const QString& styleName, const QString& layerName ) const override;
/**Returns the xml fragment of layers styles*/
QDomDocument getStyles( QStringList& layerList ) const;
QDomDocument getStyles( QStringList& layerList ) const override;
/**Returns if output are MM or PIXEL*/
QgsMapRenderer::OutputUnits outputUnits() const;
QgsMapRenderer::OutputUnits outputUnits() const override;
/**Returns an ID-list of layers which are not queryable (comes from <properties> -> <Identify> -> <disabledLayers in the project file*/
QStringList identifyDisabledLayers() const;
QStringList identifyDisabledLayers() const override;
/**True if the feature info response should contain the wkt geometry for vector features*/
bool featureInfoWithWktGeometry() const;
bool featureInfoWithWktGeometry() const override;
/**Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
QHash<QString, QString> featureInfoLayerAliasMap() const;
QHash<QString, QString> featureInfoLayerAliasMap() const override;
QString featureInfoDocumentElement( const QString& defaultValue ) const;
QString featureInfoDocumentElement( const QString& defaultValue ) const override;
QString featureInfoDocumentElementNS() const;
QString featureInfoDocumentElementNS() const override;
QString featureInfoSchema() const;
QString featureInfoSchema() const override;
/**Return feature info in format SIA2045?*/
bool featureInfoFormatSIA2045() const;
bool featureInfoFormatSIA2045() const override;
/**Draw text annotation items from the QGIS projectfile*/
void drawOverlays( QPainter* p, int dpi, int width, int height ) const;
void drawOverlays( QPainter* p, int dpi, int width, int height ) const override;
/**Load PAL engine settings from projectfile*/
void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const;
void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const override;
QString serviceUrl() const;
QString serviceUrl() const override;
QStringList wfsLayerNames() const;
QStringList wfsLayerNames() const override;
void owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const;
void owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const override;
//legend
double legendBoxSpace() const;
double legendLayerSpace() const;
double legendLayerTitleSpace() const;
double legendSymbolSpace() const;
double legendIconLabelSpace() const;
double legendSymbolWidth() const;
double legendSymbolHeight() const;
const QFont& legendLayerFont() const;
const QFont& legendItemFont() const;
double legendBoxSpace() const override;
double legendLayerSpace() const override;
double legendLayerTitleSpace() const override;
double legendSymbolSpace() const override;
double legendIconLabelSpace() const override;
double legendSymbolWidth() const override;
double legendSymbolHeight() const override;
const QFont& legendLayerFont() const override;
const QFont& legendItemFont() const override;
double maxWidth() const;
double maxHeight() const;
double imageQuality() const;
int WMSPrecision() const;
double maxWidth() const override;
double maxHeight() const override;
double imageQuality() const override;
int WMSPrecision() const override;
//printing
@ -107,19 +107,19 @@ class QgsSLDConfigParser : public QgsWMSConfigParser
QgsComposition* createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const;
/**Creates a composition from the project file (probably delegated to the fallback parser)*/
QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const;
QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap*>& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const override;
/**Adds print capabilities to xml document. ParentElem usually is the <Capabilities> element*/
void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const override;
void setScaleDenominator( double denom );
void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc );
void setScaleDenominator( double denom ) override;
void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) override;
QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const;
QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const override;
int nLayers() const;
int nLayers() const override;
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const override;
private:
@ -189,7 +189,7 @@ class QgsSLDConfigParser : public QgsWMSConfigParser
/**Reads attributes "epsg" or "proj" from layer element and sets specified CRS if present*/
void setCrsForLayer( const QDomElement& layerElem, QgsMapLayer* ml ) const;
bool useLayerIDs() const { return false; }
bool useLayerIDs() const override { return false; }
};
#endif // QGSSLDCONFIGPARSER_H

10
src/server/qgssoaprequesthandler.h
View File

@ -28,13 +28,13 @@ class QgsSOAPRequestHandler: public QgsHttpRequestHandler
public:
QgsSOAPRequestHandler();
~QgsSOAPRequestHandler();
void parseInput();
void parseInput() override;
void setGetMapResponse( const QString& service, QImage* img );
void setGetCapabilitiesResponse( const QDomDocument& doc );
void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat );
void setGetCapabilitiesResponse( const QDomDocument& doc ) override;
void setGetFeatureInfoResponse( const QDomDocument& infoDoc, const QString& infoFormat ) override;
void setServiceException( const QgsMapServiceException& ex );
void setXmlResponse( const QDomDocument& doc );
void setXmlResponse( const QDomDocument& doc, const QString& mimeType );
void setXmlResponse( const QDomDocument& doc ) override;
void setXmlResponse( const QDomDocument& doc, const QString& mimeType ) override;
void setGetPrintResponse( QByteArray* ba ) const;
private:
/**Parses the xml of a getMap request and fills the parameters into the map. Returns 0 in case of success*/

2
src/server/qgswcsserver.h
View File

@ -40,7 +40,7 @@ class QgsWCSServer: public QgsOWSServer
QgsRequestHandler* rh );
~QgsWCSServer();
void executeRequest();
void executeRequest() override;
/**Returns an XML file with the capabilities description (as described in the WFS specs)*/
QDomDocument getCapabilities();

2
src/server/qgswfsserver.h
View File

@ -64,7 +64,7 @@ class QgsWFSServer: public QgsOWSServer
QgsRequestHandler* rh );
~QgsWFSServer();
void executeRequest();
void executeRequest() override;
/**Returns an XML file with the capabilities description (as described in the WFS specs)*/
QDomDocument getCapabilities();

80
src/server/qgswmsprojectparser.h
View File

@ -33,81 +33,81 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
/**Adds layer and style specific capabilities elements to the parent node. This includes the individual layers and styles, their description, native CRS, bounding boxes, etc.
@param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/
void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings = false ) const;
void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings = false ) const override;
QList<QgsMapLayer*> mapLayerFromStyle( const QString& lName, const QString& styleName, bool useCache = true ) const;
QList<QgsMapLayer*> mapLayerFromStyle( const QString& lName, const QString& styleName, bool useCache = true ) const override;
QString serviceUrl() const;
QString serviceUrl() const override;
QStringList wfsLayerNames() const;
QStringList wfsLayerNames() const override;
void owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const;
void owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const override;
//legend
double legendBoxSpace() const;
double legendLayerSpace() const;
double legendLayerTitleSpace() const;
double legendSymbolSpace() const;
double legendIconLabelSpace() const;
double legendSymbolWidth() const;
double legendSymbolHeight() const;
const QFont& legendLayerFont() const;
const QFont& legendItemFont() const;
double legendBoxSpace() const override;
double legendLayerSpace() const override;
double legendLayerTitleSpace() const override;
double legendSymbolSpace() const override;
double legendIconLabelSpace() const override;
double legendSymbolWidth() const override;
double legendSymbolHeight() const override;
const QFont& legendLayerFont() const override;
const QFont& legendItemFont() const override;
double maxWidth() const;
double maxHeight() const;
double imageQuality() const;
int WMSPrecision() const;
double maxWidth() const override;
double maxHeight() const override;
double imageQuality() const override;
int WMSPrecision() const override;
//printing
QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap* >& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const;
QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap* >& mapList, QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const override;
void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
void printCapabilities( QDomElement& parentElement, QDomDocument& doc ) const override;
//todo: fixme
void setScaleDenominator( double ) {}
void addExternalGMLData( const QString&, QDomDocument* ) {}
void setScaleDenominator( double ) override {}
void addExternalGMLData( const QString&, QDomDocument* ) override {}
QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const;
QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const override;
/**Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/
int layersAndStyles( QStringList& layers, QStringList& styles ) const;
int layersAndStyles( QStringList& layers, QStringList& styles ) const override;
/**Returns the xml fragment of a style*/
QDomDocument getStyle( const QString& styleName, const QString& layerName ) const;
QDomDocument getStyle( const QString& styleName, const QString& layerName ) const override;
/**Returns the xml fragment of layers styles*/
QDomDocument getStyles( QStringList& layerList ) const;
QDomDocument getStyles( QStringList& layerList ) const override;
/**Returns if output are MM or PIXEL*/
QgsMapRenderer::OutputUnits outputUnits() const;
QgsMapRenderer::OutputUnits outputUnits() const override;
/**True if the feature info response should contain the wkt geometry for vector features*/
bool featureInfoWithWktGeometry() const;
bool featureInfoWithWktGeometry() const override;
/**Returns map with layer aliases for GetFeatureInfo (or 0 pointer if not supported). Key: layer name, Value: layer alias*/
QHash<QString, QString> featureInfoLayerAliasMap() const;
QHash<QString, QString> featureInfoLayerAliasMap() const override;
QString featureInfoDocumentElement( const QString& defaultValue ) const;
QString featureInfoDocumentElement( const QString& defaultValue ) const override;
QString featureInfoDocumentElementNS() const;
QString featureInfoDocumentElementNS() const override;
QString featureInfoSchema() const;
QString featureInfoSchema() const override;
/**Return feature info in format SIA2045?*/
bool featureInfoFormatSIA2045() const;
bool featureInfoFormatSIA2045() const override;
/**Draw text annotation items from the QGIS projectfile*/
void drawOverlays( QPainter* p, int dpi, int width, int height ) const;
void drawOverlays( QPainter* p, int dpi, int width, int height ) const override;
/**Load PAL engine settings from projectfile*/
void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const;
void loadLabelSettings( QgsLabelingEngineInterface* lbl ) const override;
int nLayers() const;
int nLayers() const override;
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const override;
bool useLayerIDs() const { return mProjectParser->useLayerIDs(); }
bool useLayerIDs() const override { return mProjectParser->useLayerIDs(); }
private:
QgsServerProjectParser* mProjectParser;
@ -121,7 +121,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
QList< QPair< QSvgRenderer*, QDomElement > > mSvgAnnotationElems;
/**Returns an ID-list of layers which are not queryable (comes from <properties> -> <Identify> -> <disabledLayers in the project file*/
virtual QStringList identifyDisabledLayers() const;
virtual QStringList identifyDisabledLayers() const override;
/**Reads layer drawing order from the legend section of the project file and appends it to the parent elemen (usually the <Capability> element)*/
void addDrawingOrder( QDomElement& parentElem, QDomDocument& doc ) const;
@ -132,7 +132,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
/**Adds drawing order info from embedded layer element or embedded group element (recursive)*/
void addDrawingOrderEmbeddedGroup( QDomElement groupElem, bool useDrawingOrder, QMap<int, QString>& orderedLayerList ) const;
void addLayerStyles(QgsMapLayer* currentLayer, QDomDocument& doc, QDomElement& layerElem, const QString& version ) const;
void addLayerStyles( QgsMapLayer* currentLayer, QDomDocument& doc, QDomElement& layerElem, const QString& version ) const;
void addLayers( QDomDocument &doc,
QDomElement &parentLayer,

2
src/server/qgswmsserver.h
View File

@ -65,7 +65,7 @@ class QgsWMSServer: public QgsOWSServer
QgsMapRenderer* renderer, QgsCapabilitiesCache* capCache );
~QgsWMSServer();
void executeRequest();
void executeRequest() override;
/**Returns an XML file with the capabilities description (as described in the WMS specs)
@param version WMS version (1.1.1 or 1.3.0)