Skip to content

Commit f8f7d60

Browse files
authoredMay 14, 2017
Merge pull request #4514 from nyalldawson/gui_instance
Make a new global QgsGui singleton
2 parents c3c694f + a8b10a2 commit f8f7d60

File tree

161 files changed

+650
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+650
-431
lines changed
 

‎cmake/FindQGIS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ ELSE(WIN32)
142142
# also get other frameworks' headers folders on OS X
143143
IF (APPLE)
144144
FIND_PATH(QGIS_GUI_INCLUDE_DIR
145-
NAMES qgisgui.h
145+
NAMES qgsguiutils.h
146146
PATHS
147147
${QGIS_BUILD_PATH}/output/lib
148148
${QGIS_MAC_PATH}/Frameworks

‎doc/api_break.dox

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
6363
<table>
6464
<caption id="renamed_classes">Renamed classes</caption>
6565
<tr><th>API 2.x<th>API 3.X
66+
<tr><td>QgisGui<td>QgsGuiUtils
6667
<tr><td>QgsAttributeAction<td>QgsActionManager
6768
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
6869
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
@@ -1011,7 +1012,7 @@ QgsEditFormConfig {#qgis_api_break_3_0_QgsEditFormConfig}
10111012

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

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

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

13091311

1312+
QgsLayerTreeEmbeddedWidgetRegistry {#qgis_api_break_3_0_QgsLayerTreeEmbeddedWidgetRegistry}
1313+
----------------------------------
1314+
1315+
- QgsLayerTreeEmbeddedWidgetRegistry::instance() has been removed. Use QgsGui::layerTreeEmbeddedWidgetRegistry() instead.
1316+
1317+
13101318
QgsLayerTreeGroup {#qgis_api_break_3_0_QgsLayerTreeGroup}
13111319
-----------------
13121320

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

1449+
1450+
QgsMapLayerActionRegistry {#qgis_api_break_3_0_QgsMapLayerActionRegistry}
1451+
-------------------------
1452+
1453+
- This class is no longer a singleton and instance() has been removed. Instead use QgsGui::mapLayerActionRegistry().
1454+
1455+
14411456
QgsMapOverviewCanvas {#qgis_api_break_3_0_QgsMapOverviewCanvas}
14421457
--------------------
14431458

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

18301845

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

1927+
QgsShortcutsManager {#qgis_api_break_3_0_QgsShortcutsManager}
1928+
-------------------
1929+
1930+
- QgsShortcutsManager::instance() was removed. Use QgsGui::shortcutsManager() instead.
19121931

19131932

19141933
QgsSimpleMarkerSymbolLayer {#qgis_api_break_3_0_QgsSimpleMarkerSymbolLayer}

0 commit comments

Comments
 (0)
Please sign in to comment.