diff --git a/compile_linux.sh b/compile_linux.sh index f7eb992..97d9607 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -1,3 +1,3 @@ g++ -o3 -g main.cpp ./core/settings.cpp ./core/request.cpp ./core/http_server.cpp ./core/file_cache.cpp ./core/application.cpp ./rdn_application.cpp \ - ./themes/theme.cpp ./themes/theme_map.cpp \ + ./themes/theme.cpp \ -o ./bin/server -Ilibs -lpthread -std=c++11 diff --git a/themes/theme.h b/themes/theme.h index 0a71c13..67acf39 100644 --- a/themes/theme.h +++ b/themes/theme.h @@ -4,6 +4,30 @@ #include #include +/* +class ThemeMap { +public: + THEME_CLASS *current_theme; + std::map theme_map; + + ThemeMap() { + _instance = this; + } + ~ThemeMap() { + _instance = nullptr; + } + + static ThemeMap *get_singleton() { + return _instance; + } + +private: + static ThemeMap *_instance; +}; + +ThemeMap *ThemeMap::_instance = nullptr; +*/ + class Theme { public: diff --git a/themes/theme_map.cpp b/themes/theme_map.cpp deleted file mode 100644 index 15b9e5d..0000000 --- a/themes/theme_map.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "theme_map.h" - -ThemeMap::ThemeMap() { - _instance = this; -} - -ThemeMap::~ThemeMap() { - _instance = nullptr; -} - -ThemeMap *ThemeMap::get_singleton() { - return _instance; -} - -ThemeMap *ThemeMap::_instance = nullptr; \ No newline at end of file diff --git a/themes/theme_map.h b/themes/theme_map.h deleted file mode 100644 index 41b36d1..0000000 --- a/themes/theme_map.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef THEME_MAP_H -#define THEME_MAP_H - -#ifndef THEME_CLASS_INCLUDE -#define THEME_CLASS_INCLUDE "theme.h" -#endif - -#ifndef THEME_CLASS -#define THEME_CLASS Theme -#endif - -#include THEME_CLASS_INCLUDE - -class ThemeMap { -public: - THEME_CLASS *current_theme; - std::map theme_map; - - ThemeMap(); - ~ThemeMap(); - - static ThemeMap *get_singleton(); - -private: - static ThemeMap *_instance; -}; - -#endif \ No newline at end of file