mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-25 21:27:30 +01:00
Removed web settings related code from WebNode.
This commit is contained in:
parent
83160ae6cf
commit
eb251fef19
@ -9,10 +9,6 @@
|
|||||||
#include "modules/database/database_connection.h"
|
#include "modules/database/database_connection.h"
|
||||||
#include "web_server_request.h"
|
#include "web_server_request.h"
|
||||||
|
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
#include "core/settings/settings.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "web_permission.h"
|
#include "web_permission.h"
|
||||||
#include "web_server.h"
|
#include "web_server.h"
|
||||||
|
|
||||||
@ -65,21 +61,6 @@ String WebNode::get_full_uri_parent(const bool slash_at_the_end) {
|
|||||||
return uri;
|
return uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
Settings *WebNode::get_settings() {
|
|
||||||
if (_settings) {
|
|
||||||
return _settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Settings::get_singleton();
|
|
||||||
}
|
|
||||||
void WebNode::set_settings(Settings *settings) {
|
|
||||||
_settings = settings;
|
|
||||||
|
|
||||||
// todo send event to children when it's implemented?
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Ref<WebPermission> WebNode::get_web_permission() {
|
Ref<WebPermission> WebNode::get_web_permission() {
|
||||||
return _web_permission;
|
return _web_permission;
|
||||||
}
|
}
|
||||||
@ -416,11 +397,6 @@ WebNode::WebNode() {
|
|||||||
//_database = nullptr;
|
//_database = nullptr;
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
// same for this
|
|
||||||
_settings = nullptr;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
_routing_enabled = true;
|
_routing_enabled = true;
|
||||||
_index_node = nullptr;
|
_index_node = nullptr;
|
||||||
}
|
}
|
||||||
@ -436,11 +412,6 @@ void WebNode::_bind_methods() {
|
|||||||
ClassDB::bind_method(D_METHOD("get_full_uri", "slash_at_the_end "), &WebNode::get_full_uri, true);
|
ClassDB::bind_method(D_METHOD("get_full_uri", "slash_at_the_end "), &WebNode::get_full_uri, true);
|
||||||
ClassDB::bind_method(D_METHOD("get_full_uri_parent", "slash_at_the_end "), &WebNode::get_full_uri_parent, true);
|
ClassDB::bind_method(D_METHOD("get_full_uri_parent", "slash_at_the_end "), &WebNode::get_full_uri_parent, true);
|
||||||
|
|
||||||
//#if WEB_SETTINGS_ENABLED
|
|
||||||
// Settings *get_settings();
|
|
||||||
// void set_settings(Settings * settings);
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("get_web_permission"), &WebNode::get_web_permission);
|
ClassDB::bind_method(D_METHOD("get_web_permission"), &WebNode::get_web_permission);
|
||||||
ClassDB::bind_method(D_METHOD("set_web_permission", "val"), &WebNode::set_web_permission);
|
ClassDB::bind_method(D_METHOD("set_web_permission", "val"), &WebNode::set_web_permission);
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "web_permission", PROPERTY_HINT_RESOURCE_TYPE, "WebPermission"), "set_web_permission", "get_web_permission");
|
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "web_permission", PROPERTY_HINT_RESOURCE_TYPE, "WebPermission"), "set_web_permission", "get_web_permission");
|
||||||
|
@ -9,9 +9,6 @@
|
|||||||
#include "scene/main/node.h"
|
#include "scene/main/node.h"
|
||||||
|
|
||||||
class WebServerRequest;
|
class WebServerRequest;
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
class Settings;
|
|
||||||
#endif
|
|
||||||
class WebServer;
|
class WebServer;
|
||||||
class WebPermission;
|
class WebPermission;
|
||||||
|
|
||||||
@ -38,12 +35,6 @@ public:
|
|||||||
String get_full_uri(const bool slash_at_the_end = true);
|
String get_full_uri(const bool slash_at_the_end = true);
|
||||||
String get_full_uri_parent(const bool slash_at_the_end = true);
|
String get_full_uri_parent(const bool slash_at_the_end = true);
|
||||||
|
|
||||||
//Maybe this settings class could be a resource, also it needs a new name
|
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
Settings *get_settings();
|
|
||||||
void set_settings(Settings *settings);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Ref<WebPermission> get_web_permission();
|
Ref<WebPermission> get_web_permission();
|
||||||
void set_web_permission(const Ref<WebPermission> &wp);
|
void set_web_permission(const Ref<WebPermission> &wp);
|
||||||
|
|
||||||
@ -113,10 +104,6 @@ protected:
|
|||||||
|
|
||||||
String _uri_segment;
|
String _uri_segment;
|
||||||
|
|
||||||
#if WEB_SETTINGS_ENABLED
|
|
||||||
Settings *_settings;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MODULE_DATABASE_ENABLED
|
#ifdef MODULE_DATABASE_ENABLED
|
||||||
Ref<Database> _database;
|
Ref<Database> _database;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user