From fbc0b6e66fc6c7e46a07da0326fe7992879461f3 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 11 Jul 2016 07:53:03 +0100 Subject: [PATCH] Rename scheme.h/cpp to match class name --- CMakeLists.txt | 6 +++--- src/gui/loot_app.cpp | 2 +- src/gui/{scheme.cpp => loot_scheme_handler_factory.cpp} | 2 +- src/gui/{scheme.h => loot_scheme_handler_factory.h} | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/gui/{scheme.cpp => loot_scheme_handler_factory.cpp} (98%) rename src/gui/{scheme.h => loot_scheme_handler_factory.h} (93%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7e9ae7f..36d3ee34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,14 +209,14 @@ set (LOOT_GUI_SRC ${LOOT_SRC} "${CMAKE_SOURCE_DIR}/src/gui/handler.cpp" "${CMAKE_SOURCE_DIR}/src/gui/loot_handler.cpp" "${CMAKE_SOURCE_DIR}/src/gui/loot_app.cpp" - "${CMAKE_SOURCE_DIR}/src/gui/scheme.cpp" + "${CMAKE_SOURCE_DIR}/src/gui/loot_scheme_handler_factory.cpp" "${CMAKE_SOURCE_DIR}/src/resource.rc") set (LOOT_GUI_HEADERS ${LOOT_HEADERS} "${CMAKE_SOURCE_DIR}/src/gui/handler.h" "${CMAKE_SOURCE_DIR}/src/gui/loot_handler.h" "${CMAKE_SOURCE_DIR}/src/gui/loot_app.h" - "${CMAKE_SOURCE_DIR}/src/gui/scheme.h" + "${CMAKE_SOURCE_DIR}/src/gui/loot_scheme_handler_factory.h" "${CMAKE_SOURCE_DIR}/src/gui/resource.h") set (LOOT_API_SRC ${LOOT_SRC} @@ -318,7 +318,7 @@ include_directories ("${CMAKE_SOURCE_DIR}/src" # System-Specific Settings ############################## -# If building on Travis, define BOOST_NO_CXX11_SCOPED_ENUMS to avoid +# If building on Travis, define BOOST_NO_CXX11_SCOPED_ENUMS to avoid # boost::filesystem::copy_file() linking errors due to mismatched C++ runtimes # between Boost and LOOT. IF ($ENV{TRAVIS}) diff --git a/src/gui/loot_app.cpp b/src/gui/loot_app.cpp index f411a333..f1f21a2b 100644 --- a/src/gui/loot_app.cpp +++ b/src/gui/loot_app.cpp @@ -24,7 +24,7 @@ #include "loot_app.h" #include "loot_handler.h" -#include "scheme.h" +#include "loot_scheme_handler_factory.h" #include "../backend/app/loot_paths.h" #include "../backend/helpers/helpers.h" diff --git a/src/gui/scheme.cpp b/src/gui/loot_scheme_handler_factory.cpp similarity index 98% rename from src/gui/scheme.cpp rename to src/gui/loot_scheme_handler_factory.cpp index 38b3118e..60edeeaf 100644 --- a/src/gui/scheme.cpp +++ b/src/gui/loot_scheme_handler_factory.cpp @@ -22,7 +22,7 @@ along with LOOT. If not, see . */ -#include "scheme.h" +#include "loot_scheme_handler_factory.h" #include "backend/app/loot_paths.h" diff --git a/src/gui/scheme.h b/src/gui/loot_scheme_handler_factory.h similarity index 93% rename from src/gui/scheme.h rename to src/gui/loot_scheme_handler_factory.h index 7437b54e..bc3ba1ff 100644 --- a/src/gui/scheme.h +++ b/src/gui/loot_scheme_handler_factory.h @@ -22,8 +22,8 @@ along with LOOT. If not, see . */ -#ifndef __LOOT_GUI_SCHEME_HANDLER__ -#define __LOOT_GUI_SCHEME_HANDLER__ +#ifndef LOOT_GUI_LOOT_SCHEME_HANDLER_FACTORY +#define LOOT_GUI_LOOT_SCHEME_HANDLER_FACTORY #include #include