diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp --- a/src/ai/ai.hpp +++ b/src/ai/ai.hpp @@ -11,7 +11,6 @@ #define AI_HPP #include "../script/api/script_event_types.hpp" -#include "../core/string_compare_type.hpp" #include "ai_scanner.hpp" /** diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp --- a/src/blitter/factory.hpp +++ b/src/blitter/factory.hpp @@ -13,7 +13,6 @@ #include "base.hpp" #include "../debug.h" #include "../string_func.h" -#include "../core/string_compare_type.hpp" #include diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -26,6 +26,5 @@ add_files( smallstack_type.hpp smallvec_type.hpp span_type.hpp - string_compare_type.hpp strong_typedef_type.hpp ) diff --git a/src/core/string_compare_type.hpp b/src/core/string_compare_type.hpp deleted file mode 100644 --- a/src/core/string_compare_type.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . - */ - -/** @file string_compare_type.hpp Comparator class for "const char *" so it can be used as a key for std::map */ - -#ifndef STRING_COMPARE_TYPE_HPP -#define STRING_COMPARE_TYPE_HPP - -/** Comparator for strings. */ -struct StringCompare { - /** - * Compare two strings. - * @param a The first string. - * @param b The second string. - * @return True is the first string is deemed "lower" than the second string. - */ - bool operator () (const char *a, const char *b) const - { - return strcmp(a, b) < 0; - } -}; - -#endif /* STRING_COMPARE_TYPE_HPP */ diff --git a/src/driver.h b/src/driver.h --- a/src/driver.h +++ b/src/driver.h @@ -11,7 +11,6 @@ #define DRIVER_H #include "core/enum_type.hpp" -#include "core/string_compare_type.hpp" #include "string_type.h" #include diff --git a/src/game/game.hpp b/src/game/game.hpp --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -10,7 +10,6 @@ #ifndef GAME_HPP #define GAME_HPP -#include "../core/string_compare_type.hpp" #include "game_scanner.hpp" #include "../script/api/script_event_types.hpp" diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp --- a/src/script/api/script_controller.hpp +++ b/src/script/api/script_controller.hpp @@ -11,7 +11,6 @@ #define SCRIPT_CONTROLLER_HPP #include "script_types.hpp" -#include "../../core/string_compare_type.hpp" #include /** diff --git a/src/script/script_config.hpp b/src/script/script_config.hpp --- a/src/script/script_config.hpp +++ b/src/script/script_config.hpp @@ -13,7 +13,6 @@ #include #include #include "../core/smallmap_type.hpp" -#include "../core/string_compare_type.hpp" #include "../company_type.h" #include "../textfile_gui.h" #include "script_instance.hpp"