Removed HandlerInstance.

core/http/handler_instance.cpp

@@ -1,13 +0,0 @@
-#include "handler_instance.h"
-
-#include "request.h"
-#include "core/object.h"
-
-HandlerInstance::HandlerInstance() {
-	instance = nullptr;
-}
-
-HandlerInstance::HandlerInstance(std::function<void(Object *, Request *)> p_handler_func, Object *p_instance) {
-	handler_func = p_handler_func;
-	instance = p_instance;
-}

core/http/handler_instance.h

@@ -1,17 +0,0 @@
-#ifndef HANDLER_INSTANCE_H
-#define HANDLER_INSTANCE_H
-
-#include <functional>
-
-class Object;
-class Request;
-
-struct HandlerInstance {
-	std::function<void(Object *, Request *)> handler_func;
-	Object *instance;
-
-	HandlerInstance();
-	HandlerInstance(std::function<void(Object *, Request *)> p_handler_func, Object *p_instance = nullptr);
-};
-
-#endif

core/http/request.h

@@ -11,8 +11,6 @@
 #include "core/object.h"
 #include "core/reference.h"
 
-#include "handler_instance.h"
-
 #include "http_enums.h"
 
 class WebServer;

core/http/web_root.h

@@ -6,11 +6,9 @@
 #include <functional>
 #include <map>
 #include <string>
-#include <vector>
 
 #include "web_router_node.h"
 
-#include "handler_instance.h"
 #include "middleware.h"
 
 class Request;
@@ -21,6 +19,8 @@ class Request;
 
 // Update the rest of the modules to the new systems
 
+//remove std::strings
+
 class WebRoot : public WebRouterNode {
 	RCPP_OBJECT(WebRoot, WebRouterNode);
 

modules/drogon/drogon_web_server.h

@@ -12,8 +12,6 @@
 #include <memory>
 #include <mutex>
 
-#include "core/http/handler_instance.h"
-
 #include <trantor/net/InetAddress.h>
 #include <trantor/net/Resolver.h>
 #include <trantor/utils/Logger.h>

modules/drogon/request.h

@@ -11,8 +11,6 @@
 #include "http/HttpRequestImpl.h"
 #include "http/HttpResponse.h"
 
-#include "core/http/handler_instance.h"
-
 //using namespace drogon;
 
 class DrogonWebServer;

modules/paged_list/paged_list.cpp

@@ -6,8 +6,6 @@
 
 #include "core/file_cache.h"
 
-#include "core/http/handler_instance.h"
-
 #include "core/database/database_manager.h"
 
 #include "core/html/html_builder.h"