From d2eecb7e8a342eec0b0c067456d0833cc8d50636 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Tue, 13 Jan 2015 22:52:56 +0800 Subject: [PATCH] fix up include header paths --- CMakeLists.txt | 1 - fl/LoggerCpp/Channel.h | 4 ++-- fl/LoggerCpp/Config.h | 2 +- fl/LoggerCpp/Exception.h | 2 +- fl/LoggerCpp/Log.h | 4 ++-- fl/LoggerCpp/Logger.h | 4 ++-- fl/LoggerCpp/LoggerCpp.h | 4 ++-- fl/LoggerCpp/Manager.h | 8 ++++---- fl/LoggerCpp/Output.h | 4 ++-- fl/LoggerCpp/OutputConsole.h | 4 ++-- fl/LoggerCpp/OutputDebug.h | 4 ++-- fl/LoggerCpp/OutputFile.h | 4 ++-- src/LoggerCpp/Config.cpp | 4 ++-- src/LoggerCpp/DateTime.cpp | 4 ++-- src/LoggerCpp/Log.cpp | 4 ++-- src/LoggerCpp/Logger.cpp | 4 ++-- src/LoggerCpp/Manager.cpp | 8 ++++---- src/LoggerCpp/OutputConsole.cpp | 2 +- src/LoggerCpp/OutputDebug.cpp | 2 +- src/LoggerCpp/OutputFile.cpp | 4 ++-- src/main.cpp | 2 +- 21 files changed, 39 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b182fb..b80f02f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,6 @@ if(NOT FL_BACKTRACE) endif() include_directories(.) -include_directories ("${PROJECT_SOURCE_DIR}/fl/") add_definitions (-std=c++0x) # -std=c++11 file(STRINGS FL_HEADERS fl-headers) diff --git a/fl/LoggerCpp/Channel.h b/fl/LoggerCpp/Channel.h index fa2cbef..bb4c1f9 100644 --- a/fl/LoggerCpp/Channel.h +++ b/fl/LoggerCpp/Channel.h @@ -10,7 +10,7 @@ */ #pragma once -#include "LoggerCpp/Log.h" +#include "fl/LoggerCpp/Log.h" #include #include @@ -19,7 +19,7 @@ // or (or ) when C++11 (or experimental C++0x) is available, // or a custom minimal shared_ptr implementation, // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) -#include "LoggerCpp/shared_ptr.hpp" +#include "fl/LoggerCpp/shared_ptr.hpp" namespace fl { diff --git a/fl/LoggerCpp/Config.h b/fl/LoggerCpp/Config.h index 54ce57c..c91b649 100644 --- a/fl/LoggerCpp/Config.h +++ b/fl/LoggerCpp/Config.h @@ -18,7 +18,7 @@ // or (or ) when C++11 (or experimental C++0x) is available, // or a custom minimal shared_ptr implementation, // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) -#include "LoggerCpp/shared_ptr.hpp" +#include "fl/LoggerCpp/shared_ptr.hpp" namespace fl { diff --git a/fl/LoggerCpp/Exception.h b/fl/LoggerCpp/Exception.h index 906b58f..e4c026f 100644 --- a/fl/LoggerCpp/Exception.h +++ b/fl/LoggerCpp/Exception.h @@ -10,7 +10,7 @@ */ #pragma once -#include "LoggerCpp/Formatter.h" +#include "fl/LoggerCpp/Formatter.h" #include #include diff --git a/fl/LoggerCpp/Log.h b/fl/LoggerCpp/Log.h index d19a714..5e28183 100644 --- a/fl/LoggerCpp/Log.h +++ b/fl/LoggerCpp/Log.h @@ -10,8 +10,8 @@ */ #pragma once -#include "LoggerCpp/DateTime.h" -#include "LoggerCpp/Utils.h" +#include "fl/LoggerCpp/DateTime.h" +#include "fl/LoggerCpp/Utils.h" #include #include // For easy use of parametric manipulators (setfill, setprecision) by client code diff --git a/fl/LoggerCpp/Logger.h b/fl/LoggerCpp/Logger.h index 66b9146..95d6a66 100644 --- a/fl/LoggerCpp/Logger.h +++ b/fl/LoggerCpp/Logger.h @@ -10,8 +10,8 @@ */ #pragma once -#include "LoggerCpp/Log.h" -#include "LoggerCpp/Channel.h" +#include "fl/LoggerCpp/Log.h" +#include "fl/LoggerCpp/Channel.h" #include diff --git a/fl/LoggerCpp/LoggerCpp.h b/fl/LoggerCpp/LoggerCpp.h index c486e5e..e1dd62b 100644 --- a/fl/LoggerCpp/LoggerCpp.h +++ b/fl/LoggerCpp/LoggerCpp.h @@ -18,8 +18,8 @@ // Include useful headers of LoggerC++ -#include "LoggerCpp/Logger.h" -#include "LoggerCpp/Manager.h" +#include "fl/LoggerCpp/Logger.h" +#include "fl/LoggerCpp/Manager.h" /** diff --git a/fl/LoggerCpp/Manager.h b/fl/LoggerCpp/Manager.h index a409882..1118385 100644 --- a/fl/LoggerCpp/Manager.h +++ b/fl/LoggerCpp/Manager.h @@ -10,10 +10,10 @@ */ #pragma once -#include "LoggerCpp/Log.h" -#include "LoggerCpp/Channel.h" -#include "LoggerCpp/Output.h" -#include "LoggerCpp/Config.h" +#include "fl/LoggerCpp/Log.h" +#include "fl/LoggerCpp/Channel.h" +#include "fl/LoggerCpp/Output.h" +#include "fl/LoggerCpp/Config.h" namespace fl { diff --git a/fl/LoggerCpp/Output.h b/fl/LoggerCpp/Output.h index efa2f96..3a62d8b 100644 --- a/fl/LoggerCpp/Output.h +++ b/fl/LoggerCpp/Output.h @@ -10,7 +10,7 @@ */ #pragma once -#include "LoggerCpp/Channel.h" +#include "fl/LoggerCpp/Channel.h" #include #include @@ -19,7 +19,7 @@ // or (or ) when C++11 (or experimental C++0x) is available, // or a custom minimal shared_ptr implementation, // and imports the "shared_ptr" symbol inside the Log namespace (ie. Log::shared_ptr) -#include "LoggerCpp/shared_ptr.hpp" +#include "fl/LoggerCpp/shared_ptr.hpp" namespace fl { namespace Log { diff --git a/fl/LoggerCpp/OutputConsole.h b/fl/LoggerCpp/OutputConsole.h index df35d11..759b758 100644 --- a/fl/LoggerCpp/OutputConsole.h +++ b/fl/LoggerCpp/OutputConsole.h @@ -10,8 +10,8 @@ */ #pragma once -#include "LoggerCpp/Output.h" -#include "LoggerCpp/Config.h" +#include "fl/LoggerCpp/Output.h" +#include "fl/LoggerCpp/Config.h" namespace fl { namespace Log { diff --git a/fl/LoggerCpp/OutputDebug.h b/fl/LoggerCpp/OutputDebug.h index e7dc19a..c5c2594 100644 --- a/fl/LoggerCpp/OutputDebug.h +++ b/fl/LoggerCpp/OutputDebug.h @@ -10,8 +10,8 @@ */ #pragma once -#include "LoggerCpp/Output.h" -#include "LoggerCpp/Config.h" +#include "fl/LoggerCpp/Output.h" +#include "fl/LoggerCpp/Config.h" namespace fl { namespace Log { diff --git a/fl/LoggerCpp/OutputFile.h b/fl/LoggerCpp/OutputFile.h index 1358c69..91f549d 100644 --- a/fl/LoggerCpp/OutputFile.h +++ b/fl/LoggerCpp/OutputFile.h @@ -10,8 +10,8 @@ */ #pragma once -#include "LoggerCpp/Output.h" -#include "LoggerCpp/Config.h" +#include "fl/LoggerCpp/Output.h" +#include "fl/LoggerCpp/Config.h" #include diff --git a/src/LoggerCpp/Config.cpp b/src/LoggerCpp/Config.cpp index dc62abf..bd5b158 100644 --- a/src/LoggerCpp/Config.cpp +++ b/src/LoggerCpp/Config.cpp @@ -9,8 +9,8 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/Config.h" -#include "LoggerCpp/Exception.h" +#include "fl/LoggerCpp/Config.h" +#include "fl/LoggerCpp/Exception.h" #include diff --git a/src/LoggerCpp/DateTime.cpp b/src/LoggerCpp/DateTime.cpp index 28c20e7..f46d101 100644 --- a/src/LoggerCpp/DateTime.cpp +++ b/src/LoggerCpp/DateTime.cpp @@ -9,8 +9,8 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/DateTime.h" -#include "LoggerCpp/Utils.h" +#include "fl/LoggerCpp/DateTime.h" +#include "fl/LoggerCpp/Utils.h" #ifdef WIN32 #include diff --git a/src/LoggerCpp/Log.cpp b/src/LoggerCpp/Log.cpp index b5158a3..b7fa66a 100644 --- a/src/LoggerCpp/Log.cpp +++ b/src/LoggerCpp/Log.cpp @@ -9,8 +9,8 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/Log.h" -#include "LoggerCpp/Logger.h" +#include "fl/LoggerCpp/Log.h" +#include "fl/LoggerCpp/Logger.h" #include diff --git a/src/LoggerCpp/Logger.cpp b/src/LoggerCpp/Logger.cpp index 525205e..7c684c5 100644 --- a/src/LoggerCpp/Logger.cpp +++ b/src/LoggerCpp/Logger.cpp @@ -9,8 +9,8 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/Logger.h" -#include "LoggerCpp/Manager.h" +#include "fl/LoggerCpp/Logger.h" +#include "fl/LoggerCpp/Manager.h" #include diff --git a/src/LoggerCpp/Manager.cpp b/src/LoggerCpp/Manager.cpp index 01b5302..1921035 100644 --- a/src/LoggerCpp/Manager.cpp +++ b/src/LoggerCpp/Manager.cpp @@ -9,11 +9,11 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/Manager.h" -#include "LoggerCpp/Exception.h" +#include "fl/LoggerCpp/Manager.h" +#include "fl/LoggerCpp/Exception.h" -#include "LoggerCpp/OutputConsole.h" -#include "LoggerCpp/OutputFile.h" +#include "fl/LoggerCpp/OutputConsole.h" +#include "fl/LoggerCpp/OutputFile.h" #ifdef WIN32 #include "LoggerCpp/OutputDebug.h" #endif diff --git a/src/LoggerCpp/OutputConsole.cpp b/src/LoggerCpp/OutputConsole.cpp index f474adf..4cd18b5 100644 --- a/src/LoggerCpp/OutputConsole.cpp +++ b/src/LoggerCpp/OutputConsole.cpp @@ -9,7 +9,7 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/OutputConsole.h" +#include "fl/LoggerCpp/OutputConsole.h" #include diff --git a/src/LoggerCpp/OutputDebug.cpp b/src/LoggerCpp/OutputDebug.cpp index 5b99662..46949d9 100644 --- a/src/LoggerCpp/OutputDebug.cpp +++ b/src/LoggerCpp/OutputDebug.cpp @@ -11,7 +11,7 @@ #ifdef WIN32 -#include "LoggerCpp/OutputDebug.h" +#include "fl/LoggerCpp/OutputDebug.h" #include diff --git a/src/LoggerCpp/OutputFile.cpp b/src/LoggerCpp/OutputFile.cpp index 5651d87..fef93ee 100644 --- a/src/LoggerCpp/OutputFile.cpp +++ b/src/LoggerCpp/OutputFile.cpp @@ -9,8 +9,8 @@ * or copy at http://opensource.org/licenses/MIT) */ -#include "LoggerCpp/OutputFile.h" -#include "LoggerCpp/Exception.h" +#include "fl/LoggerCpp/OutputFile.h" +#include "fl/LoggerCpp/Exception.h" #include #include diff --git a/src/main.cpp b/src/main.cpp index a545900..0d1bfb1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include "LoggerCpp/LoggerCpp.h" +#include "fl/LoggerCpp/LoggerCpp.h" using namespace fl;