Skip to content

Commit

Permalink
Code shuffle: move QgsCodeEditor classes to their own folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 6, 2020
1 parent 31dba54 commit 1bafa2f
Show file tree
Hide file tree
Showing 38 changed files with 262 additions and 49 deletions.
1 change: 1 addition & 0 deletions doc/CMakeLists.txt
View file
Expand Up @@ -85,6 +85,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/callouts
${CMAKE_SOURCE_DIR}/src/gui/codeeditors
${CMAKE_SOURCE_DIR}/src/gui/devtools
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
Expand Down
1 change: 1 addition & 0 deletions python/CMakeLists.txt
View file
Expand Up @@ -149,6 +149,7 @@ IF (WITH_GUI)
${CMAKE_SOURCE_DIR}/src/gui/raster
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/codeeditors
${CMAKE_SOURCE_DIR}/src/gui/devtools
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
Expand Down
4 changes: 2 additions & 2 deletions ...n/gui/auto_generated/qgscodeeditor.sip.in → ...enerated/codeeditors/qgscodeeditor.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditor.h *
* src/gui/codeeditors/qgscodeeditor.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -196,7 +196,7 @@ Returns the font to use in the lexer.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditor.h *
* src/gui/codeeditors/qgscodeeditor.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...ui/auto_generated/qgscodeeditorcss.sip.in → ...rated/codeeditors/qgscodeeditorcss.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorcss.h *
* src/gui/codeeditors/qgscodeeditorcss.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -37,7 +37,7 @@ Constructor for QgsCodeEditorCSS
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorcss.h *
* src/gui/codeeditors/qgscodeeditorcss.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ..._generated/qgscodeeditorexpression.sip.in → ...odeeditors/qgscodeeditorexpression.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorexpression.h *
* src/gui/codeeditors/qgscodeeditorexpression.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -52,7 +52,7 @@ Field names will be added to the API.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorexpression.h *
* src/gui/codeeditors/qgscodeeditorexpression.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...i/auto_generated/qgscodeeditorhtml.sip.in → ...ated/codeeditors/qgscodeeditorhtml.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorhtml.h *
* src/gui/codeeditors/qgscodeeditorhtml.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -40,7 +40,7 @@ Constructor for QgsCodeEditorHTML
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorhtml.h *
* src/gui/codeeditors/qgscodeeditorhtml.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...gui/auto_generated/qgscodeeditorjs.sip.in → ...erated/codeeditors/qgscodeeditorjs.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorjs.h *
* src/gui/codeeditors/qgscodeeditorjs.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -37,7 +37,7 @@ Constructor for QgsCodeEditorJavascript
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorjs.h *
* src/gui/codeeditors/qgscodeeditorjs.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...auto_generated/qgscodeeditorpython.sip.in → ...ed/codeeditors/qgscodeeditorpython.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorpython.h *
* src/gui/codeeditors/qgscodeeditorpython.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -80,7 +80,7 @@ Triggers the autocompletion popup.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorpython.h *
* src/gui/codeeditors/qgscodeeditorpython.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...ui/auto_generated/qgscodeeditorsql.sip.in → ...rated/codeeditors/qgscodeeditorsql.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorsql.h *
* src/gui/codeeditors/qgscodeeditorsql.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -48,7 +48,7 @@ Set field names to be added to the lexer API.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/qgscodeeditorsql.h *
* src/gui/codeeditors/qgscodeeditorsql.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
42 changes: 21 additions & 21 deletions python/gui/gui_auto.sip
View file
Expand Up @@ -23,27 +23,6 @@
%Include auto_generated/qgsbusyindicatordialog.sip
%Include auto_generated/qgscharacterselectordialog.sip
%Include auto_generated/qgscheckablecombobox.sip
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditor.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorcss.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorexpression.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorhtml.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorjs.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorpython.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/qgscodeeditorsql.sip
%End
%Include auto_generated/qgscollapsiblegroupbox.sip
%Include auto_generated/qgscolorbrewercolorrampdialog.sip
%Include auto_generated/qgscolorbutton.sip
Expand Down Expand Up @@ -259,6 +238,27 @@
%Include auto_generated/auth/qgsauthsslimportdialog.sip
%Include auto_generated/auth/qgsauthtrustedcasdialog.sip
%Include auto_generated/callouts/qgscalloutwidget.sip
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditor.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorcss.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorexpression.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorhtml.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorjs.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorpython.sip
%End
%If ( HAVE_QSCI_SIP )
%Include auto_generated/codeeditors/qgscodeeditorsql.sip
%End
%Include auto_generated/devtools/qgsdevtoolwidget.sip
%Include auto_generated/devtools/qgsdevtoolwidgetfactory.sip
%Include auto_generated/editorwidgets/core/qgseditorconfigwidget.sip
Expand Down
1 change: 1 addition & 0 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -450,6 +450,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/symbology
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/codeeditors
${CMAKE_SOURCE_DIR}/src/gui/devtools
${CMAKE_SOURCE_DIR}/src/gui/labeling
${CMAKE_SOURCE_DIR}/src/gui/mesh
Expand Down
31 changes: 17 additions & 14 deletions src/gui/CMakeLists.txt
View file
Expand Up @@ -112,6 +112,14 @@ SET(QGIS_GUI_SRCS
auth/qgsauthsslimportdialog.cpp
auth/qgsauthtrustedcasdialog.cpp

codeeditors/qgscodeeditor.cpp
codeeditors/qgscodeeditorcss.cpp
codeeditors/qgscodeeditorhtml.cpp
codeeditors/qgscodeeditorjs.cpp
codeeditors/qgscodeeditorpython.cpp
codeeditors/qgscodeeditorsql.cpp
codeeditors/qgscodeeditorexpression.cpp

devtools/qgsdevtoolwidget.cpp
devtools/qgsdevtoolwidgetfactory.cpp

Expand Down Expand Up @@ -373,13 +381,6 @@ SET(QGIS_GUI_SRCS
qgsbusyindicatordialog.cpp
qgscharacterselectordialog.cpp
qgscheckablecombobox.cpp
qgscodeeditor.cpp
qgscodeeditorcss.cpp
qgscodeeditorhtml.cpp
qgscodeeditorjs.cpp
qgscodeeditorpython.cpp
qgscodeeditorsql.cpp
qgscodeeditorexpression.cpp
qgscollapsiblegroupbox.cpp
qgscolorbrewercolorrampdialog.cpp
qgscolorbutton.cpp
Expand Down Expand Up @@ -609,13 +610,6 @@ SET(QGIS_GUI_HDRS
qgsbusyindicatordialog.h
qgscharacterselectordialog.h
qgscheckablecombobox.h
qgscodeeditor.h
qgscodeeditorcss.h
qgscodeeditorexpression.h
qgscodeeditorhtml.h
qgscodeeditorjs.h
qgscodeeditorpython.h
qgscodeeditorsql.h
qgscollapsiblegroupbox.h
qgscolorbrewercolorrampdialog.h
qgscolorbutton.h
Expand Down Expand Up @@ -862,6 +856,14 @@ SET(QGIS_GUI_HDRS

callouts/qgscalloutwidget.h

codeeditors/qgscodeeditor.h
codeeditors/qgscodeeditorcss.h
codeeditors/qgscodeeditorexpression.h
codeeditors/qgscodeeditorhtml.h
codeeditors/qgscodeeditorjs.h
codeeditors/qgscodeeditorpython.h
codeeditors/qgscodeeditorsql.h

devtools/qgsdevtoolwidget.h
devtools/qgsdevtoolwidgetfactory.h

Expand Down Expand Up @@ -1272,6 +1274,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/symbology
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/codeeditors
${CMAKE_SOURCE_DIR}/src/gui/devtools
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
Expand Down
0 src/gui/qgscodeeditor.cpp → src/gui/codeeditors/qgscodeeditor.cpp
View file
File renamed without changes.
0 src/gui/qgscodeeditor.h → src/gui/codeeditors/qgscodeeditor.h
View file
File renamed without changes.

0 comments on commit 1bafa2f

Please sign in to comment.