From db70692e73d10c46368752b2f5d55c220eaaeae8 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 23 Jul 2022 01:35:22 +0200 Subject: [PATCH] Also renamed the classes themselves. --- modules/web/config.py | 18 ++-- .../browsable_folder_serve_web_page.cpp | 28 +++--- .../browsable_folder_serve_web_page.h | 12 +-- .../folder_serve_web_page.cpp | 22 ++--- .../folder_serve_web_page.h | 12 +-- modules/web/nodes/list_page/list_web_page.cpp | 94 +++++++++---------- modules/web/nodes/list_page/list_web_page.h | 12 +-- .../paged_article/paged_article_web_page.cpp | 58 ++++++------ .../paged_article/paged_article_web_page.h | 12 +-- .../paged_articles_md_index_web_page.cpp | 22 ++--- .../paged_articles_md_index_web_page.h | 16 ++-- .../paged_article/paged_articles_web_page.cpp | 34 +++---- .../paged_article/paged_articles_web_page.h | 12 +-- .../nodes/static_pages/static_web_page.cpp | 44 ++++----- .../web/nodes/static_pages/static_web_page.h | 12 +-- .../static_pages/static_web_page_file.cpp | 28 +++--- .../nodes/static_pages/static_web_page_file.h | 12 +-- .../static_web_page_folder_files.cpp | 32 +++---- .../static_web_page_folder_files.h | 12 +-- modules/web/register_types.cpp | 18 ++-- 20 files changed, 255 insertions(+), 255 deletions(-) diff --git a/modules/web/config.py b/modules/web/config.py index afb17fc2c..cf376b393 100644 --- a/modules/web/config.py +++ b/modules/web/config.py @@ -62,18 +62,18 @@ def get_doc_classes(): "WebServerSimple", - "StaticPage", - "StaticPageFile", - "StaticPageFolderFiles", + "StaticWebPage", + "StaticWebPageFile", + "StaticWebPageFolderFiles", - "FolderServeNode", - "BrowsableFolderServeNode", + "FolderServeWebPage", + "BrowsableFolderServeWebPage", - "ListPage", + "ListWebPage", - "PagedArticle", - "PagedArticles", - "PagedArticlesMDIndex", + "PagedArticleWebPage", + "PagedArticlesWebPage", + "PagedArticlesWebPageMDIndex", "RedirectWebPage", ] diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp index f34177295..c80db2b0d 100644 --- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp +++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.cpp @@ -10,14 +10,14 @@ #include "../../http/http_server_enums.h" -bool BrowsableFolderServeNode::get_should_render_menu() { +bool BrowsableFolderServeWebPage::get_should_render_menu() { return _should_render_menu; } -void BrowsableFolderServeNode::set_should_render_menu(const bool &val) { +void BrowsableFolderServeWebPage::set_should_render_menu(const bool &val) { _should_render_menu = val; } -void BrowsableFolderServeNode::_handle_request(Ref request) { +void BrowsableFolderServeWebPage::_handle_request(Ref request) { String file_name = request->get_path(true, false); for (int i = 0; i < _folder_indexes.size(); ++i) { @@ -37,14 +37,14 @@ void BrowsableFolderServeNode::_handle_request(Ref request) { request->send_error(HTTPServerEnums::HTTP_STATUS_CODE_404_NOT_FOUND); } -void BrowsableFolderServeNode::_render_index(Ref request) { +void BrowsableFolderServeWebPage::_render_index(Ref request) { request->body += _index; } -void BrowsableFolderServeNode::_render_preview(Ref request) { +void BrowsableFolderServeWebPage::_render_preview(Ref request) { } -void BrowsableFolderServeNode::load() { - FolderServeNode::load(); +void BrowsableFolderServeWebPage::load() { + FolderServeWebPage::load(); if (_serve_folder == "") { return; @@ -53,7 +53,7 @@ void BrowsableFolderServeNode::load() { evaluate_dir(_file_cache->get_wwwroot_abs(), true); } -void BrowsableFolderServeNode::evaluate_dir(const String &path, const bool top_level) { +void BrowsableFolderServeWebPage::evaluate_dir(const String &path, const bool top_level) { DirAccess *dir = DirAccess::open(path); ERR_FAIL_COND_MSG(!dir, "Error opening folde!r: " + String(path)); @@ -107,7 +107,7 @@ void BrowsableFolderServeNode::evaluate_dir(const String &path, const bool top_l render_dir_page(dir_uri, folders, files, top_level); } -void BrowsableFolderServeNode::render_dir_page(const String &dir_uri, const Vector &folders, const Vector &files, const bool top_level) { +void BrowsableFolderServeWebPage::render_dir_page(const String &dir_uri, const Vector &folders, const Vector &files, const bool top_level) { HTMLBuilder b; String uri = get_full_uri(false); @@ -151,15 +151,15 @@ void BrowsableFolderServeNode::render_dir_page(const String &dir_uri, const Vect } } -BrowsableFolderServeNode::BrowsableFolderServeNode() { +BrowsableFolderServeWebPage::BrowsableFolderServeWebPage() { _should_render_menu = true; } -BrowsableFolderServeNode::~BrowsableFolderServeNode() { +BrowsableFolderServeWebPage::~BrowsableFolderServeWebPage() { _folder_indexes.clear(); } -void BrowsableFolderServeNode::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_should_render_menu"), &BrowsableFolderServeNode::get_should_render_menu); - ClassDB::bind_method(D_METHOD("set_should_render_menu", "val"), &BrowsableFolderServeNode::set_should_render_menu); +void BrowsableFolderServeWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_should_render_menu"), &BrowsableFolderServeWebPage::get_should_render_menu); + ClassDB::bind_method(D_METHOD("set_should_render_menu", "val"), &BrowsableFolderServeWebPage::set_should_render_menu); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "should_render_menu"), "set_should_render_menu", "get_should_render_menu"); } diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h index a3013c35f..8e12f860e 100644 --- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h +++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h @@ -1,5 +1,5 @@ -#ifndef BROWSABLE_FOLDER_SERVE_NODE_H -#define BROWSABLE_FOLDER_SERVE_NODE_H +#ifndef BROWSABLE_FOLDER_SERVE_WEB_PAGE_H +#define BROWSABLE_FOLDER_SERVE_WEB_PAGE_H #include "core/ustring.h" #include "core/vector.h" @@ -20,8 +20,8 @@ class WebServerRequest; // ... // -class BrowsableFolderServeNode : public FolderServeNode { - GDCLASS(BrowsableFolderServeNode, FolderServeNode); +class BrowsableFolderServeWebPage : public FolderServeWebPage { + GDCLASS(BrowsableFolderServeWebPage, FolderServeWebPage); public: bool get_should_render_menu(); @@ -37,8 +37,8 @@ public: void evaluate_dir(const String &path, const bool top_level = false); virtual void render_dir_page(const String &dir_uri, const Vector &folders, const Vector &files, const bool top_level); - BrowsableFolderServeNode(); - ~BrowsableFolderServeNode(); + BrowsableFolderServeWebPage(); + ~BrowsableFolderServeWebPage(); protected: static void _bind_methods(); diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp index 3e7c80870..14dc915af 100644 --- a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp +++ b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.cpp @@ -4,14 +4,14 @@ #include "../../http/web_permission.h" #include "../../http/web_server_request.h" -String FolderServeNode::get_serve_folder() { +String FolderServeWebPage::get_serve_folder() { return _serve_folder; } -void FolderServeNode::set_serve_folder(const String &val) { +void FolderServeWebPage::set_serve_folder(const String &val) { _serve_folder = val; } -void FolderServeNode::_handle_request_main(Ref request) { +void FolderServeWebPage::_handle_request_main(Ref request) { if (_web_permission.is_valid()) { if (_web_permission->activate(request)) { return; @@ -42,7 +42,7 @@ void FolderServeNode::_handle_request_main(Ref request) { } } -void FolderServeNode::load() { +void FolderServeWebPage::load() { _file_cache->clear(); if (_serve_folder == "") { @@ -54,7 +54,7 @@ void FolderServeNode::load() { } } -void FolderServeNode::_notification(const int what) { +void FolderServeWebPage::_notification(const int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -64,17 +64,17 @@ void FolderServeNode::_notification(const int what) { } } -FolderServeNode::FolderServeNode() { +FolderServeWebPage::FolderServeWebPage() { _file_cache.instance(); } -FolderServeNode::~FolderServeNode() { +FolderServeWebPage::~FolderServeWebPage() { } -void FolderServeNode::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_serve_folder"), &FolderServeNode::get_serve_folder); - ClassDB::bind_method(D_METHOD("set_serve_folder", "val"), &FolderServeNode::set_serve_folder); +void FolderServeWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_serve_folder"), &FolderServeWebPage::get_serve_folder); + ClassDB::bind_method(D_METHOD("set_serve_folder", "val"), &FolderServeWebPage::set_serve_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "serve_folder"), "set_serve_folder", "get_serve_folder"); - ClassDB::bind_method(D_METHOD("load"), &FolderServeNode::load); + ClassDB::bind_method(D_METHOD("load"), &FolderServeWebPage::load); } diff --git a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h index 3c7f70ce4..2c61ec36f 100644 --- a/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h +++ b/modules/web/nodes/folder_serve_nodes/folder_serve_web_page.h @@ -1,5 +1,5 @@ -#ifndef FOLDER_SERVE_NODE_H -#define FOLDER_SERVE_NODE_H +#ifndef FOLDER_SERVE_WEB_PAGE_H +#define FOLDER_SERVE_WEB_PAGE_H #include "core/reference.h" #include "core/ustring.h" @@ -14,8 +14,8 @@ class FileCache; // this means directory walking (for example sending http://webapp.com/files/../../../etc/passwd), // and other techniques like it should not be possible. -class FolderServeNode : public WebNode { - GDCLASS(FolderServeNode, WebNode); +class FolderServeWebPage : public WebNode { + GDCLASS(FolderServeWebPage, WebNode); public: String get_serve_folder(); @@ -25,8 +25,8 @@ public: virtual void load(); - FolderServeNode(); - ~FolderServeNode(); + FolderServeWebPage(); + ~FolderServeWebPage(); protected: void _notification(const int what); diff --git a/modules/web/nodes/list_page/list_web_page.cpp b/modules/web/nodes/list_page/list_web_page.cpp index 13bcaaf37..32cc5835e 100644 --- a/modules/web/nodes/list_page/list_web_page.cpp +++ b/modules/web/nodes/list_page/list_web_page.cpp @@ -10,63 +10,63 @@ #include "../../http/web_permission.h" #include "../../http/web_server_request.h" -bool ListPage::get_paginate() { +bool ListWebPage::get_paginate() { return paginate; } -void ListPage::set_paginate(const bool &val) { +void ListWebPage::set_paginate(const bool &val) { paginate = val; } -int ListPage::get_max_visible_navigation_links() { +int ListWebPage::get_max_visible_navigation_links() { return max_visible_navigation_links; } -void ListPage::set_max_visible_navigation_links(const int &val) { +void ListWebPage::set_max_visible_navigation_links(const int &val) { max_visible_navigation_links = val; } -int ListPage::get_entry_per_page() { +int ListWebPage::get_entry_per_page() { return entry_per_page; } -void ListPage::set_entry_per_page(const int &val) { +void ListWebPage::set_entry_per_page(const int &val) { entry_per_page = val; } -String ListPage::get_folder() { +String ListWebPage::get_folder() { return folder; } -void ListPage::set_folder(const String &val) { +void ListWebPage::set_folder(const String &val) { folder = val; } -String ListPage::get_main_div_class() { +String ListWebPage::get_main_div_class() { return main_div_class; } -void ListPage::set_main_div_class(const String &val) { +void ListWebPage::set_main_div_class(const String &val) { main_div_class = val; } -String ListPage::get_entry_div_class() { +String ListWebPage::get_entry_div_class() { return entry_div_class; } -void ListPage::set_entry_div_class(const String &val) { +void ListWebPage::set_entry_div_class(const String &val) { entry_div_class = val; } -String ListPage::get_empty_div_class() { +String ListWebPage::get_empty_div_class() { return empty_div_class; } -void ListPage::set_empty_div_class(const String &val) { +void ListWebPage::set_empty_div_class(const String &val) { empty_div_class = val; } -String ListPage::get_placeholder_text() { +String ListWebPage::get_placeholder_text() { return placeholder_text; } -void ListPage::set_placeholder_text(const String &val) { +void ListWebPage::set_placeholder_text(const String &val) { placeholder_text = val; } -void ListPage::_handle_request_main(Ref request) { +void ListWebPage::_handle_request_main(Ref request) { if (_web_permission.is_valid()) { if (_web_permission->activate(request)) { return; @@ -108,20 +108,20 @@ void ListPage::_handle_request_main(Ref request) { request->compile_and_send_body(); } -void ListPage::_render_index(Ref request) { +void ListWebPage::_render_index(Ref request) { request->body += _pages[0]; } -void ListPage::_render_preview(Ref request) { +void ListWebPage::_render_preview(Ref request) { } -void ListPage::load() { - ERR_FAIL_COND_MSG(folder == "", "Error: ListPage::load called, but a folder is not set!"); +void ListWebPage::load() { + ERR_FAIL_COND_MSG(folder == "", "Error: ListWebPage::load called, but a folder is not set!"); Vector files; DirAccess *dir = DirAccess::open(folder); - ERR_FAIL_COND_MSG(!dir, "Error opening ListPage::folder! folder: \n" + folder); + ERR_FAIL_COND_MSG(!dir, "Error opening ListWebPage::folder! folder: \n" + folder); dir->list_dir_begin(); @@ -160,7 +160,7 @@ void ListPage::load() { render_no_entries_response(); } -void ListPage::render_entries(const Vector &list_entries) { +void ListWebPage::render_entries(const Vector &list_entries) { if (list_entries.size() == 0) { return; } @@ -177,7 +177,7 @@ void ListPage::render_entries(const Vector &list_entries) { } } -String ListPage::render_page(const int page_index, const int page_count, const Vector &list_entries, const int efrom, const int eto) { +String ListWebPage::render_page(const int page_index, const int page_count, const Vector &list_entries, const int efrom, const int eto) { HTMLBuilder b; b.div(main_div_class); @@ -192,7 +192,7 @@ String ListPage::render_page(const int page_index, const int page_count, const V return b.result; } -String ListPage::render_entry(const String &list_entry) { +String ListWebPage::render_entry(const String &list_entry) { HTMLBuilder b; b.div(main_div_class); @@ -202,7 +202,7 @@ String ListPage::render_entry(const String &list_entry) { return b.result; } -void ListPage::render_no_entries_response() { +void ListWebPage::render_no_entries_response() { HTMLBuilder b; b.div(empty_div_class)->w(placeholder_text)->cdiv(); @@ -210,7 +210,7 @@ void ListPage::render_no_entries_response() { _no_entries_response = b.result; } -void ListPage::_notification(const int what) { +void ListWebPage::_notification(const int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -223,7 +223,7 @@ void ListPage::_notification(const int what) { } } -ListPage::ListPage() : +ListWebPage::ListWebPage() : WebNode() { max_visible_navigation_links = 6; entry_per_page = 4; @@ -233,41 +233,41 @@ ListPage::ListPage() : placeholder_text = "No content yet!"; } -ListPage::~ListPage() { +ListWebPage::~ListWebPage() { } -void ListPage::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_paginate"), &ListPage::get_paginate); - ClassDB::bind_method(D_METHOD("set_paginate", "val"), &ListPage::set_paginate); +void ListWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_paginate"), &ListWebPage::get_paginate); + ClassDB::bind_method(D_METHOD("set_paginate", "val"), &ListWebPage::set_paginate); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "paginate"), "set_paginate", "get_paginate"); - ClassDB::bind_method(D_METHOD("get_max_visible_navigation_links"), &ListPage::get_max_visible_navigation_links); - ClassDB::bind_method(D_METHOD("set_max_visible_navigation_links", "val"), &ListPage::set_max_visible_navigation_links); + ClassDB::bind_method(D_METHOD("get_max_visible_navigation_links"), &ListWebPage::get_max_visible_navigation_links); + ClassDB::bind_method(D_METHOD("set_max_visible_navigation_links", "val"), &ListWebPage::set_max_visible_navigation_links); ADD_PROPERTY(PropertyInfo(Variant::INT, "max_visible_navigation_links"), "set_max_visible_navigation_links", "get_max_visible_navigation_links"); - ClassDB::bind_method(D_METHOD("get_entry_per_page"), &ListPage::get_entry_per_page); - ClassDB::bind_method(D_METHOD("set_entry_per_page", "val"), &ListPage::set_entry_per_page); + ClassDB::bind_method(D_METHOD("get_entry_per_page"), &ListWebPage::get_entry_per_page); + ClassDB::bind_method(D_METHOD("set_entry_per_page", "val"), &ListWebPage::set_entry_per_page); ADD_PROPERTY(PropertyInfo(Variant::INT, "entry_per_page"), "set_entry_per_page", "get_entry_per_page"); - ClassDB::bind_method(D_METHOD("get_folder"), &ListPage::get_folder); - ClassDB::bind_method(D_METHOD("set_folder", "val"), &ListPage::set_folder); + ClassDB::bind_method(D_METHOD("get_folder"), &ListWebPage::get_folder); + ClassDB::bind_method(D_METHOD("set_folder", "val"), &ListWebPage::set_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "folder"), "set_folder", "get_folder"); - ClassDB::bind_method(D_METHOD("get_main_div_class"), &ListPage::get_main_div_class); - ClassDB::bind_method(D_METHOD("set_main_div_class", "val"), &ListPage::set_main_div_class); + ClassDB::bind_method(D_METHOD("get_main_div_class"), &ListWebPage::get_main_div_class); + ClassDB::bind_method(D_METHOD("set_main_div_class", "val"), &ListWebPage::set_main_div_class); ADD_PROPERTY(PropertyInfo(Variant::STRING, "main_div_class"), "set_main_div_class", "get_main_div_class"); - ClassDB::bind_method(D_METHOD("get_entry_div_class"), &ListPage::get_entry_div_class); - ClassDB::bind_method(D_METHOD("set_entry_div_class", "val"), &ListPage::set_entry_div_class); + ClassDB::bind_method(D_METHOD("get_entry_div_class"), &ListWebPage::get_entry_div_class); + ClassDB::bind_method(D_METHOD("set_entry_div_class", "val"), &ListWebPage::set_entry_div_class); ADD_PROPERTY(PropertyInfo(Variant::STRING, "entry_div_class"), "set_entry_div_class", "get_entry_div_class"); - ClassDB::bind_method(D_METHOD("get_empty_div_class"), &ListPage::get_empty_div_class); - ClassDB::bind_method(D_METHOD("set_empty_div_class", "val"), &ListPage::set_empty_div_class); + ClassDB::bind_method(D_METHOD("get_empty_div_class"), &ListWebPage::get_empty_div_class); + ClassDB::bind_method(D_METHOD("set_empty_div_class", "val"), &ListWebPage::set_empty_div_class); ADD_PROPERTY(PropertyInfo(Variant::STRING, "empty_div_class"), "set_empty_div_class", "get_empty_div_class"); - ClassDB::bind_method(D_METHOD("get_placeholder_text"), &ListPage::get_placeholder_text); - ClassDB::bind_method(D_METHOD("set_placeholder_text", "val"), &ListPage::set_placeholder_text); + ClassDB::bind_method(D_METHOD("get_placeholder_text"), &ListWebPage::get_placeholder_text); + ClassDB::bind_method(D_METHOD("set_placeholder_text", "val"), &ListWebPage::set_placeholder_text); ADD_PROPERTY(PropertyInfo(Variant::STRING, "placeholder_text"), "set_placeholder_text", "get_placeholder_text"); - ClassDB::bind_method(D_METHOD("load"), &ListPage::load); + ClassDB::bind_method(D_METHOD("load"), &ListWebPage::load); } diff --git a/modules/web/nodes/list_page/list_web_page.h b/modules/web/nodes/list_page/list_web_page.h index 1e606e622..23b1c9d27 100644 --- a/modules/web/nodes/list_page/list_web_page.h +++ b/modules/web/nodes/list_page/list_web_page.h @@ -1,5 +1,5 @@ -#ifndef LIST_PAGE_H -#define LIST_PAGE_H +#ifndef LIST_WEB_PAGE_H +#define LIST_WEB_PAGE_H #include "core/ustring.h" #include "core/vector.h" @@ -27,8 +27,8 @@ class WebServerRequest; -class ListPage : public WebNode { - GDCLASS(ListPage, WebNode); +class ListWebPage : public WebNode { + GDCLASS(ListWebPage, WebNode); public: bool get_paginate(); @@ -67,8 +67,8 @@ public: virtual String render_entry(const String &list_entry); virtual void render_no_entries_response(); - ListPage(); - ~ListPage(); + ListWebPage(); + ~ListWebPage(); protected: void _notification(const int what); diff --git a/modules/web/nodes/paged_article/paged_article_web_page.cpp b/modules/web/nodes/paged_article/paged_article_web_page.cpp index 8226c80b9..c913d5698 100644 --- a/modules/web/nodes/paged_article/paged_article_web_page.cpp +++ b/modules/web/nodes/paged_article/paged_article_web_page.cpp @@ -10,28 +10,28 @@ #include "../../http/web_permission.h" #include "../../http/web_server_request.h" -String PagedArticle::get_articles_folder() { +String PagedArticleWebPage::get_articles_folder() { return articles_folder; } -void PagedArticle::set_articles_folder(const String &val) { +void PagedArticleWebPage::set_articles_folder(const String &val) { articles_folder = val; } -bool PagedArticle::get_serve_folder_relative() { +bool PagedArticleWebPage::get_serve_folder_relative() { return serve_folder_relative; } -void PagedArticle::set_serve_folder_relative(const bool &val) { +void PagedArticleWebPage::set_serve_folder_relative(const bool &val) { serve_folder_relative = val; } -String PagedArticle::get_serve_folder() { +String PagedArticleWebPage::get_serve_folder() { return serve_folder; } -void PagedArticle::set_serve_folder(const String &val) { +void PagedArticleWebPage::set_serve_folder(const String &val) { serve_folder = val; } -void PagedArticle::_handle_request_main(Ref request) { +void PagedArticleWebPage::_handle_request_main(Ref request) { if (_web_permission.is_valid()) { if (_web_permission->activate(request)) { return; @@ -74,23 +74,23 @@ void PagedArticle::_handle_request_main(Ref request) { request->send_error(HTTPServerEnums::HTTP_STATUS_CODE_404_NOT_FOUND); } -void PagedArticle::_render_index(Ref request) { +void PagedArticleWebPage::_render_index(Ref request) { // summary page request->body += index_page; } -void PagedArticle::_render_preview(Ref request) { +void PagedArticleWebPage::_render_preview(Ref request) { } -void PagedArticle::load() { - ERR_FAIL_COND_MSG(articles_folder == "", "Error: PagedArticle::load called, but a articles_folder is not set!"); +void PagedArticleWebPage::load() { + ERR_FAIL_COND_MSG(articles_folder == "", "Error: PagedArticleWebPage::load called, but a articles_folder is not set!"); _articles_folder_abs = DirAccess::get_filesystem_abspath_for(articles_folder); _articles_folder_abs = _articles_folder_abs.path_ensure_end_slash(); DirAccess *dir = DirAccess::open(_articles_folder_abs); - ERR_FAIL_COND_MSG(!dir, "Error opening PagedArticle::folder! folder: " + _articles_folder_abs); + ERR_FAIL_COND_MSG(!dir, "Error opening PagedArticleWebPage::folder! folder: " + _articles_folder_abs); Vector files; @@ -176,19 +176,19 @@ void PagedArticle::load() { } } -String PagedArticle::get_index_page() { +String PagedArticleWebPage::get_index_page() { return index_page; } -String PagedArticle::get_summary() { +String PagedArticleWebPage::get_summary() { return summary; } -void PagedArticle::generate_summary() { +void PagedArticleWebPage::generate_summary() { summary = get_uri_segment(); } -void PagedArticle::_notification(const int what) { +void PagedArticleWebPage::_notification(const int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -198,32 +198,32 @@ void PagedArticle::_notification(const int what) { } } -PagedArticle::PagedArticle() { +PagedArticleWebPage::PagedArticleWebPage() { file_cache.instance(); serve_folder_relative = true; serve_folder = "files"; } -PagedArticle::~PagedArticle() { +PagedArticleWebPage::~PagedArticleWebPage() { pages.clear(); } -void PagedArticle::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_articles_folder"), &PagedArticle::get_articles_folder); - ClassDB::bind_method(D_METHOD("set_articles_folder", "val"), &PagedArticle::set_articles_folder); +void PagedArticleWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_articles_folder"), &PagedArticleWebPage::get_articles_folder); + ClassDB::bind_method(D_METHOD("set_articles_folder", "val"), &PagedArticleWebPage::set_articles_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "articles_folder"), "set_articles_folder", "get_articles_folder"); - ClassDB::bind_method(D_METHOD("get_serve_folder_relative"), &PagedArticle::get_serve_folder_relative); - ClassDB::bind_method(D_METHOD("set_serve_folder_relative", "val"), &PagedArticle::set_serve_folder_relative); + ClassDB::bind_method(D_METHOD("get_serve_folder_relative"), &PagedArticleWebPage::get_serve_folder_relative); + ClassDB::bind_method(D_METHOD("set_serve_folder_relative", "val"), &PagedArticleWebPage::set_serve_folder_relative); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "serve_folder_relative"), "set_serve_folder_relative", "get_serve_folder_relative"); - ClassDB::bind_method(D_METHOD("get_serve_folder"), &PagedArticle::get_serve_folder); - ClassDB::bind_method(D_METHOD("set_serve_folder", "val"), &PagedArticle::set_serve_folder); + ClassDB::bind_method(D_METHOD("get_serve_folder"), &PagedArticleWebPage::get_serve_folder); + ClassDB::bind_method(D_METHOD("set_serve_folder", "val"), &PagedArticleWebPage::set_serve_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "serve_folder"), "set_serve_folder", "get_serve_folder"); - ClassDB::bind_method(D_METHOD("load"), &PagedArticle::load); - ClassDB::bind_method(D_METHOD("get_index_page"), &PagedArticle::get_index_page); - ClassDB::bind_method(D_METHOD("get_summary"), &PagedArticle::get_summary); - ClassDB::bind_method(D_METHOD("generate_summary"), &PagedArticle::generate_summary); + ClassDB::bind_method(D_METHOD("load"), &PagedArticleWebPage::load); + ClassDB::bind_method(D_METHOD("get_index_page"), &PagedArticleWebPage::get_index_page); + ClassDB::bind_method(D_METHOD("get_summary"), &PagedArticleWebPage::get_summary); + ClassDB::bind_method(D_METHOD("generate_summary"), &PagedArticleWebPage::generate_summary); } diff --git a/modules/web/nodes/paged_article/paged_article_web_page.h b/modules/web/nodes/paged_article/paged_article_web_page.h index 5a5187e4b..f6cc57550 100644 --- a/modules/web/nodes/paged_article/paged_article_web_page.h +++ b/modules/web/nodes/paged_article/paged_article_web_page.h @@ -1,5 +1,5 @@ -#ifndef PAGED_ARTICLE_H -#define PAGED_ARTICLE_H +#ifndef PAGED_ARTICLE_WEB_PAGE_H +#define PAGED_ARTICLE_WEB_PAGE_H #include "core/reference.h" #include "core/ustring.h" @@ -17,8 +17,8 @@ class WebServerRequest; class FileCache; -class PagedArticle : public WebNode { - GDCLASS(PagedArticle, WebNode); +class PagedArticleWebPage : public WebNode { + GDCLASS(PagedArticleWebPage, WebNode); public: String get_articles_folder(); @@ -42,8 +42,8 @@ public: virtual void generate_summary(); - PagedArticle(); - ~PagedArticle(); + PagedArticleWebPage(); + ~PagedArticleWebPage(); protected: void _notification(const int what); diff --git a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp index 67c50f1d9..4f7dfd395 100644 --- a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp +++ b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.cpp @@ -9,14 +9,14 @@ #include "../list_page/list_web_page.h" #include "paged_article_web_page.h" -String PagedArticlesMDIndex::get_folder() { +String PagedArticlesWebPageMDIndex::get_folder() { return folder; } -void PagedArticlesMDIndex::set_folder(const String &val) { +void PagedArticlesWebPageMDIndex::set_folder(const String &val) { folder = val; } -void PagedArticlesMDIndex::_handle_request_main(Ref request) { +void PagedArticlesWebPageMDIndex::_handle_request_main(Ref request) { if (_web_permission.is_valid()) { if (_web_permission->activate(request)) { return; @@ -33,15 +33,15 @@ void PagedArticlesMDIndex::_handle_request_main(Ref request) { articles->handle_request_main(request); } -void PagedArticlesMDIndex::_render_index(Ref request) { +void PagedArticlesWebPageMDIndex::_render_index(Ref request) { main_page->render_index(request); } -void PagedArticlesMDIndex::_render_preview(Ref request) { +void PagedArticlesWebPageMDIndex::_render_preview(Ref request) { main_page->render_preview(request); } -void PagedArticlesMDIndex::load() { +void PagedArticlesWebPageMDIndex::load() { main_page->set_folder(folder); main_page->load(); @@ -50,18 +50,18 @@ void PagedArticlesMDIndex::load() { articles->load(); } -PagedArticlesMDIndex::PagedArticlesMDIndex() { +PagedArticlesWebPageMDIndex::PagedArticlesWebPageMDIndex() { main_page = memnew(ListPage); articles = memnew(PagedArticle); } -PagedArticlesMDIndex::~PagedArticlesMDIndex() { +PagedArticlesWebPageMDIndex::~PagedArticlesWebPageMDIndex() { memdelete(main_page); memdelete(articles); } -void PagedArticlesMDIndex::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_folder"), &PagedArticlesMDIndex::get_folder); - ClassDB::bind_method(D_METHOD("set_folder", "val"), &PagedArticlesMDIndex::set_folder); +void PagedArticlesWebPageMDIndex::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_folder"), &PagedArticlesWebPageMDIndex::get_folder); + ClassDB::bind_method(D_METHOD("set_folder", "val"), &PagedArticlesWebPageMDIndex::set_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "folder"), "set_folder", "get_folder"); } diff --git a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h index b1d939a06..5c0b428de 100644 --- a/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h +++ b/modules/web/nodes/paged_article/paged_articles_md_index_web_page.h @@ -1,19 +1,19 @@ -#ifndef PAGED_ARTICLES_MD_INDEX_H -#define PAGED_ARTICLES_MD_INDEX_H +#ifndef PAGED_ARTICLES_WEB_PAGE_MD_INDEX_H +#define PAGED_ARTICLES_WEB_PAGE_MD_INDEX_H #include "core/ustring.h" #include "../../http/web_node.h" -// Inherit from PagedArticles and override generate_index_page -> load and process md files in the set folder -// SHould probably be called something else. PagedArticlesMDIndex ? +// Inherit from PagedArticlesWebPage and override generate_index_page -> load and process md files in the set folder +// SHould probably be called something else. PagedArticlesWebPageMDIndex ? class WebServerRequest; class ListPage; class PagedArticle; -class PagedArticlesMDIndex : public WebNode { - GDCLASS(PagedArticlesMDIndex, WebNode); +class PagedArticlesWebPageMDIndex : public WebNode { + GDCLASS(PagedArticlesWebPageMDIndex, WebNode); public: String get_folder(); @@ -26,8 +26,8 @@ public: void load(); - PagedArticlesMDIndex(); - ~PagedArticlesMDIndex(); + PagedArticlesWebPageMDIndex(); + ~PagedArticlesWebPageMDIndex(); protected: static void _bind_methods(); diff --git a/modules/web/nodes/paged_article/paged_articles_web_page.cpp b/modules/web/nodes/paged_article/paged_articles_web_page.cpp index 9e3d791e3..4b4818422 100644 --- a/modules/web/nodes/paged_article/paged_articles_web_page.cpp +++ b/modules/web/nodes/paged_article/paged_articles_web_page.cpp @@ -9,36 +9,36 @@ #include "paged_article_web_page.h" -String PagedArticles::get_folder() { +String PagedArticlesWebPage::get_folder() { return _folder; } -void PagedArticles::set_folder(const String &val) { +void PagedArticlesWebPage::set_folder(const String &val) { _folder = val; } -void PagedArticles::_handle_request(Ref request) { +void PagedArticlesWebPage::_handle_request(Ref request) { render_menu(request); render_index(request); request->compile_and_send_body(); } -void PagedArticles::_render_index(Ref request) { +void PagedArticlesWebPage::_render_index(Ref request) { // summary page request->body += _index_page; } -void PagedArticles::_render_preview(Ref request) { +void PagedArticlesWebPage::_render_preview(Ref request) { } -void PagedArticles::load() { - ERR_FAIL_COND_MSG(_folder == "", "Error: PagedArticles::load called, but a folder is not set!"); +void PagedArticlesWebPage::load() { + ERR_FAIL_COND_MSG(_folder == "", "Error: PagedArticlesWebPage::load called, but a folder is not set!"); String folder = DirAccess::get_filesystem_abspath_for(_folder); folder = folder.path_clean_end_slash(); DirAccess *dir = DirAccess::open(folder); - ERR_FAIL_COND_MSG(!dir, "Error opening PagedArticles::folder! folder: " + folder); + ERR_FAIL_COND_MSG(!dir, "Error opening PagedArticlesWebPage::folder! folder: " + folder); dir->list_dir_begin(); @@ -47,7 +47,7 @@ void PagedArticles::load() { if (dir->current_is_dir() && file_name != "." && file_name != "..") { String ff = folder + "/" + file_name; - PagedArticle *p = memnew(PagedArticle); + PagedArticleWebPage *p = memnew(PagedArticleWebPage); p->set_articles_folder(ff); p->set_uri_segment(file_name); @@ -63,13 +63,13 @@ void PagedArticles::load() { generate_index_page(); } -void PagedArticles::generate_index_page() { +void PagedArticlesWebPage::generate_index_page() { HTMLBuilder b; b.div("article_list"); for (int i = 0; i < get_child_count(); ++i) { - PagedArticle *a = Object::cast_to(get_child(i)); + PagedArticleWebPage *a = Object::cast_to(get_child(i)); if (a) { b.a(a->get_full_uri()); @@ -83,7 +83,7 @@ void PagedArticles::generate_index_page() { _index_page = b.result; } -void PagedArticles::_notification(int what) { +void PagedArticlesWebPage::_notification(int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -93,14 +93,14 @@ void PagedArticles::_notification(int what) { } } -PagedArticles::PagedArticles() { +PagedArticlesWebPage::PagedArticlesWebPage() { } -PagedArticles::~PagedArticles() { +PagedArticlesWebPage::~PagedArticlesWebPage() { } -void PagedArticles::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_folder"), &PagedArticles::get_folder); - ClassDB::bind_method(D_METHOD("set_folder", "val"), &PagedArticles::set_folder); +void PagedArticlesWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_folder"), &PagedArticlesWebPage::get_folder); + ClassDB::bind_method(D_METHOD("set_folder", "val"), &PagedArticlesWebPage::set_folder); ADD_PROPERTY(PropertyInfo(Variant::STRING, "folder"), "set_folder", "get_folder"); } diff --git a/modules/web/nodes/paged_article/paged_articles_web_page.h b/modules/web/nodes/paged_article/paged_articles_web_page.h index d95617c4c..d5aae7356 100644 --- a/modules/web/nodes/paged_article/paged_articles_web_page.h +++ b/modules/web/nodes/paged_article/paged_articles_web_page.h @@ -1,5 +1,5 @@ -#ifndef PAGED_ARTICLES_H -#define PAGED_ARTICLES_H +#ifndef PAGED_ARTICLES_WEB_PAGE_H +#define PAGED_ARTICLES_WEB_PAGE_H #include "core/ustring.h" #include "core/vector.h" @@ -23,8 +23,8 @@ class WebServerRequest; -class PagedArticles : public WebNode { - GDCLASS(PagedArticles, WebNode); +class PagedArticlesWebPage : public WebNode { + GDCLASS(PagedArticlesWebPage, WebNode); public: String get_folder(); @@ -38,8 +38,8 @@ public: void load(); void generate_index_page(); - PagedArticles(); - ~PagedArticles(); + PagedArticlesWebPage(); + ~PagedArticlesWebPage(); protected: void _notification(int what); diff --git a/modules/web/nodes/static_pages/static_web_page.cpp b/modules/web/nodes/static_pages/static_web_page.cpp index 0447746e2..16f77f65c 100644 --- a/modules/web/nodes/static_pages/static_web_page.cpp +++ b/modules/web/nodes/static_pages/static_web_page.cpp @@ -3,28 +3,28 @@ #include "../../http/web_server_request.h" #include "core/os/file_access.h" -String StaticPage::get_data() { +String StaticWebPage::get_data() { return _data; } -void StaticPage::set_data(const String &val) { +void StaticWebPage::set_data(const String &val) { _data = val; } -String StaticPage::get_preview_data() { +String StaticWebPage::get_preview_data() { return _preview_data; } -void StaticPage::set_preview_data(const String &val) { +void StaticWebPage::set_preview_data(const String &val) { _preview_data = val; } -bool StaticPage::get_should_render_menu() { +bool StaticWebPage::get_should_render_menu() { return _should_render_menu; } -void StaticPage::set_should_render_menu(const bool &val) { +void StaticWebPage::set_should_render_menu(const bool &val) { _should_render_menu = val; } -void StaticPage::_handle_request(Ref request) { +void StaticWebPage::_handle_request(Ref request) { if (_should_render_menu) { render_main_menu(request); } @@ -33,15 +33,15 @@ void StaticPage::_handle_request(Ref request) { request->compile_and_send_body(); } -void StaticPage::_render_index(Ref request) { +void StaticWebPage::_render_index(Ref request) { request->body += _data; } -void StaticPage::_render_preview(Ref request) { +void StaticWebPage::_render_preview(Ref request) { request->body += _preview_data; } -void StaticPage::load_file(const String &path) { +void StaticWebPage::load_file(const String &path) { FileAccess *f = FileAccess::open(path, FileAccess::READ); if (f) { @@ -53,7 +53,7 @@ void StaticPage::load_file(const String &path) { } } -void StaticPage::load_and_process_file(const String &path) { +void StaticWebPage::load_and_process_file(const String &path) { FileAccess *f = FileAccess::open(path, FileAccess::READ); if (f) { @@ -69,26 +69,26 @@ void StaticPage::load_and_process_file(const String &path) { //should probably support md -> I should probably write a parser } -StaticPage::StaticPage() { +StaticWebPage::StaticWebPage() { _should_render_menu = true; } -StaticPage::~StaticPage() { +StaticWebPage::~StaticWebPage() { } -void StaticPage::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_data"), &StaticPage::get_data); - ClassDB::bind_method(D_METHOD("set_data", "val"), &StaticPage::set_data); +void StaticWebPage::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_data"), &StaticWebPage::get_data); + ClassDB::bind_method(D_METHOD("set_data", "val"), &StaticWebPage::set_data); ADD_PROPERTY(PropertyInfo(Variant::STRING, "data", PROPERTY_HINT_MULTILINE_TEXT), "set_data", "get_data"); - ClassDB::bind_method(D_METHOD("get_preview_data"), &StaticPage::get_preview_data); - ClassDB::bind_method(D_METHOD("set_preview_data", "val"), &StaticPage::set_preview_data); + ClassDB::bind_method(D_METHOD("get_preview_data"), &StaticWebPage::get_preview_data); + ClassDB::bind_method(D_METHOD("set_preview_data", "val"), &StaticWebPage::set_preview_data); ADD_PROPERTY(PropertyInfo(Variant::STRING, "preview_data", PROPERTY_HINT_MULTILINE_TEXT), "set_preview_data", "get_preview_data"); - ClassDB::bind_method(D_METHOD("get_should_render_menu"), &StaticPage::get_should_render_menu); - ClassDB::bind_method(D_METHOD("set_should_render_menu", "val"), &StaticPage::set_should_render_menu); + ClassDB::bind_method(D_METHOD("get_should_render_menu"), &StaticWebPage::get_should_render_menu); + ClassDB::bind_method(D_METHOD("set_should_render_menu", "val"), &StaticWebPage::set_should_render_menu); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "should_render_menu"), "set_should_render_menu", "get_should_render_menu"); - ClassDB::bind_method(D_METHOD("load_file", "path"), &StaticPage::load_file); - ClassDB::bind_method(D_METHOD("load_and_process_file", "path"), &StaticPage::load_and_process_file); + ClassDB::bind_method(D_METHOD("load_file", "path"), &StaticWebPage::load_file); + ClassDB::bind_method(D_METHOD("load_and_process_file", "path"), &StaticWebPage::load_and_process_file); } diff --git a/modules/web/nodes/static_pages/static_web_page.h b/modules/web/nodes/static_pages/static_web_page.h index bd4af7976..e63e8d24d 100644 --- a/modules/web/nodes/static_pages/static_web_page.h +++ b/modules/web/nodes/static_pages/static_web_page.h @@ -1,5 +1,5 @@ -#ifndef STATIC_PAGE_H -#define STATIC_PAGE_H +#ifndef STATIC_WEB_PAGE_H +#define STATIC_WEB_PAGE_H #include "core/ustring.h" @@ -7,8 +7,8 @@ class WebServerRequest; -class StaticPage : public WebNode { - GDCLASS(StaticPage, WebNode); +class StaticWebPage : public WebNode { + GDCLASS(StaticWebPage, WebNode); public: String get_data(); @@ -28,8 +28,8 @@ public: void load_file(const String &path); void load_and_process_file(const String &path); - StaticPage(); - ~StaticPage(); + StaticWebPage(); + ~StaticWebPage(); protected: static void _bind_methods(); diff --git a/modules/web/nodes/static_pages/static_web_page_file.cpp b/modules/web/nodes/static_pages/static_web_page_file.cpp index 54a6dc1d2..2010a9a45 100644 --- a/modules/web/nodes/static_pages/static_web_page_file.cpp +++ b/modules/web/nodes/static_pages/static_web_page_file.cpp @@ -1,20 +1,20 @@ #include "static_web_page_file.h" -String StaticPageFile::get_file_path() { +String StaticWebPageFile::get_file_path() { return _file_path; } -void StaticPageFile::set_file_path(const String &val) { +void StaticWebPageFile::set_file_path(const String &val) { _file_path = val; } -bool StaticPageFile::get_process_if_can() { +bool StaticWebPageFile::get_process_if_can() { return _process_if_can; } -void StaticPageFile::set_process_if_can(const bool &val) { +void StaticWebPageFile::set_process_if_can(const bool &val) { _process_if_can = val; } -void StaticPageFile::load() { +void StaticWebPageFile::load() { if (_file_path == "") { return; } @@ -26,7 +26,7 @@ void StaticPageFile::load() { } } -void StaticPageFile::_notification(const int what) { +void StaticWebPageFile::_notification(const int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -36,21 +36,21 @@ void StaticPageFile::_notification(const int what) { } } -StaticPageFile::StaticPageFile() { +StaticWebPageFile::StaticWebPageFile() { _process_if_can = true; } -StaticPageFile::~StaticPageFile() { +StaticWebPageFile::~StaticWebPageFile() { } -void StaticPageFile::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_file_path"), &StaticPageFile::get_file_path); - ClassDB::bind_method(D_METHOD("set_file_path", "val"), &StaticPageFile::set_file_path); +void StaticWebPageFile::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_file_path"), &StaticWebPageFile::get_file_path); + ClassDB::bind_method(D_METHOD("set_file_path", "val"), &StaticWebPageFile::set_file_path); ADD_PROPERTY(PropertyInfo(Variant::STRING, "file_path"), "set_file_path", "get_file_path"); - ClassDB::bind_method(D_METHOD("get_process_if_can"), &StaticPageFile::get_process_if_can); - ClassDB::bind_method(D_METHOD("set_process_if_can", "val"), &StaticPageFile::set_process_if_can); + ClassDB::bind_method(D_METHOD("get_process_if_can"), &StaticWebPageFile::get_process_if_can); + ClassDB::bind_method(D_METHOD("set_process_if_can", "val"), &StaticWebPageFile::set_process_if_can); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "process_if_can"), "set_process_if_can", "get_process_if_can"); - ClassDB::bind_method(D_METHOD("load"), &StaticPageFile::load); + ClassDB::bind_method(D_METHOD("load"), &StaticWebPageFile::load); } diff --git a/modules/web/nodes/static_pages/static_web_page_file.h b/modules/web/nodes/static_pages/static_web_page_file.h index 0bf1e1bc5..3cbecdf92 100644 --- a/modules/web/nodes/static_pages/static_web_page_file.h +++ b/modules/web/nodes/static_pages/static_web_page_file.h @@ -1,12 +1,12 @@ -#ifndef STATIC_PAGE_FILE_H -#define STATIC_PAGE_FILE_H +#ifndef STATIC_WEB_PAGE_FILE_H +#define STATIC_WEB_PAGE_FILE_H #include "core/ustring.h" #include "static_web_page.h" -class StaticPageFile : public StaticPage { - GDCLASS(StaticPageFile, StaticPage); +class StaticWebPageFile : public StaticWebPage { + GDCLASS(StaticWebPageFile, StaticWebPage); public: String get_file_path(); @@ -17,8 +17,8 @@ public: void load(); - StaticPageFile(); - ~StaticPageFile(); + StaticWebPageFile(); + ~StaticWebPageFile(); protected: void _notification(const int what); diff --git a/modules/web/nodes/static_pages/static_web_page_folder_files.cpp b/modules/web/nodes/static_pages/static_web_page_folder_files.cpp index d87fa23c3..b40f49544 100644 --- a/modules/web/nodes/static_pages/static_web_page_folder_files.cpp +++ b/modules/web/nodes/static_pages/static_web_page_folder_files.cpp @@ -3,21 +3,21 @@ #include "core/os/dir_access.h" #include "core/os/file_access.h" -String StaticPageFolderFiles::get_dir_path() { +String StaticWebPageFolderFiles::get_dir_path() { return _dir_path; } -void StaticPageFolderFiles::set_dir_path(const String &val) { +void StaticWebPageFolderFiles::set_dir_path(const String &val) { _dir_path = val; } -bool StaticPageFolderFiles::get_process_if_can() { +bool StaticWebPageFolderFiles::get_process_if_can() { return _process_if_can; } -void StaticPageFolderFiles::set_process_if_can(const bool &val) { +void StaticWebPageFolderFiles::set_process_if_can(const bool &val) { _process_if_can = val; } -void StaticPageFolderFiles::load() { +void StaticWebPageFolderFiles::load() { if (_dir_path == "") { return; } @@ -60,11 +60,11 @@ void StaticPageFolderFiles::load() { } } -void StaticPageFolderFiles::append_data(const String &d) { +void StaticWebPageFolderFiles::append_data(const String &d) { _data += d; } -void StaticPageFolderFiles::_notification(const int what) { +void StaticWebPageFolderFiles::_notification(const int what) { switch (what) { case NOTIFICATION_ENTER_TREE: load(); @@ -74,22 +74,22 @@ void StaticPageFolderFiles::_notification(const int what) { } } -StaticPageFolderFiles::StaticPageFolderFiles() { +StaticWebPageFolderFiles::StaticWebPageFolderFiles() { _process_if_can = true; } -StaticPageFolderFiles::~StaticPageFolderFiles() { +StaticWebPageFolderFiles::~StaticWebPageFolderFiles() { } -void StaticPageFolderFiles::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_dir_path"), &StaticPageFolderFiles::get_dir_path); - ClassDB::bind_method(D_METHOD("set_dir_path", "val"), &StaticPageFolderFiles::set_dir_path); +void StaticWebPageFolderFiles::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_dir_path"), &StaticWebPageFolderFiles::get_dir_path); + ClassDB::bind_method(D_METHOD("set_dir_path", "val"), &StaticWebPageFolderFiles::set_dir_path); ADD_PROPERTY(PropertyInfo(Variant::STRING, "dir_path"), "set_dir_path", "get_dir_path"); - ClassDB::bind_method(D_METHOD("get_process_if_can"), &StaticPageFolderFiles::get_process_if_can); - ClassDB::bind_method(D_METHOD("set_process_if_can", "val"), &StaticPageFolderFiles::set_process_if_can); + ClassDB::bind_method(D_METHOD("get_process_if_can"), &StaticWebPageFolderFiles::get_process_if_can); + ClassDB::bind_method(D_METHOD("set_process_if_can", "val"), &StaticWebPageFolderFiles::set_process_if_can); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "process_if_can"), "set_process_if_can", "get_process_if_can"); - ClassDB::bind_method(D_METHOD("load"), &StaticPageFolderFiles::load); - ClassDB::bind_method(D_METHOD("append_data", "val"), &StaticPageFolderFiles::append_data); + ClassDB::bind_method(D_METHOD("load"), &StaticWebPageFolderFiles::load); + ClassDB::bind_method(D_METHOD("append_data", "val"), &StaticWebPageFolderFiles::append_data); } diff --git a/modules/web/nodes/static_pages/static_web_page_folder_files.h b/modules/web/nodes/static_pages/static_web_page_folder_files.h index 2951a682a..01db60473 100644 --- a/modules/web/nodes/static_pages/static_web_page_folder_files.h +++ b/modules/web/nodes/static_pages/static_web_page_folder_files.h @@ -1,12 +1,12 @@ -#ifndef STATIC_PAGE_FOLDER_FILES_H -#define STATIC_PAGE_FOLDER_FILES_H +#ifndef STATIC_WEB_PAGE_FOLDER_FILES_H +#define STATIC_WEB_PAGE_FOLDER_FILES_H #include "core/ustring.h" #include "static_web_page.h" -class StaticPageFolderFiles : public StaticPage { - GDCLASS(StaticPageFolderFiles, StaticPage); +class StaticWebPageFolderFiles : public StaticWebPage { + GDCLASS(StaticWebPageFolderFiles, StaticWebPage); public: String get_dir_path(); @@ -18,8 +18,8 @@ public: void load(); virtual void append_data(const String &d); - StaticPageFolderFiles(); - ~StaticPageFolderFiles(); + StaticWebPageFolderFiles(); + ~StaticWebPageFolderFiles(); protected: void _notification(const int what); diff --git a/modules/web/register_types.cpp b/modules/web/register_types.cpp index 89c70d08b..8bb5ac44b 100644 --- a/modules/web/register_types.cpp +++ b/modules/web/register_types.cpp @@ -112,18 +112,18 @@ void register_web_types() { ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); - ClassDB::register_class(); + ClassDB::register_class(); - ClassDB::register_class(); - ClassDB::register_class(); - //ClassDB::register_class(); + ClassDB::register_class(); + ClassDB::register_class(); + //ClassDB::register_class(); ClassDB::register_class(); }