From 2cae30fcdf827c6f5b6e1a200b30d9ec1c38db96 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 23 Jul 2022 01:20:43 +0200 Subject: [PATCH] Renamed some webnode files. I want to make their names a bit more standardized. --- modules/web/SCsub | 18 +++++++++--------- ...cpp => browsable_folder_serve_web_page.cpp} | 2 +- ...ode.h => browsable_folder_serve_web_page.h} | 2 +- ...erve_node.cpp => folder_serve_web_page.cpp} | 2 +- ...er_serve_node.h => folder_serve_web_page.h} | 0 .../{list_page.cpp => list_web_page.cpp} | 2 +- .../list_page/{list_page.h => list_web_page.h} | 0 ..._article.cpp => paged_article_web_page.cpp} | 2 +- ...aged_article.h => paged_article_web_page.h} | 0 ...pp => paged_articles_md_index_web_page.cpp} | 6 +++--- ...ex.h => paged_articles_md_index_web_page.h} | 0 ...rticles.cpp => paged_articles_web_page.cpp} | 4 ++-- ...ed_articles.h => paged_articles_web_page.h} | 0 .../{static_page.cpp => static_web_page.cpp} | 2 +- .../{static_page.h => static_web_page.h} | 0 ..._page_file.cpp => static_web_page_file.cpp} | 2 +- ...atic_page_file.h => static_web_page_file.h} | 2 +- ...es.cpp => static_web_page_folder_files.cpp} | 2 +- ..._files.h => static_web_page_folder_files.h} | 2 +- modules/web/register_types.cpp | 16 ++++++++-------- 20 files changed, 32 insertions(+), 32 deletions(-) rename modules/web/nodes/folder_serve_nodes/{browsable_folder_serve_node.cpp => browsable_folder_serve_web_page.cpp} (98%) rename modules/web/nodes/folder_serve_nodes/{browsable_folder_serve_node.h => browsable_folder_serve_web_page.h} (97%) rename modules/web/nodes/folder_serve_nodes/{folder_serve_node.cpp => folder_serve_web_page.cpp} (98%) rename modules/web/nodes/folder_serve_nodes/{folder_serve_node.h => folder_serve_web_page.h} (100%) rename modules/web/nodes/list_page/{list_page.cpp => list_web_page.cpp} (99%) rename modules/web/nodes/list_page/{list_page.h => list_web_page.h} (100%) rename modules/web/nodes/paged_article/{paged_article.cpp => paged_article_web_page.cpp} (99%) rename modules/web/nodes/paged_article/{paged_article.h => paged_article_web_page.h} (100%) rename modules/web/nodes/paged_article/{paged_articles_md_index.cpp => paged_articles_md_index_web_page.cpp} (93%) rename modules/web/nodes/paged_article/{paged_articles_md_index.h => paged_articles_md_index_web_page.h} (100%) rename modules/web/nodes/paged_article/{paged_articles.cpp => paged_articles_web_page.cpp} (96%) rename modules/web/nodes/paged_article/{paged_articles.h => paged_articles_web_page.h} (100%) rename modules/web/nodes/static_pages/{static_page.cpp => static_web_page.cpp} (98%) rename modules/web/nodes/static_pages/{static_page.h => static_web_page.h} (100%) rename modules/web/nodes/static_pages/{static_page_file.cpp => static_web_page_file.cpp} (97%) rename modules/web/nodes/static_pages/{static_page_file.h => static_web_page_file.h} (94%) rename modules/web/nodes/static_pages/{static_page_folder_files.cpp => static_web_page_folder_files.cpp} (98%) rename modules/web/nodes/static_pages/{static_page_folder_files.h => static_web_page_folder_files.h} (95%) diff --git a/modules/web/SCsub b/modules/web/SCsub index 9d833bd1d..a07b0f68f 100644 --- a/modules/web/SCsub +++ b/modules/web/SCsub @@ -47,18 +47,18 @@ sources = [ "http_server_simple/http_writer.cpp", "http_server_simple/http_parser/http_parser.c", - "nodes/static_pages/static_page.cpp", - "nodes/static_pages/static_page_file.cpp", - "nodes/static_pages/static_page_folder_files.cpp", + "nodes/static_pages/static_web_page.cpp", + "nodes/static_pages/static_web_page_file.cpp", + "nodes/static_pages/static_web_page_folder_files.cpp", - "nodes/folder_serve_nodes/browsable_folder_serve_node.cpp", - "nodes/folder_serve_nodes/folder_serve_node.cpp", + "nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp", + "nodes/folder_serve_nodes/folder_serve_web_page.cpp", - "nodes/list_page/list_page.cpp", + "nodes/list_page/list_web_page.cpp", - "nodes/paged_article/paged_article.cpp", - "nodes/paged_article/paged_articles.cpp", - #"nodes/paged_article/paged_articles_md_index.cpp", + "nodes/paged_article/paged_article_web_page.cpp", + "nodes/paged_article/paged_articles_web_page.cpp", + #"nodes/paged_article/paged_articles_md_index_web_page.cpp", "nodes/redirect/redirect_web_page.cpp", ] diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.cpp b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp similarity index 98% rename from modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.cpp rename to modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp index 740d88c4e..f34177295 100644 --- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.cpp +++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp @@ -1,4 +1,4 @@ -#include "browsable_folder_serve_node.h" +#include "browsable_folder_serve_web_page.h" #include "core/os/dir_access.h" diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.h b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h similarity index 97% rename from modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.h rename to modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h index df22a7484..a3013c35f 100644 --- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_node.h +++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h @@ -4,7 +4,7 @@ #include "core/ustring.h" #include "core/vector.h" -#include "folder_serve_node.h" +#include "folder_serve_web_page.h" class WebServerRequest; diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_node.cpp b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp similarity index 98% rename from modules/web/nodes/folder_serve_nodes/folder_serve_node.cpp rename to modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp index 0b77bdd49..3e7c80870 100644 --- a/modules/web/nodes/folder_serve_nodes/folder_serve_node.cpp +++ b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp @@ -1,4 +1,4 @@ -#include "folder_serve_node.h" +#include "folder_serve_web_page.h" #include "../../file_cache.h" #include "../../http/web_permission.h" diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_node.h b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h similarity index 100% rename from modules/web/nodes/folder_serve_nodes/folder_serve_node.h rename to modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h diff --git a/modules/web/nodes/list_page/list_page.cpp b/modules/web/nodes/list_page/list_web_page.cpp similarity index 99% rename from modules/web/nodes/list_page/list_page.cpp rename to modules/web/nodes/list_page/list_web_page.cpp index a5384d0ef..13bcaaf37 100644 --- a/modules/web/nodes/list_page/list_page.cpp +++ b/modules/web/nodes/list_page/list_web_page.cpp @@ -1,4 +1,4 @@ -#include "list_page.h" +#include "list_web_page.h" #include "core/error_macros.h" #include "core/os/dir_access.h" diff --git a/modules/web/nodes/list_page/list_page.h b/modules/web/nodes/list_page/list_web_page.h similarity index 100% rename from modules/web/nodes/list_page/list_page.h rename to modules/web/nodes/list_page/list_web_page.h diff --git a/modules/web/nodes/paged_article/paged_article.cpp b/modules/web/nodes/paged_article/paged_article_web_page.cpp similarity index 99% rename from modules/web/nodes/paged_article/paged_article.cpp rename to modules/web/nodes/paged_article/paged_article_web_page.cpp index 825fcdf86..8226c80b9 100644 --- a/modules/web/nodes/paged_article/paged_article.cpp +++ b/modules/web/nodes/paged_article/paged_article_web_page.cpp @@ -1,4 +1,4 @@ -#include "paged_article.h" +#include "paged_article_web_page.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" diff --git a/modules/web/nodes/paged_article/paged_article.h b/modules/web/nodes/paged_article/paged_article_web_page.h similarity index 100% rename from modules/web/nodes/paged_article/paged_article.h rename to modules/web/nodes/paged_article/paged_article_web_page.h diff --git a/modules/web/nodes/paged_article/paged_articles_md_index.cpp b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp similarity index 93% rename from modules/web/nodes/paged_article/paged_articles_md_index.cpp rename to modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp index 19ec2d022..67c50f1d9 100644 --- a/modules/web/nodes/paged_article/paged_articles_md_index.cpp +++ b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp @@ -1,4 +1,4 @@ -#include "paged_articles_md_index.h" +#include "paged_articles_md_index_web_page.h" #include "core/os/dir_access.h" @@ -6,8 +6,8 @@ #include "../../http/web_permission.h" #include "../../http/web_server_request.h" -#include "../list_page/list_page.h" -#include "paged_article.h" +#include "../list_page/list_web_page.h" +#include "paged_article_web_page.h" String PagedArticlesMDIndex::get_folder() { return folder; diff --git a/modules/web/nodes/paged_article/paged_articles_md_index.h b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h similarity index 100% rename from modules/web/nodes/paged_article/paged_articles_md_index.h rename to modules/web/nodes/paged_article/paged_articles_md_index_web_page.h diff --git a/modules/web/nodes/paged_article/paged_articles.cpp b/modules/web/nodes/paged_article/paged_articles_web_page.cpp similarity index 96% rename from modules/web/nodes/paged_article/paged_articles.cpp rename to modules/web/nodes/paged_article/paged_articles_web_page.cpp index 44af976ae..9e3d791e3 100644 --- a/modules/web/nodes/paged_article/paged_articles.cpp +++ b/modules/web/nodes/paged_article/paged_articles_web_page.cpp @@ -1,4 +1,4 @@ -#include "paged_articles.h" +#include "paged_articles_web_page.h" #include "core/os/dir_access.h" #include "core/os/os.h" @@ -7,7 +7,7 @@ #include "../../html/html_builder.h" #include "../../http/web_server_request.h" -#include "paged_article.h" +#include "paged_article_web_page.h" String PagedArticles::get_folder() { return _folder; diff --git a/modules/web/nodes/paged_article/paged_articles.h b/modules/web/nodes/paged_article/paged_articles_web_page.h similarity index 100% rename from modules/web/nodes/paged_article/paged_articles.h rename to modules/web/nodes/paged_article/paged_articles_web_page.h diff --git a/modules/web/nodes/static_pages/static_page.cpp b/modules/web/nodes/static_pages/static_web_page.cpp similarity index 98% rename from modules/web/nodes/static_pages/static_page.cpp rename to modules/web/nodes/static_pages/static_web_page.cpp index 184dcfdc3..0447746e2 100644 --- a/modules/web/nodes/static_pages/static_page.cpp +++ b/modules/web/nodes/static_pages/static_web_page.cpp @@ -1,4 +1,4 @@ -#include "static_page.h" +#include "static_web_page.h" #include "../../http/web_server_request.h" #include "core/os/file_access.h" diff --git a/modules/web/nodes/static_pages/static_page.h b/modules/web/nodes/static_pages/static_web_page.h similarity index 100% rename from modules/web/nodes/static_pages/static_page.h rename to modules/web/nodes/static_pages/static_web_page.h diff --git a/modules/web/nodes/static_pages/static_page_file.cpp b/modules/web/nodes/static_pages/static_web_page_file.cpp similarity index 97% rename from modules/web/nodes/static_pages/static_page_file.cpp rename to modules/web/nodes/static_pages/static_web_page_file.cpp index 52fbde6e8..54a6dc1d2 100644 --- a/modules/web/nodes/static_pages/static_page_file.cpp +++ b/modules/web/nodes/static_pages/static_web_page_file.cpp @@ -1,4 +1,4 @@ -#include "static_page_file.h" +#include "static_web_page_file.h" String StaticPageFile::get_file_path() { return _file_path; diff --git a/modules/web/nodes/static_pages/static_page_file.h b/modules/web/nodes/static_pages/static_web_page_file.h similarity index 94% rename from modules/web/nodes/static_pages/static_page_file.h rename to modules/web/nodes/static_pages/static_web_page_file.h index 48e9b02a6..0bf1e1bc5 100644 --- a/modules/web/nodes/static_pages/static_page_file.h +++ b/modules/web/nodes/static_pages/static_web_page_file.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "static_page.h" +#include "static_web_page.h" class StaticPageFile : public StaticPage { GDCLASS(StaticPageFile, StaticPage); diff --git a/modules/web/nodes/static_pages/static_page_folder_files.cpp b/modules/web/nodes/static_pages/static_web_page_folder_files.cpp similarity index 98% rename from modules/web/nodes/static_pages/static_page_folder_files.cpp rename to modules/web/nodes/static_pages/static_web_page_folder_files.cpp index 591e8608e..d87fa23c3 100644 --- a/modules/web/nodes/static_pages/static_page_folder_files.cpp +++ b/modules/web/nodes/static_pages/static_web_page_folder_files.cpp @@ -1,4 +1,4 @@ -#include "static_page_folder_files.h" +#include "static_web_page_folder_files.h" #include "core/os/dir_access.h" #include "core/os/file_access.h" diff --git a/modules/web/nodes/static_pages/static_page_folder_files.h b/modules/web/nodes/static_pages/static_web_page_folder_files.h similarity index 95% rename from modules/web/nodes/static_pages/static_page_folder_files.h rename to modules/web/nodes/static_pages/static_web_page_folder_files.h index 2e95494a7..2951a682a 100644 --- a/modules/web/nodes/static_pages/static_page_folder_files.h +++ b/modules/web/nodes/static_pages/static_web_page_folder_files.h @@ -3,7 +3,7 @@ #include "core/ustring.h" -#include "static_page.h" +#include "static_web_page.h" class StaticPageFolderFiles : public StaticPage { GDCLASS(StaticPageFolderFiles, StaticPage); diff --git a/modules/web/register_types.cpp b/modules/web/register_types.cpp index 1da8b43a3..89c70d08b 100644 --- a/modules/web/register_types.cpp +++ b/modules/web/register_types.cpp @@ -47,17 +47,17 @@ SOFTWARE. #include "http_server_simple/web_server_simple.h" -#include "nodes/static_pages/static_page.h" -#include "nodes/static_pages/static_page_file.h" -#include "nodes/static_pages/static_page_folder_files.h" +#include "nodes/static_pages/static_web_page.h" +#include "nodes/static_pages/static_web_page_file.h" +#include "nodes/static_pages/static_web_page_folder_files.h" -#include "nodes/folder_serve_nodes/browsable_folder_serve_node.h" -#include "nodes/folder_serve_nodes/folder_serve_node.h" +#include "nodes/folder_serve_nodes/browsable_folder_serve_web_page.h" +#include "nodes/folder_serve_nodes/folder_serve_web_page.h" -#include "nodes/list_page/list_page.h" +#include "nodes/list_page/list_web_page.h" -#include "nodes/paged_article/paged_article.h" -#include "nodes/paged_article/paged_articles.h" +#include "nodes/paged_article/paged_article_web_page.h" +#include "nodes/paged_article/paged_articles_web_page.h" //#include "nodes/paged_article/paged_articles_md_index.h" #include "nodes/redirect/redirect_web_page.h"