From dd9439aed2fcebe7a21cb48036e5b3045d812757 Mon Sep 17 00:00:00 2001 From: tomangelo2 Date: Sun, 15 Oct 2017 22:47:32 +0200 Subject: [PATCH] Renamed font_file to font_config --- src/CMakeLists.txt | 4 ++-- src/common/{font_file.cpp => font_config.cpp} | 2 +- src/common/{font_file.h => font_config.h} | 2 +- src/graphics/engine/text.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/common/{font_file.cpp => font_config.cpp} (99%) rename src/common/{font_file.h => font_config.h} (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cf50289..37d6cb04 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,8 +106,8 @@ set(BASE_SOURCES common/error.h common/event.cpp common/event.h - common/font_file.h - common/font_file.cpp + common/font_config.h + common/font_config.cpp common/global.h common/image.cpp common/image.h diff --git a/src/common/font_file.cpp b/src/common/font_config.cpp similarity index 99% rename from src/common/font_file.cpp rename to src/common/font_config.cpp index bd7fd583..e4dc51b1 100644 --- a/src/common/font_file.cpp +++ b/src/common/font_config.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see http://gnu.org/licenses */ -#include "common/font_file.h" +#include "common/font_config.h" #include "common/logger.h" #include "common/make_unique.h" diff --git a/src/common/font_file.h b/src/common/font_config.h similarity index 98% rename from src/common/font_file.h rename to src/common/font_config.h index d6a320a3..cbe0863e 100644 --- a/src/common/font_file.h +++ b/src/common/font_config.h @@ -18,7 +18,7 @@ */ /** - * \file common/font_file.h + * \file common/font_config.h * \brief Class for loading fonts from /data/fonts/fonts.ini */ diff --git a/src/graphics/engine/text.cpp b/src/graphics/engine/text.cpp index 605f73b4..6ecf9284 100644 --- a/src/graphics/engine/text.cpp +++ b/src/graphics/engine/text.cpp @@ -22,7 +22,7 @@ #include "app/app.h" -#include "common/font_file.h" +#include "common/font_config.h" #include "common/image.h" #include "common/logger.h" #include "common/stringutils.h"