Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clang-format for analysis and gui on 3.40 #59736

Merged
merged 32 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c10d949
add analysis to clang-format
3nids Dec 1, 2024
20a0b94
handle sip macros
3nids Dec 2, 2024
fa799ac
remove auto-generated files from spell check
3nids Dec 2, 2024
157570e
[sipify] supports code in comment
3nids Dec 3, 2024
cf98605
comment methodcode
3nids Dec 3, 2024
b9365aa
run pre-commit
3nids Dec 4, 2024
d75ecab
[sipify] close type header code earlier
3nids Dec 3, 2024
797ffb1
[sipify] better handling of type header includes
3nids Dec 3, 2024
12ea2aa
modify includes
3nids Dec 3, 2024
23df701
[sipify] better handling of type header includes (multiple)
3nids Dec 3, 2024
3a71194
modify core includes
3nids Dec 3, 2024
4767958
fix SIP_SKIP
3nids Dec 3, 2024
af3e524
Revert "[sipify] close type header code earlier"
3nids Dec 3, 2024
c2ae066
[sipify] do not exit header code if commentting
3nids Dec 3, 2024
fc3448a
fix SIP_SKIP
3nids Dec 4, 2024
44eb297
[sipify] exit type header code
3nids Dec 4, 2024
4c7f3eb
fix typo
3nids Dec 4, 2024
dc7043a
src code layout
3nids Dec 4, 2024
aea46b1
sipify
3nids Dec 4, 2024
dc2d143
comment sip directives
3nids Dec 4, 2024
d26e5c9
add gui to clang-format
3nids Dec 4, 2024
848b4bc
place SIP_DEPRECATED before definition
3nids Dec 4, 2024
cf8d723
run pre-commit
3nids Dec 5, 2024
b05114c
fix windows build
3nids Dec 5, 2024
1a35a86
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 5, 2024
67c2b30
fix windows build take 2
3nids Dec 5, 2024
44ee338
comment to fix win build
3nids Dec 5, 2024
9250d0c
allow combination of SIP_SKIP and Q_DECLARE_FLAGS
3nids Dec 6, 2024
d1fedf9
fix SIP_SKIP and SIP_FORCE being left alone
3nids Dec 6, 2024
3207d17
remove multiline
3nids Dec 6, 2024
a3b9391
[sipify] Fix staticmethod (#59517)
3nids Dec 3, 2024
8d9640c
sipify
3nids Dec 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@ SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 2
UseTab: Never

Macros:
- SIP_ENUM_BASETYPE(x)=x
- SIP_MONKEYPATCH_SCOPEENUM_UNNEST(x,y)=x
AttributeMacros:
- SIP_SKIP
---

Language: ObjC
Expand Down
2 changes: 0 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ repos:
exclude: |
(?x)^(
src/core/.*|
src/gui/.*|
src/analysis/.*|
src/3d/.*|
src/server/.*|
tests/code_layout/sipify/sipifyheader.h
Expand Down
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgs3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Qgs3D.instance = staticmethod(Qgs3D.instance)
Qgs3D.initialize = staticmethod(Qgs3D.initialize)
Qgs3D.materialRegistry = staticmethod(Qgs3D.materialRegistry)
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgs3dalgorithms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/processing/qgs3dalgorithms.h
try:
Qgs3DAlgorithms.__group__ = ['processing']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgs3dmapscene.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Qgs3DMapScene.__attribute_docs__ = {'terrainEntityChanged': 'Emitted when the current terrain entity is replaced by a new one\n', 'terrainPendingJobsCountChanged': "Emitted when the number of terrain's pending jobs changes\n", 'totalPendingJobsCountChanged': 'Emitted when the total number of pending jobs changes\n\n.. versionadded:: 3.12\n', 'sceneStateChanged': "Emitted when the scene's state has changed\n", 'fpsCountChanged': 'Emitted when the FPS count changes\n', 'fpsCounterEnabledChanged': 'Emitted when the FPS counter is activated or deactivated\n', 'viewed2DExtentFrom3DChanged': 'Emitted when the viewed 2D extent seen by the 3D camera has changed\n\n.. versionadded:: 3.26\n', 'gpuMemoryLimitReached': "Emitted when one of the entities reaches its GPU memory limit\nand it is not possible to lower the GPU memory use by unloading\ndata that's not currently needed.\n"}
Qgs3DMapScene.openScenes = staticmethod(Qgs3DMapScene.openScenes)
Qgs3DMapScene.__signal_arguments__ = {'fpsCountChanged': ['fpsCount: float'], 'fpsCounterEnabledChanged': ['fpsCounterEnabled: bool'], 'viewed2DExtentFrom3DChanged': ['extent: List[QgsPointXY]']}
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgs3dmapsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
try:
Qgs3DMapSettings.__attribute_docs__ = {'settingsChanged': 'Emitted when one of the configuration settings has changed\n\n.. versionadded:: 3.24\n', 'backgroundColorChanged': 'Emitted when the background color has changed\n', 'selectionColorChanged': 'Emitted when the selection color has changed\n', 'layersChanged': 'Emitted when the list of map layers for 3d rendering has changed.\n\n.. seealso:: :py:func:`setLayers`\n\n.. seealso:: :py:func:`layers`\n', 'terrainGeneratorChanged': 'Emitted when the terrain generator has changed\n', 'terrainVerticalScaleChanged': 'Emitted when the vertical scale of the terrain has changed\n', 'mapTileResolutionChanged': 'Emitted when the map tile resoulution has changed\n', 'maxTerrainScreenErrorChanged': 'Emitted when the maximum terrain screen error has changed\n', 'maxTerrainGroundErrorChanged': 'Emitted when the maximum terrain ground error has changed\n', 'terrainElevationOffsetChanged': 'Emitted when the terrain elevation offset is changed\n\n.. versionadded:: 3.16\n', 'terrainShadingChanged': 'Emitted when terrain shading enabled flag or terrain shading material has changed\n\n.. versionadded:: 3.6\n', 'terrainMapThemeChanged': "Emitted when terrain's map theme has changed\n\n.. versionadded:: 3.6\n", 'renderersChanged': "Emitted when the list of map's extra renderers have been modified\n\n.. versionadded:: 3.10\n", 'showTerrainBoundingBoxesChanged': "Emitted when the flag whether terrain's bounding boxes are shown has changed\n", 'showTerrainTilesInfoChanged': "Emitted when the flag whether terrain's tile info is shown has changed\n", 'showCameraViewCenterChanged': "Emitted when the flag whether camera's view center is shown has changed\n\n.. versionadded:: 3.4\n", 'showCameraRotationCenterChanged': "Emitted when the flag whether camera's rotation center is shown has changed\n\n.. versionadded:: 3.24\n", 'showLightSourceOriginsChanged': 'Emitted when the flag whether light source origins are shown has changed.\n\n.. versionadded:: 3.15\n', 'showLabelsChanged': 'Emitted when the flag whether labels are displayed on terrain tiles has changed\n', 'eyeDomeLightingEnabledChanged': 'Emitted when the flag whether eye dome lighting is used has changed\n\n.. versionadded:: 3.18\n', 'eyeDomeLightingStrengthChanged': 'Emitted when the eye dome lighting strength has changed\n\n.. versionadded:: 3.18\n', 'eyeDomeLightingDistanceChanged': 'Emitted when the eye dome lighting distance has changed\n\n.. versionadded:: 3.18\n', 'debugShadowMapSettingsChanged': 'Emitted when shadow map debugging has changed\n\n.. versionadded:: 3.18\n', 'debugDepthMapSettingsChanged': 'Emitted when depth map debugging has changed\n\n.. versionadded:: 3.18\n', 'pointLightsChanged': 'Emitted when the list of point lights changes\n\n.. versionadded:: 3.6\n', 'lightSourcesChanged': 'Emitted when any of the light source settings in the map changes.\n\n.. versionadded:: 3.26\n', 'directionalLightsChanged': 'Emitted when the list of directional lights changes\n\n.. versionadded:: 3.16\n', 'fieldOfViewChanged': 'Emitted when the camera lens field of view changes\n\n.. versionadded:: 3.8\n', 'projectionTypeChanged': 'Emitted when the camera lens projection type changes\n\n.. versionadded:: 3.18\n', 'cameraNavigationModeChanged': 'Emitted when the camera navigation mode was changed\n\n.. versionadded:: 3.18\n', 'cameraMovementSpeedChanged': 'Emitted when the camera movement speed was changed\n\n.. versionadded:: 3.18\n', 'skyboxSettingsChanged': 'Emitted when skybox settings are changed\n\n.. versionadded:: 3.16\n', 'shadowSettingsChanged': 'Emitted when shadow rendering settings are changed\n\n.. versionadded:: 3.16\n', 'ambientOcclusionSettingsChanged': 'Emitted when ambient occlusion rendering settings are changed\n\n.. versionadded:: 3.28\n', 'fpsCounterEnabledChanged': 'Emitted when the FPS counter is enabled or disabled\n\n.. versionadded:: 3.18\n', 'viewFrustumVisualizationEnabledChanged': "Emitted when the camera's view frustum visualization on the main 2D map canvas is enabled or disabled\n\n.. versionadded:: 3.26\n", 'axisSettingsChanged': 'Emitted when 3d axis rendering settings are changed\n\n.. versionadded:: 3.26\n', 'debugOverlayEnabledChanged': 'Emitted when the debug overaly is enabled or disabled\n\n.. versionadded:: 3.26\n', 'extentChanged': "Emitted when the 3d view's 2d extent has changed\n\n.. seealso:: :py:func:`setExtent`\n\n.. versionadded:: 3.30\n", 'showExtentIn2DViewChanged': "Emitted when the parameter to display 3d view's extent in the 2D canvas has changed\n\n.. seealso:: :py:func:`setShowExtentIn2DView`\n\n.. versionadded:: 3.32\n"}
Qgs3DMapSettings.__signal_arguments__ = {'terrainElevationOffsetChanged': ['newElevation: float'], 'fpsCounterEnabledChanged': ['fpsCounterEnabled: bool'], 'debugOverlayEnabledChanged': ['debugOverlayEnabled: bool']}
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgs3dtypes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/qgs3dtypes.h
try:
Qgs3DTypes.__attribute_docs__ = {'PROP_NAME_3D_RENDERER_FLAG': 'Qt property name to hold the 3D geometry renderer flag'}
except NameError:
except (NameError, AttributeError):
pass
4 changes: 2 additions & 2 deletions python/3d/auto_additions/qgsabstractmaterialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
# --
try:
QgsMaterialContext.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsAbstractMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgscameracontroller.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
try:
QgsCameraController.__attribute_docs__ = {'cameraChanged': 'Emitted when camera has been updated\n', 'navigationModeChanged': 'Emitted when the navigation mode is changed using the hotkey ctrl + ~\n', 'cameraMovementSpeedChanged': 'Emitted whenever the camera movement speed is changed by the controller.\n', 'setCursorPosition': 'Emitted when the mouse cursor position should be moved to the specified ``point``\non the map viewport.\n', 'requestDepthBufferCapture': 'Emitted to ask for the depth buffer image\n\n.. versionadded:: 3.24\n', 'cameraRotationCenterChanged': 'Emitted when the camera rotation center changes\n\n.. versionadded:: 3.24\n'}
QgsCameraController.__signal_arguments__ = {'navigationModeChanged': ['mode: Qgis.NavigationMode'], 'cameraMovementSpeedChanged': ['speed: float'], 'setCursorPosition': ['point: QPoint'], 'cameraRotationCenterChanged': ['position: QVector3D']}
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsdirectionallightsettings.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/lights/qgsdirectionallightsettings.h
try:
QgsDirectionalLightSettings.__group__ = ['lights']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsgoochmaterialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsGoochMaterialSettings.create = staticmethod(QgsGoochMaterialSettings.create)
QgsGoochMaterialSettings.supportsTechnique = staticmethod(QgsGoochMaterialSettings.supportsTechnique)
QgsGoochMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgslayoutitem3dmap.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/qgslayoutitem3dmap.h
try:
QgsLayoutItem3DMap.create = staticmethod(QgsLayoutItem3DMap.create)
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgslightsource.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
try:
QgsLightSource.createFromXml = staticmethod(QgsLightSource.createFromXml)
QgsLightSource.__group__ = ['lights']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsline3dsymbol.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
try:
QgsLine3DSymbol.create = staticmethod(QgsLine3DSymbol.create)
QgsLine3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
4 changes: 2 additions & 2 deletions python/3d/auto_additions/qgsmaterialregistry.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The following has been generated automatically from src/3d/materials/qgsmaterialregistry.h
try:
QgsMaterialSettingsAbstractMetadata.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsMaterialRegistry.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsmetalroughmaterialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsMetalRoughMaterialSettings.supportsTechnique = staticmethod(QgsMetalRoughMaterialSettings.supportsTechnique)
QgsMetalRoughMaterialSettings.create = staticmethod(QgsMetalRoughMaterialSettings.create)
QgsMetalRoughMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsnullmaterialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsNullMaterialSettings.supportsTechnique = staticmethod(QgsNullMaterialSettings.supportsTechnique)
QgsNullMaterialSettings.create = staticmethod(QgsNullMaterialSettings.create)
QgsNullMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsphongmaterialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsPhongMaterialSettings.supportsTechnique = staticmethod(QgsPhongMaterialSettings.supportsTechnique)
QgsPhongMaterialSettings.create = staticmethod(QgsPhongMaterialSettings.create)
QgsPhongMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsPhongTexturedMaterialSettings.supportsTechnique = staticmethod(QgsPhongTexturedMaterialSettings.supportsTechnique)
QgsPhongTexturedMaterialSettings.create = staticmethod(QgsPhongTexturedMaterialSettings.create)
QgsPhongTexturedMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgspoint3dsymbol.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
QgsPoint3DSymbol.shapeFromString = staticmethod(QgsPoint3DSymbol.shapeFromString)
QgsPoint3DSymbol.shapeToString = staticmethod(QgsPoint3DSymbol.shapeToString)
QgsPoint3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
10 changes: 5 additions & 5 deletions python/3d/auto_additions/qgspointcloud3dsymbol.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# The following has been generated automatically from src/3d/symbols/qgspointcloud3dsymbol.h
try:
QgsPointCloud3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsSingleColorPointCloud3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsColorRampPointCloud3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsRgbPointCloud3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
try:
QgsClassificationPointCloud3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgspointlightsettings.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/lights/qgspointlightsettings.h
try:
QgsPointLightSettings.__group__ = ['lights']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgspolygon3dsymbol.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
try:
QgsPolygon3DSymbol.create = staticmethod(QgsPolygon3DSymbol.create)
QgsPolygon3DSymbol.__group__ = ['symbols']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgsrulebased3drenderer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/qgsrulebased3drenderer.h
try:
QgsRuleBased3DRenderer.Rule.create = staticmethod(QgsRuleBased3DRenderer.Rule.create)
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/3d/auto_additions/qgssimplelinematerialsettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
QgsSimpleLineMaterialSettings.supportsTechnique = staticmethod(QgsSimpleLineMaterialSettings.supportsTechnique)
QgsSimpleLineMaterialSettings.create = staticmethod(QgsSimpleLineMaterialSettings.create)
QgsSimpleLineMaterialSettings.__group__ = ['materials']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/PyQt6/3d/auto_additions/qgs3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Qgs3D.instance = staticmethod(Qgs3D.instance)
Qgs3D.initialize = staticmethod(Qgs3D.initialize)
Qgs3D.materialRegistry = staticmethod(Qgs3D.materialRegistry)
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/PyQt6/3d/auto_additions/qgs3dalgorithms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The following has been generated automatically from src/3d/processing/qgs3dalgorithms.h
try:
Qgs3DAlgorithms.__group__ = ['processing']
except NameError:
except (NameError, AttributeError):
pass
2 changes: 1 addition & 1 deletion python/PyQt6/3d/auto_additions/qgs3dmapscene.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
Qgs3DMapScene.__attribute_docs__ = {'terrainEntityChanged': 'Emitted when the current terrain entity is replaced by a new one\n', 'terrainPendingJobsCountChanged': "Emitted when the number of terrain's pending jobs changes\n", 'totalPendingJobsCountChanged': 'Emitted when the total number of pending jobs changes\n\n.. versionadded:: 3.12\n', 'sceneStateChanged': "Emitted when the scene's state has changed\n", 'fpsCountChanged': 'Emitted when the FPS count changes\n', 'fpsCounterEnabledChanged': 'Emitted when the FPS counter is activated or deactivated\n', 'viewed2DExtentFrom3DChanged': 'Emitted when the viewed 2D extent seen by the 3D camera has changed\n\n.. versionadded:: 3.26\n', 'gpuMemoryLimitReached': "Emitted when one of the entities reaches its GPU memory limit\nand it is not possible to lower the GPU memory use by unloading\ndata that's not currently needed.\n"}
Qgs3DMapScene.openScenes = staticmethod(Qgs3DMapScene.openScenes)
Qgs3DMapScene.__signal_arguments__ = {'fpsCountChanged': ['fpsCount: float'], 'fpsCounterEnabledChanged': ['fpsCounterEnabled: bool'], 'viewed2DExtentFrom3DChanged': ['extent: List[QgsPointXY]']}
except NameError:
except (NameError, AttributeError):
pass
Loading
Loading