Skip to content

Commit

Permalink
Move action files to subdirectories
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson @troopa81
nyalldawson authored and troopa81 committed Nov 23, 2022
1 parent 84c8787 commit 8fefb8a
Show file tree
Hide file tree
Showing 24 changed files with 40 additions and 32 deletions.
2 changes: 2 additions & 0 deletions doc/CMakeLists.txt
View file
Expand Up @@ -51,6 +51,7 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/doc
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/3d
${CMAKE_SOURCE_DIR}/src/core/actions
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/browser
Expand Down Expand Up @@ -97,6 +98,7 @@ if(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/vector
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/gui/actions
${CMAKE_SOURCE_DIR}/src/gui/annotations
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
Expand Down
4 changes: 2 additions & 2 deletions python/core/auto_generated/qgsaction.sip.in → ...e/auto_generated/actions/qgsaction.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsaction.h *
* src/core/actions/qgsaction.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -238,7 +238,7 @@ Sets the action ``command``.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsaction.h *
* src/core/actions/qgsaction.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...re/auto_generated/qgsactionmanager.sip.in → ...generated/actions/qgsactionmanager.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionmanager.h *
* src/core/actions/qgsactionmanager.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -147,7 +147,7 @@ file.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionmanager.h *
* src/core/actions/qgsactionmanager.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...core/auto_generated/qgsactionscope.sip.in → ...o_generated/actions/qgsactionscope.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionscope.h *
* src/core/actions/qgsactionscope.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -125,7 +125,7 @@ Returns if this scope is valid.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionscope.h *
* src/core/actions/qgsactionscope.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...o_generated/qgsactionscoperegistry.sip.in → ...ted/actions/qgsactionscoperegistry.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionscoperegistry.h *
* src/core/actions/qgsactionscoperegistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -83,7 +83,7 @@ is unregistered.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsactionscoperegistry.h *
* src/core/actions/qgsactionscoperegistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
8 changes: 4 additions & 4 deletions python/core/core_auto.sip
View file
@@ -1,10 +1,6 @@
// Include auto-generated SIP files
%Include auto_generated/qgis.sip
%Include auto_generated/qgsabstractcontentcache.sip
%Include auto_generated/qgsaction.sip
%Include auto_generated/qgsactionmanager.sip
%Include auto_generated/qgsactionscope.sip
%Include auto_generated/qgsactionscoperegistry.sip
%Include auto_generated/qgsaggregatecalculator.sip
%Include auto_generated/qgsanimatedicon.sip
%Include auto_generated/qgsapplication.sip
Expand Down Expand Up @@ -218,6 +214,10 @@
%Include auto_generated/./3d/qgsabstract3dsymbol.sip
%Include auto_generated/./3d/qgsabstract3drenderer.sip
%Include auto_generated/./3d/qgsabstractpointcloud3drenderer.sip
%Include auto_generated/actions/qgsaction.sip
%Include auto_generated/actions/qgsactionmanager.sip
%Include auto_generated/actions/qgsactionscope.sip
%Include auto_generated/actions/qgsactionscoperegistry.sip
%Include auto_generated/annotations/qgsannotation.sip
%Include auto_generated/annotations/qgsannotationitem.sip
%Include auto_generated/annotations/qgsannotationitemeditoperation.sip
Expand Down
2 changes: 1 addition & 1 deletion python/gui/auto_additions/qgsmaplayeractionregistry.py
View file
@@ -1,4 +1,4 @@
# The following has been generated automatically from src/gui/qgsmaplayeractionregistry.h
# The following has been generated automatically from src/gui/actions/qgsmaplayeractionregistry.h
QgsMapLayerAction.Targets.baseClass = QgsMapLayerAction
Targets = QgsMapLayerAction # dirty hack since SIP seems to introduce the flags in module
QgsMapLayerAction.Flags.baseClass = QgsMapLayerAction
Expand Down
4 changes: 2 additions & 2 deletions ...n/gui/auto_generated/qgsactionmenu.sip.in → ...to_generated/actions/qgsactionmenu.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsactionmenu.h *
* src/gui/actions/qgsactionmenu.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -127,7 +127,7 @@ Returns ``True`` if the menu has no valid actions.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsactionmenu.h *
* src/gui/actions/qgsactionmenu.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...enerated/qgsmaplayeractionregistry.sip.in → .../actions/qgsmaplayeractionregistry.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsmaplayeractionregistry.h *
* src/gui/actions/qgsmaplayeractionregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -337,7 +337,7 @@ QFlags<QgsMapLayerAction::Flag> operator|(QgsMapLayerAction::Flag f1, QFlags<Qgs
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgsmaplayeractionregistry.h *
* src/gui/actions/qgsmaplayeractionregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions python/gui/gui_auto.sip
View file
Expand Up @@ -3,7 +3,6 @@
%Include auto_generated/qgs3dsymbolwidget.sip
%Include auto_generated/qgsabstractdatasourcewidget.sip
%Include auto_generated/qgsabstractmaptoolhandler.sip
%Include auto_generated/qgsactionmenu.sip
%Include auto_generated/qgsadvanceddigitizingdockwidget.sip
%Include auto_generated/qgsadvanceddigitizingfloater.sip
%Include auto_generated/qgsaggregatetoolbutton.sip
Expand Down Expand Up @@ -120,7 +119,6 @@
%Include auto_generated/qgsmapcanvassnappingutils.sip
%Include auto_generated/qgsmapcanvastracer.sip
%Include auto_generated/qgsmapcanvasutils.sip
%Include auto_generated/qgsmaplayeractionregistry.sip
%Include auto_generated/qgsmaplayercombobox.sip
%Include auto_generated/qgsmaplayerconfigwidget.sip
%Include auto_generated/qgsmaplayerconfigwidgetfactory.sip
Expand Down Expand Up @@ -233,6 +231,8 @@
%Include auto_generated/qgsvertexmarker.sip
%Include auto_generated/qgsvscrollarea.sip
%Include auto_generated/qgswindowmanagerinterface.sip
%Include auto_generated/actions/qgsactionmenu.sip
%Include auto_generated/actions/qgsmaplayeractionregistry.sip
%Include auto_generated/annotations/qgsannotationitemcommonpropertieswidget.sip
%Include auto_generated/annotations/qgsannotationitemguiregistry.sip
%Include auto_generated/annotations/qgsannotationitemwidget.sip
Expand Down
19 changes: 11 additions & 8 deletions src/core/CMakeLists.txt
View file
Expand Up @@ -31,6 +31,11 @@ set(QGIS_CORE_SRCS
${FLEX_QgsMeshCalcLexer_OUTPUTS}
${BISON_QgsMeshCalcParser_OUTPUTS}

actions/qgsaction.cpp
actions/qgsactionscope.cpp
actions/qgsactionscoperegistry.cpp
actions/qgsactionmanager.cpp

callouts/qgscallout.cpp
callouts/qgscalloutsregistry.cpp

Expand Down Expand Up @@ -330,10 +335,6 @@ set(QGIS_CORE_SRCS
qgsabstractcontentcache.cpp
qgsabstractgeopdfexporter.cpp
qgsapplication.cpp
qgsaction.cpp
qgsactionscope.cpp
qgsactionscoperegistry.cpp
qgsactionmanager.cpp
qgsaggregatecalculator.cpp
qgsanimatedicon.cpp
qgspostgresstringutils.cpp
Expand Down Expand Up @@ -995,10 +996,6 @@ set(QGIS_CORE_HDRS
qgis_sip.h
qgsabstractcontentcache.h
qgsabstractgeopdfexporter.h
qgsaction.h
qgsactionmanager.h
qgsactionscope.h
qgsactionscoperegistry.h
qgsaggregatecalculator.h
qgsanimatedicon.h
qgsapplication.h
Expand Down Expand Up @@ -1239,6 +1236,11 @@ set(QGIS_CORE_HDRS
3d/qgsabstract3drenderer.h
3d/qgsabstractpointcloud3drenderer.h

actions/qgsaction.h
actions/qgsactionmanager.h
actions/qgsactionscope.h
actions/qgsactionscoperegistry.h

annotations/qgsannotation.h
annotations/qgsannotationitem.h
annotations/qgsannotationitemeditoperation.h
Expand Down Expand Up @@ -2160,6 +2162,7 @@ target_include_directories(qgis_core PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
3d
actions
annotations
auth
browser
Expand Down
0 src/core/qgsaction.cpp → src/core/actions/qgsaction.cpp
View file
File renamed without changes.
0 src/core/qgsaction.h → src/core/actions/qgsaction.h
View file
File renamed without changes.
0 src/core/qgsactionmanager.cpp → src/core/actions/qgsactionmanager.cpp
View file
File renamed without changes.
0 src/core/qgsactionmanager.h → src/core/actions/qgsactionmanager.h
View file
File renamed without changes.
0 src/core/qgsactionscope.cpp → src/core/actions/qgsactionscope.cpp
View file
File renamed without changes.
0 src/core/qgsactionscope.h → src/core/actions/qgsactionscope.h
View file
File renamed without changes.
0 src/core/qgsactionscoperegistry.cpp → src/core/actions/qgsactionscoperegistry.cpp
View file
File renamed without changes.
0 src/core/qgsactionscoperegistry.h → src/core/actions/qgsactionscoperegistry.h
View file
File renamed without changes.
13 changes: 8 additions & 5 deletions src/gui/CMakeLists.txt
View file
@@ -1,4 +1,7 @@
set(QGIS_GUI_SRCS
set(QGIS_GUI_SRCS
actions/qgsactionmenu.cpp
actions/qgsmaplayeractionregistry.cpp

raster/qgscreaterasterattributetabledialog.cpp
raster/qgsloadrasterattributetabledialog.cpp
raster/qgsrasterattributetablewidget.cpp
Expand Down Expand Up @@ -429,7 +432,6 @@ set(QGIS_GUI_SRCS
qgisinterface.cpp
qgs3dsymbolwidget.cpp
qgsabstractmaptoolhandler.cpp
qgsactionmenu.cpp
qgsaddattrdialog.cpp
qgsaddtaborgroup.cpp
qgsadvanceddigitizingcanvasitem.cpp
Expand Down Expand Up @@ -558,7 +560,6 @@ set(QGIS_GUI_SRCS
qgsmapcanvassnappingutils.cpp
qgsmapcanvastracer.cpp
qgsmapcanvasutils.cpp
qgsmaplayeractionregistry.cpp
qgsmaplayercombobox.cpp
qgsmaplayerconfigwidgetfactory.cpp
qgsmaplayerloadstyledialog.cpp
Expand Down Expand Up @@ -693,7 +694,6 @@ set(QGIS_GUI_HDRS
qgs3dsymbolwidget.h
qgsabstractdatasourcewidget.h
qgsabstractmaptoolhandler.h
qgsactionmenu.h
qgsaddattrdialog.h
qgsaddtaborgroup.h
qgsadvanceddigitizingdockwidget.h
Expand Down Expand Up @@ -823,7 +823,6 @@ set(QGIS_GUI_HDRS
qgsmapcanvassnappingutils.h
qgsmapcanvastracer.h
qgsmapcanvasutils.h
qgsmaplayeractionregistry.h
qgsmaplayercombobox.h
qgsmaplayerconfigwidget.h
qgsmaplayerconfigwidgetfactory.h
Expand Down Expand Up @@ -951,6 +950,9 @@ set(QGIS_GUI_HDRS
qgsvscrollarea.h
qgswindowmanagerinterface.h

actions/qgsactionmenu.h
actions/qgsmaplayeractionregistry.h

annotations/qgsannotationitemcommonpropertieswidget.h
annotations/qgsannotationitemguiregistry.h
annotations/qgsannotationitemwidget.h
Expand Down Expand Up @@ -1555,6 +1557,7 @@ endif()

target_include_directories(qgis_gui PUBLIC
${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/gui/actions
${CMAKE_SOURCE_DIR}/src/gui/annotations
${CMAKE_SOURCE_DIR}/src/gui/attributeformconfig
${CMAKE_SOURCE_DIR}/src/gui/symbology
Expand Down
0 src/gui/qgsactionmenu.cpp → src/gui/actions/qgsactionmenu.cpp
View file
File renamed without changes.
0 src/gui/qgsactionmenu.h → src/gui/actions/qgsactionmenu.h
View file
File renamed without changes.
0 src/gui/qgsmaplayeractionregistry.cpp → ...gui/actions/qgsmaplayeractionregistry.cpp
View file
File renamed without changes.
0 src/gui/qgsmaplayeractionregistry.h → src/gui/actions/qgsmaplayeractionregistry.h
View file
File renamed without changes.

0 comments on commit 8fefb8a

Please sign in to comment.