Skip to content
Permalink
Browse files

Merge pull request #4514 from nyalldawson/gui_instance

Make a new global QgsGui singleton
  • Loading branch information
nyalldawson committed May 14, 2017
2 parents c3c694f + a8b10a2 commit f8f7d60cf0ac01bc36ccf1a5d038cce449034aad
Showing with 650 additions and 431 deletions.
  1. +1 −1 cmake/FindQGIS.cmake
  2. +22 −3 doc/api_break.dox
  3. +8 −11 python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
  4. +1 −0 python/gui/gui.sip
  5. +1 −6 python/gui/layertree/qgslayertreeembeddedwidgetregistry.sip
  6. +1 −1 python/gui/qgsbusyindicatordialog.sip
  7. +1 −1 python/gui/qgscharacterselectdialog.sip
  8. +1 −1 python/gui/qgscolordialog.sip
  9. +1 −1 python/gui/qgscredentialdialog.sip
  10. +1 −1 python/gui/qgsdialog.sip
  11. +2 −2 python/gui/qgserrordialog.sip
  12. +1 −1 python/gui/qgsgroupwmsdatadialog.sip
  13. +70 −0 python/gui/qgsgui.sip
  14. +1 −1 python/gui/qgsludialog.sip
  15. +2 −6 python/gui/qgsmaplayeractionregistry.sip
  16. +1 −1 python/gui/qgsmessagelogviewer.sip
  17. +1 −1 python/gui/qgsmessageviewer.sip
  18. +1 −1 python/gui/qgsnewgeopackagelayerdialog.sip
  19. +1 −1 python/gui/qgsnewhttpconnection.sip
  20. +1 −1 python/gui/qgsnewmemorylayerdialog.sip
  21. +1 −1 python/gui/qgsnewnamedialog.sip
  22. +1 −1 python/gui/qgsnewvectorlayerdialog.sip
  23. +1 −1 python/gui/qgsowssourceselect.sip
  24. +1 −1 python/gui/qgsprojectionselectiondialog.sip
  25. +1 −1 python/gui/qgsquerybuilder.sip
  26. +1 −1 python/gui/qgssearchquerybuilder.sip
  27. +0 −3 python/gui/qgsshortcutsmanager.sip
  28. +1 −1 python/gui/qgstextformatwidget.sip
  29. +1 −1 python/gui/symbology-ng/qgssvgselectorwidget.sip
  30. +2 −2 src/app/composer/qgscomposer.cpp
  31. +3 −3 src/app/composer/qgscomposerattributetablewidget.cpp
  32. +2 −2 src/app/composer/qgscomposerlabelwidget.cpp
  33. +5 −5 src/app/composer/qgscomposerlegendwidget.cpp
  34. +1 −1 src/app/composer/qgscomposermapgridwidget.cpp
  35. +1 −1 src/app/composer/qgscomposermapwidget.cpp
  36. +2 −2 src/app/composer/qgscomposerscalebarwidget.cpp
  37. +2 −2 src/app/ogr/qgsnewogrconnection.h
  38. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.cpp
  39. +5 −5 src/app/ogr/qgsvectorlayersaveasdialog.cpp
  40. +2 −2 src/app/pluginmanager/qgspluginmanager.h
  41. +21 −20 src/app/qgisapp.cpp
  42. +3 −2 src/app/qgisappinterface.cpp
  43. +3 −3 src/app/qgsaddattrdialog.h
  44. +1 −1 src/app/qgsaddtaborgroup.h
  45. +4 −3 src/app/qgsattributetabledialog.cpp
  46. +3 −2 src/app/qgsattributetypedialog.cpp
  47. +2 −2 src/app/qgsdecorationgriddialog.cpp
  48. +2 −2 src/app/qgsdiagramproperties.cpp
  49. +4 −3 src/app/qgsfieldsproperties.cpp
  50. +2 −2 src/app/qgshandlebadlayers.cpp
  51. +7 −6 src/app/qgsidentifyresultsdialog.cpp
  52. +1 −1 src/app/qgsloadstylefromdbdialog.h
  53. +2 −2 src/app/qgsmapcanvasdockwidget.cpp
  54. +3 −2 src/app/qgsmaptoolfeatureaction.cpp
  55. +3 −2 src/app/qgsmergeattributesdialog.cpp
  56. +2 −2 src/app/qgsnewspatialitelayerdialog.h
  57. +2 −2 src/app/qgsoptions.cpp
  58. +2 −2 src/app/qgsoptions.h
  59. +4 −3 src/app/qgsprojectproperties.cpp
  60. +2 −2 src/app/qgsprojectproperties.h
  61. +2 −2 src/app/qgsrasterlayerproperties.h
  62. +1 −1 src/app/qgssavestyletodbdialog.h
  63. +3 −3 src/app/qgsstatusbarmagnifierwidget.cpp
  64. +2 −2 src/app/qgsvectorlayerproperties.h
  65. +0 −1 src/core/qgscoordinatereferencesystem.h
  66. +4 −2 src/gui/CMakeLists.txt
  67. +2 −2 src/gui/attributetable/qgsattributetabledelegate.cpp
  68. +3 −3 src/gui/attributetable/qgsattributetablemodel.cpp
  69. +4 −3 src/gui/attributetable/qgsattributetableview.cpp
  70. +3 −2 src/gui/attributetable/qgsdualview.cpp
  71. +2 −1 src/gui/editorwidgets/core/qgseditorwidgetautoconf.cpp
  72. +16 −24 src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
  73. +8 −10 src/gui/editorwidgets/core/qgseditorwidgetregistry.h
  74. +5 −5 src/gui/layertree/qgslayertreeembeddedconfigwidget.cpp
  75. +0 −7 src/gui/layertree/qgslayertreeembeddedwidgetregistry.cpp
  76. +10 −4 src/gui/layertree/qgslayertreeembeddedwidgetregistry.h
  77. +2 −1 src/gui/layertree/qgslayertreeview.cpp
  78. +3 −2 src/gui/qgsactionmenu.cpp
  79. +9 −8 src/gui/qgsattributeform.cpp
  80. +3 −2 src/gui/qgsattributeformeditorwidget.cpp
  81. +2 −2 src/gui/qgsbusyindicatordialog.h
  82. +2 −2 src/gui/qgscharacterselectdialog.h
  83. +1 −1 src/gui/qgscolordialog.h
  84. +1 −1 src/gui/qgscompoundcolorwidget.h
  85. +2 −1 src/gui/qgsconfigureshortcutsdialog.cpp
  86. +2 −2 src/gui/qgscredentialdialog.h
  87. +2 −2 src/gui/qgsdialog.h
  88. +3 −3 src/gui/qgserrordialog.h
  89. +2 −1 src/gui/qgsformannotation.cpp
  90. +2 −2 src/gui/qgsgroupwmsdatadialog.h
  91. +64 −0 src/gui/qgsgui.cpp
  92. +86 −0 src/gui/qgsgui.h
  93. +3 −3 src/gui/{qgisgui.cpp → qgsguiutils.cpp}
  94. +8 −8 src/gui/{qgisgui.h → qgsguiutils.h}
  95. +5 −6 src/gui/qgsidentifymenu.cpp
  96. +1 −1 src/gui/qgsidentifymenu.h
  97. +2 −2 src/gui/qgsludialog.h
  98. +2 −2 src/gui/qgsmapcanvas.cpp
  99. +2 −15 src/gui/qgsmaplayeractionregistry.cpp
  100. +12 −7 src/gui/qgsmaplayeractionregistry.h
  101. +1 −1 src/gui/qgsmessagebar.h
  102. +2 −2 src/gui/qgsmessagelogviewer.h
  103. +2 −2 src/gui/qgsmessageviewer.h
  104. +2 −2 src/gui/qgsnewgeopackagelayerdialog.h
  105. +2 −2 src/gui/qgsnewhttpconnection.h
  106. +2 −2 src/gui/qgsnewmemorylayerdialog.h
  107. +1 −1 src/gui/qgsnewnamedialog.h
  108. +2 −2 src/gui/qgsnewvectorlayerdialog.h
  109. +1 −1 src/gui/qgsoptionsdialogbase.h
  110. +2 −2 src/gui/qgsowssourceselect.h
  111. +2 −2 src/gui/qgsprojectionselectiondialog.h
  112. +2 −2 src/gui/qgsquerybuilder.h
  113. +2 −2 src/gui/qgssearchquerybuilder.h
  114. +0 −10 src/gui/qgsshortcutsmanager.cpp
  115. +4 −5 src/gui/qgsshortcutsmanager.h
  116. +2 −2 src/gui/qgssqlcomposerdialog.h
  117. +2 −2 src/gui/qgstextformatwidget.h
  118. +2 −2 src/gui/raster/qgsrasterhistogramwidget.cpp
  119. +1 −1 src/gui/symbology-ng/qgspointclusterrendererwidget.cpp
  120. +2 −2 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  121. +2 −2 src/gui/symbology-ng/qgssvgselectorwidget.h
  122. +1 −1 src/plugins/compass/qgscompassplugin.cpp
  123. +1 −1 src/plugins/coordinate_capture/coordinatecapture.cpp
  124. +3 −3 src/plugins/evis/evis.cpp
  125. +2 −2 src/plugins/globe/globe_plugin.cpp
  126. +2 −2 src/plugins/gps_importer/qgsgpsdevicedialog.cpp
  127. +2 −2 src/plugins/gps_importer/qgsgpsplugin.cpp
  128. +3 −3 src/plugins/offline_editing/offline_editing_plugin.cpp
  129. +2 −2 src/plugins/plugin_template/plugin.cpp
  130. +1 −1 src/plugins/topology/topol.cpp
  131. +2 −2 src/providers/db2/qgsdb2newconnection.h
  132. +2 −2 src/providers/db2/qgsdb2sourceselect.h
  133. +2 −2 src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
  134. +2 −2 src/providers/mssql/qgsmssqlnewconnection.h
  135. +2 −2 src/providers/mssql/qgsmssqlsourceselect.h
  136. +2 −2 src/providers/oracle/qgsoraclenewconnection.h
  137. +2 −2 src/providers/oracle/qgsoraclesourceselect.h
  138. +2 −2 src/providers/postgres/qgspgnewconnection.h
  139. +2 −2 src/providers/postgres/qgspgsourceselect.h
  140. +2 −2 src/providers/spatialite/qgsspatialitesourceselect.h
  141. +2 −2 src/providers/virtual/qgsvirtuallayersourceselect.h
  142. +2 −2 src/providers/wcs/qgswcssourceselect.h
  143. +2 −2 src/providers/wms/qgswmssourceselect.h
  144. +1 −1 src/providers/wms/qgswmtsdimensions.h
  145. +2 −1 src/server/qgsserver.cpp
  146. +2 −1 src/server/qgsserverprojectparser.cpp
  147. +2 −1 src/server/services/wms/qgswmsrenderer.cpp
  148. +2 −1 tests/src/app/testqgsvectorlayersaveasdialog.cpp
  149. +2 −1 tests/src/gui/testqgsattributeform.cpp
  150. +2 −1 tests/src/gui/testqgsdualview.cpp
  151. +8 −8 tests/src/gui/testqgseditorwidgetregistry.cpp
  152. +3 −3 tests/src/gui/testqgsgui.cpp
  153. +1 −1 tests/src/gui/testqgsmaptooledit.cpp
  154. +10 −10 tests/src/python/acceptable_missing_doc.py
  155. +4 −4 tests/src/python/test_provider_postgres.py
  156. +2 −2 tests/src/python/test_qgsattributeformeditorwidget.py
  157. +2 −2 tests/src/python/test_qgsattributetablemodel.py
  158. +5 −5 tests/src/python/test_qgseditwidgets.py
  159. +3 −3 tests/src/python/test_qgsrangewidgets.py
  160. +2 −2 tests/src/python/test_qgsrelationeditwidget.py
  161. +4 −4 tests/src/python/test_qgsshortcutsmanager.py
@@ -142,7 +142,7 @@ ELSE(WIN32)
# also get other frameworks' headers folders on OS X
IF (APPLE)
FIND_PATH(QGIS_GUI_INCLUDE_DIR
NAMES qgisgui.h
NAMES qgsguiutils.h
PATHS
${QGIS_BUILD_PATH}/output/lib
${QGIS_MAC_PATH}/Frameworks
@@ -63,6 +63,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<table>
<caption id="renamed_classes">Renamed classes</caption>
<tr><th>API 2.x<th>API 3.X
<tr><td>QgisGui<td>QgsGuiUtils
<tr><td>QgsAttributeAction<td>QgsActionManager
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
@@ -1011,7 +1012,7 @@ QgsEditFormConfig {#qgis_api_break_3_0_QgsEditFormConfig}

- Does no longer inherit QObject
- widgetType() and widgetConfig() now reflect only the user configured values.
QgsEditorWidgetRegistry::instance()->findBest() must be used instead.
QgsEditorWidgetRegistry::findBest() must be used instead.
- widgetConfig(), setWidgetType(), setWidgetConfig() and removeWidgetConfig() now only take a string as first parameter. Access by index has been removed.
- widgetType() has been removed in favor of QgsVectorLayer::editorWidgetSetup()
- expression(), setExpression(), expressionDescription() and setExpressionDescription()
@@ -1213,6 +1214,7 @@ plugins calling this method will need to be updated.
QgsEditorWidgetRegistry {#qgis_api_break_3_0_QgsEditorWidgetRegistry}
-----------------------

- The instance() singleton was removed. Use QgsGui::editorWidgetRegistry() instead.
- The signature of isFieldSupported() has been changed to return an unsigned
integer (how good it supports the given field) and is now const.

@@ -1307,6 +1309,12 @@ QgsLayerPropertiesWidget {#qgis_api_break_3_0_QgsLayerPropertiesWidget}
- expressionContext(), setExpressionContext(), setMapCanvas() and mapCanvas() have been removed in favor of setContext()/context()


QgsLayerTreeEmbeddedWidgetRegistry {#qgis_api_break_3_0_QgsLayerTreeEmbeddedWidgetRegistry}
----------------------------------

- QgsLayerTreeEmbeddedWidgetRegistry::instance() has been removed. Use QgsGui::layerTreeEmbeddedWidgetRegistry() instead.


QgsLayerTreeGroup {#qgis_api_break_3_0_QgsLayerTreeGroup}
-----------------

@@ -1438,6 +1446,13 @@ screenUpdateRequested() were removed. These members have had no effect for a num
- the invalidTransformInput() slot was removed - calling this slot had no effect
- metadata() was renamed to htmlMetadata()


QgsMapLayerActionRegistry {#qgis_api_break_3_0_QgsMapLayerActionRegistry}
-------------------------

- This class is no longer a singleton and instance() has been removed. Instead use QgsGui::mapLayerActionRegistry().


QgsMapOverviewCanvas {#qgis_api_break_3_0_QgsMapOverviewCanvas}
--------------------

@@ -1822,10 +1837,10 @@ QgsRenderChecker {#qgis_api_break_3_0_QgsRenderChecker}
setExcludeAttributesWms()
- excludeAttributesWFS() and setExcludeAttributesWFS() have been renamed to excludeAttributesWfs() and
setExcludeAttributesWfs()
- editorWidgetV2() and editorWidgetV2Config() have been removed and QgsEditorWidgetRegistry::instance()->findBest() must be used instead.
- editorWidgetV2() and editorWidgetV2Config() have been removed and QgsEditorWidgetRegistry::findBest() must be used instead.
- setEditorWidgetV2(), setEditorWidgetV2Config() have been removed and their equivalent in editFormConfig() must be used instead.
- setCheckedState() is removed. Use `editFormConfig()->setWidgetConfig()` instead.
- valueMap(), valueRelation(), dateFormat(), widgetSize() have been removed. Use QgsEditorWidgetRegistry::instance()->findBest().config() instead.
- valueMap(), valueRelation(), dateFormat(), widgetSize() have been removed. Use QgsEditorWidgetRegistry::findBest().config() instead.


QgsRenderContext {#qgis_api_break_3_0_QgsRenderContext}
@@ -1909,6 +1924,10 @@ QgsServer {#qgis_api_break_3_0_QgsServer}
- QgsServer::handleRequest( const QString &urlstr ) has been removed in favour of the new
- QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &response ) has been added

QgsShortcutsManager {#qgis_api_break_3_0_QgsShortcutsManager}
-------------------

- QgsShortcutsManager::instance() was removed. Use QgsGui::shortcutsManager() instead.


QgsSimpleMarkerSymbolLayer {#qgis_api_break_3_0_QgsSimpleMarkerSymbolLayer}
@@ -13,24 +13,24 @@
class QgsEditorWidgetRegistry : QObject
{
%Docstring
This class manages all known edit widget factories
This class manages all known edit widget factories.

QgsEditorWidgetRegistry is not usually directly created, but rather accessed through
QgsGui.editorWidgetRegistry().
%End

%TypeHeaderCode
#include "qgseditorwidgetregistry.h"
%End
public:

static QgsEditorWidgetRegistry *instance();
QgsEditorWidgetRegistry();
%Docstring
This class is a singleton and has therefore to be accessed with this method instead
of a constructor.

:return: The one and only instance of the editor widget registry
:rtype: QgsEditorWidgetRegistry
Constructor for QgsEditorWidgetRegistry. QgsEditorWidgetRegistry is not usually directly created, but rather accessed through
QgsGui.editorWidgetRegistry().
%End

static void initEditors( QgsMapCanvas *mapCanvas = 0, QgsMessageBar *messageBar = 0 );
void initEditors( QgsMapCanvas *mapCanvas = 0, QgsMessageBar *messageBar = 0 );
%Docstring
Registers all the default widgets.
Only call this once on startup of an application.
@@ -171,9 +171,6 @@ class QgsEditorWidgetRegistry : QObject
\param plugin The plugin (ownership is transferred)
%End

protected:
QgsEditorWidgetRegistry();

};

/************************************************************************
@@ -81,6 +81,7 @@
%Include qgsfloatingwidget.sip
%Include qgsfocuswatcher.sip
%Include qgsformannotation.sip
%Include qgsgui.sip
%Include qgsgeometryrubberband.sip
%Include qgsgradientcolorrampdialog.sip
%Include qgsgradientstopeditor.sip
@@ -47,8 +47,7 @@ class QgsLayerTreeEmbeddedWidgetRegistry

public:

/** Means of accessing canonical single instance */
static QgsLayerTreeEmbeddedWidgetRegistry *instance();
QgsLayerTreeEmbeddedWidgetRegistry();

~QgsLayerTreeEmbeddedWidgetRegistry();

@@ -66,10 +65,6 @@ class QgsLayerTreeEmbeddedWidgetRegistry
* Returns true on success, false if the provider was not registered. */
bool removeProvider( const QString &providerId );

protected:
//! Protected constructor - use instance() to access the registry.
QgsLayerTreeEmbeddedWidgetRegistry();

private:

QgsLayerTreeEmbeddedWidgetRegistry( const QgsLayerTreeEmbeddedWidgetRegistry &other );
@@ -15,7 +15,7 @@ class QgsBusyIndicatorDialog : QDialog
* @param parent parent object (owner)
* @param fl widget flags
*/
QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
~QgsBusyIndicatorDialog();

QString message() const;
@@ -4,7 +4,7 @@ class QgsCharacterSelectorDialog : QDialog
#include <qgscharacterselectdialog.h>
%End
public:
QgsCharacterSelectorDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsCharacterSelectorDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
~QgsCharacterSelectorDialog();

public slots:
@@ -23,7 +23,7 @@ class QgsColorDialog : QDialog
%End
public:

QgsColorDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
QgsColorDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags,
const QColor &color = QColor() );
%Docstring
Create a new color picker dialog
@@ -20,7 +20,7 @@ class QgsCredentialDialog : QDialog, QgsCredentials
#include "qgscredentialdialog.h"
%End
public:
QgsCredentialDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsCredentialDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
QgsCredentialDialog constructor
%End
@@ -21,7 +21,7 @@ class QgsDialog : QDialog
%End
public:

QgsDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
QgsDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close,
Qt::Orientation orientation = Qt::Horizontal );
%Docstring
@@ -17,12 +17,12 @@ class QgsErrorDialog: QDialog
%End
public:

QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
QgsErrorDialog constructor for QgsErrorDialog
%End

static void show( const QgsError &error, const QString &title, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
static void show( const QgsError &error, const QString &title, QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
Show dialog with error
\param error error
@@ -15,7 +15,7 @@ class QgsGroupWmsDataDialog: QDialog
#include "qgsgroupwmsdatadialog.h"
%End
public:
QgsGroupWmsDataDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsGroupWmsDataDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
Constructor
%End
@@ -0,0 +1,70 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsgui.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/





class QgsGui
{
%Docstring
QgsGui is a singleton class containing various registry and other global members
related to GUI classes.
.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgsgui.h"
%End
public:



static QgsGui *instance();
%Docstring
Returns a pointer to the singleton instance.
:rtype: QgsGui
%End

static QgsEditorWidgetRegistry *editorWidgetRegistry();
%Docstring
Returns the global editor widget registry, used for managing all known edit widget factories.
:rtype: QgsEditorWidgetRegistry
%End

static QgsShortcutsManager *shortcutsManager();
%Docstring
Returns the global shortcuts manager, used for managing a QAction and QShortcut sequences.
:rtype: QgsShortcutsManager
%End

static QgsLayerTreeEmbeddedWidgetRegistry *layerTreeEmbeddedWidgetRegistry();
%Docstring
Returns the global layer tree embedded widget registry, used for registering widgets that may be embedded into layer tree view.
:rtype: QgsLayerTreeEmbeddedWidgetRegistry
%End

static QgsMapLayerActionRegistry *mapLayerActionRegistry();
%Docstring
Returns the global map layer action registry, used for registering map layer actions.
:rtype: QgsMapLayerActionRegistry
%End

~QgsGui();

private:
QgsGui( const QgsGui &other );
};

/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsgui.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -5,7 +5,7 @@ class QgsLUDialog: QDialog
%End

public:
QgsLUDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsLUDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
~QgsLUDialog();
QString lowerValue() const;
void setLowerValue( const QString &val );
@@ -64,8 +64,8 @@ class QgsMapLayerActionRegistry : QObject
%End

public:
//! Returns the instance pointer, creating the object on the first call
static QgsMapLayerActionRegistry *instance();

QgsMapLayerActionRegistry( QObject *parent = 0 );

~QgsMapLayerActionRegistry();

@@ -83,10 +83,6 @@ class QgsMapLayerActionRegistry : QObject
/** Returns the default action for a layer*/
QgsMapLayerAction *defaultActionForLayer( QgsMapLayer *layer );

protected:
//! protected constructor
QgsMapLayerActionRegistry( QObject *parent = 0 );

signals:
/** Triggered when an action is added or removed from the registry */
void changed();
@@ -21,7 +21,7 @@ class QgsMessageLogViewer: QDialog
%End
public:

QgsMessageLogViewer( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsMessageLogViewer( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
Create a new message log viewer. The viewer will automatically connect to the system's
QgsApplication.messageLog() instance.
@@ -6,7 +6,7 @@ class QgsMessageViewer: QDialog, QgsMessageOutput //, Ui::QgsMessageViewer
%End

public:
QgsMessageViewer( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsMessageViewer( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
~QgsMessageViewer();

virtual void setMessage( const QString &message, MessageType msgType );
@@ -7,7 +7,7 @@ class QgsNewGeoPackageLayerDialog : QDialog

public:
/** Constructor */
QgsNewGeoPackageLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsNewGeoPackageLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );

~QgsNewGeoPackageLayerDialog();

@@ -6,7 +6,7 @@ class QgsNewHttpConnection : QDialog

public:
//! Constructor
QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "/Qgis/connections-wms/", const QString &connName = QString::null, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "/Qgis/connections-wms/", const QString &connName = QString::null, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
//! Destructor
~QgsNewHttpConnection();
public slots:
@@ -26,7 +26,7 @@ class QgsNewMemoryLayerDialog: QDialog
:rtype: QgsVectorLayer
%End

QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
~QgsNewMemoryLayerDialog();

QgsWkbTypes::Type selectedType() const;
@@ -23,7 +23,7 @@ class QgsNewNameDialog : QgsDialog
QgsNewNameDialog( const QString& source = QString::null, const QString& initial = QString::null,
const QStringList& extensions = QStringList(), const QStringList& existing = QStringList(),
const QRegExp& regexp = QRegExp(), Qt::CaseSensitivity cs = Qt::CaseSensitive,
QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &flags = QgisGui::ModalDialogFlags );
QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &flags = QgsGuiUtils::ModalDialogFlags );

/** Sets the hint string for the dialog (the text shown above the name
* input box).
@@ -10,7 +10,7 @@ class QgsNewVectorLayerDialog : QDialog
// @return fileName on success, empty string use aborted, QString::null if creation failed
static QString runAndCreateLayer( QWidget *parent = 0, QString *enc = 0 );

QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
~QgsNewVectorLayerDialog();
/** Returns the selected geometry type*/
QgsWkbTypes::Type selectedType() const;
@@ -23,7 +23,7 @@ class QgsOWSSourceSelect : QDialog
};

//! Constructor
QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
//! Destructor
~QgsOWSSourceSelect();

0 comments on commit f8f7d60

Please sign in to comment.