Skip to content
Permalink
Browse files

Code shuffle: move QgsCodeEditor classes to their own folder

  • Loading branch information
nyalldawson committed Oct 6, 2020
1 parent 31dba54 commit 1bafa2f66f7c8c5770b2250cd41f9592817a4d6f
Showing with 262 additions and 49 deletions.
  1. +1 −0 doc/CMakeLists.txt
  2. +1 −0 python/CMakeLists.txt
  3. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditor.sip.in
  4. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorcss.sip.in
  5. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorexpression.sip.in
  6. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorhtml.sip.in
  7. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorjs.sip.in
  8. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorpython.sip.in
  9. +2 −2 python/gui/auto_generated/{ → codeeditors}/qgscodeeditorsql.sip.in
  10. +21 −21 python/gui/gui_auto.sip
  11. +1 −0 src/app/CMakeLists.txt
  12. +17 −14 src/gui/CMakeLists.txt
  13. 0 src/gui/{ → codeeditors}/qgscodeeditor.cpp
  14. 0 src/gui/{ → codeeditors}/qgscodeeditor.h
  15. +196 −0 src/gui/codeeditors/qgscodeeditorcolorschemeregistry.h
  16. 0 src/gui/{ → codeeditors}/qgscodeeditorcss.cpp
  17. 0 src/gui/{ → codeeditors}/qgscodeeditorcss.h
  18. 0 src/gui/{ → codeeditors}/qgscodeeditorexpression.cpp
  19. 0 src/gui/{ → codeeditors}/qgscodeeditorexpression.h
  20. 0 src/gui/{ → codeeditors}/qgscodeeditorhtml.cpp
  21. 0 src/gui/{ → codeeditors}/qgscodeeditorhtml.h
  22. 0 src/gui/{ → codeeditors}/qgscodeeditorjs.cpp
  23. 0 src/gui/{ → codeeditors}/qgscodeeditorjs.h
  24. 0 src/gui/{ → codeeditors}/qgscodeeditorpython.cpp
  25. 0 src/gui/{ → codeeditors}/qgscodeeditorpython.h
  26. 0 src/gui/{ → codeeditors}/qgscodeeditorsql.cpp
  27. 0 src/gui/{ → codeeditors}/qgscodeeditorsql.h
  28. +1 −0 src/plugins/grass/CMakeLists.txt
  29. +1 −0 src/providers/arcgisrest/CMakeLists.txt
  30. +1 −0 src/providers/db2/CMakeLists.txt
  31. +1 −0 src/providers/grass/CMakeLists.txt
  32. +1 −0 src/providers/mssql/CMakeLists.txt
  33. +1 −0 src/providers/postgres/CMakeLists.txt
  34. +1 −0 src/providers/spatialite/CMakeLists.txt
  35. +1 −0 src/providers/virtual/CMakeLists.txt
  36. +1 −0 src/providers/wfs/CMakeLists.txt
  37. +1 −0 tests/src/app/CMakeLists.txt
  38. +1 −0 tests/src/gui/CMakeLists.txt
@@ -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
@@ -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
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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 *
************************************************************************/
@@ -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
@@ -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
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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

@@ -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
File renamed without changes.
File renamed without changes.

0 comments on commit 1bafa2f

Please sign in to comment.
You can’t perform that action at this time.