Commit 7c4f890a6c43d6811596802b3f5c9ef6972fa80e
Committed by
Moritz Wirger
1 parent
b6d5d07c
Rename include guard to be standard compliant.
(no leading underscore followed by an uppercase letter)
Showing
22 changed files
with
46 additions
and
46 deletions
include/hueplusplus/BaseHttpHandler.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _BASE_HTTPHANDLER_H | ||
| 24 | -#define _BASE_HTTPHANDLER_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_BASE_HTTP_HANDLER_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_BASE_HTTP_HANDLER_H | ||
| 25 | 25 | ||
| 26 | #include <iostream> | 26 | #include <iostream> |
| 27 | #include <memory> | 27 | #include <memory> |
include/hueplusplus/BrightnessStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _BRIGHTNESS_STRATEGY_H | ||
| 24 | -#define _BRIGHTNESS_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_BRIGHTNESS_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_BRIGHTNESS_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include <cstdint> | 26 | #include <cstdint> |
| 27 | 27 |
include/hueplusplus/ColorTemperatureStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _COLOR_TEMPERATURE_STRATEGY_H | ||
| 24 | -#define _COLOR_TEMPERATURE_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_COLOR_TEMPERATURE_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_COLOR_TEMPERATURE_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include <stdint.h> | 26 | #include <stdint.h> |
| 27 | 27 |
include/hueplusplus/ExtendedColorHueStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _EXTENDED_COLOR_HUE_STRATEGY_H | ||
| 24 | -#define _EXTENDED_COLOR_HUE_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_HUE_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_HUE_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include "HueLight.h" | 26 | #include "HueLight.h" |
| 27 | #include "SimpleColorHueStrategy.h" | 27 | #include "SimpleColorHueStrategy.h" |
include/hueplusplus/ExtendedColorTemperatureStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _EXTENDED_COLOR_TEMPERATURE_STRATEGY_H | ||
| 24 | -#define _EXTENDED_COLOR_TEMPERATURE_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_TEMPERATURE_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_TEMPERATURE_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include "HueLight.h" | 26 | #include "HueLight.h" |
| 27 | #include "SimpleColorTemperatureStrategy.h" | 27 | #include "SimpleColorTemperatureStrategy.h" |
include/hueplusplus/Hue.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUE_H | ||
| 24 | -#define _HUE_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUE_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUE_H | ||
| 25 | 25 | ||
| 26 | #include <map> | 26 | #include <map> |
| 27 | #include <memory> | 27 | #include <memory> |
include/hueplusplus/HueCommandAPI.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUECOMMANDAPI_H | ||
| 24 | -#define _HUECOMMANDAPI_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUECOMMANDAPI_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUECOMMANDAPI_H | ||
| 25 | 25 | ||
| 26 | #include <atomic> | 26 | #include <atomic> |
| 27 | #include <chrono> | 27 | #include <chrono> |
include/hueplusplus/HueConfig.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUE_CONFIG_H | ||
| 24 | -#define _HUE_CONFIG_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUE_CONFIG_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUE_CONFIG_H | ||
| 25 | 25 | ||
| 26 | namespace hueplusplus | 26 | namespace hueplusplus |
| 27 | { | 27 | { |
include/hueplusplus/HueDeviceTypes.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUEDEVICETYPES_H | ||
| 24 | -#define _HUEDEVICETYPES_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUEDEVICETYPES_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUEDEVICETYPES_H | ||
| 25 | 25 | ||
| 26 | #include <memory> | 26 | #include <memory> |
| 27 | #include <string> | 27 | #include <string> |
include/hueplusplus/HueException.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUE_EXCEPTION_H | ||
| 24 | -#define _HUE_EXCEPTION_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUE_EXCEPTION_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUE_EXCEPTION_H | ||
| 25 | 25 | ||
| 26 | #include <exception> | 26 | #include <exception> |
| 27 | #include <string> | 27 | #include <string> |
include/hueplusplus/HueLight.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _HUE_LIGHT_H | ||
| 24 | -#define _HUE_LIGHT_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_HUE_LIGHT_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_HUE_LIGHT_H | ||
| 25 | 25 | ||
| 26 | #include <memory> | 26 | #include <memory> |
| 27 | 27 |
include/hueplusplus/IHttpHandler.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _IHTTPHANDLER_H | ||
| 24 | -#define _IHTTPHANDLER_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_IHTTPHANDLER_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_IHTTPHANDLER_H | ||
| 25 | 25 | ||
| 26 | #include <iostream> | 26 | #include <iostream> |
| 27 | #include <memory> | 27 | #include <memory> |
include/hueplusplus/LinHttpHandler.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _LINHTTPHANDLER_H | ||
| 24 | -#define _LINHTTPHANDLER_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_LINHTTPHANDLER_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_LINHTTPHANDLER_H | ||
| 25 | 25 | ||
| 26 | #include <string> | 26 | #include <string> |
| 27 | #include <vector> | 27 | #include <vector> |
include/hueplusplus/SimpleBrightnessStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _SIMPLE_BRIGHTNESS_STRATEGY_H | ||
| 24 | -#define _SIMPLE_BRIGHTNESS_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_BRIGHTNESS_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_SIMPLE_BRIGHTNESS_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include "BrightnessStrategy.h" | 26 | #include "BrightnessStrategy.h" |
| 27 | #include "HueLight.h" | 27 | #include "HueLight.h" |
include/hueplusplus/SimpleColorHueStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _SIMPLE_COLOR_HUE_STRATEGY_H | ||
| 24 | -#define _SIMPLE_COLOR_HUE_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_HUE_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_HUE_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include "ColorHueStrategy.h" | 26 | #include "ColorHueStrategy.h" |
| 27 | #include "HueLight.h" | 27 | #include "HueLight.h" |
include/hueplusplus/SimpleColorTemperatureStrategy.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _SIMPLE_COLOR_TEMPERATURE_STRATEGY_H | ||
| 24 | -#define _SIMPLE_COLOR_TEMPERATURE_STRATEGY_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_TEMPERATURE_STRATEGY_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_TEMPERATURE_STRATEGY_H | ||
| 25 | 25 | ||
| 26 | #include "ColorTemperatureStrategy.h" | 26 | #include "ColorTemperatureStrategy.h" |
| 27 | #include "HueLight.h" | 27 | #include "HueLight.h" |
include/hueplusplus/UPnP.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _UPNP_H | ||
| 24 | -#define _UPNP_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_UPNP_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_UPNP_H | ||
| 25 | 25 | ||
| 26 | #include <memory> | 26 | #include <memory> |
| 27 | #include <string> | 27 | #include <string> |
include/hueplusplus/Units.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _UNITS_H | ||
| 24 | -#define _UNITS_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_UNITS_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_UNITS_H | ||
| 25 | 25 | ||
| 26 | namespace hueplusplus | 26 | namespace hueplusplus |
| 27 | { | 27 | { |
include/hueplusplus/Utils.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _UTILS_H | ||
| 24 | -#define _UTILS_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_UTILS_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_UTILS_H | ||
| 25 | 25 | ||
| 26 | #include "json/json.hpp" | 26 | #include "json/json.hpp" |
| 27 | 27 |
include/hueplusplus/WinHttpHandler.h
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. | 20 | along with hueplusplus. If not, see <http://www.gnu.org/licenses/>. |
| 21 | **/ | 21 | **/ |
| 22 | 22 | ||
| 23 | -#ifndef _WINHTTPHANDLER_H | ||
| 24 | -#define _WINHTTPHANDLER_H | 23 | +#ifndef INCLUDE_HUEPLUSPLUS_WINHTTPHANDLER_H |
| 24 | +#define INCLUDE_HUEPLUSPLUS_WINHTTPHANDLER_H | ||
| 25 | 25 | ||
| 26 | #include <string> | 26 | #include <string> |
| 27 | #include <vector> | 27 | #include <vector> |
test/CMakeLists.txt
| @@ -2,14 +2,14 @@ | @@ -2,14 +2,14 @@ | ||
| 2 | configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) | 2 | configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) |
| 3 | execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} . | 3 | execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} . |
| 4 | RESULT_VARIABLE result | 4 | RESULT_VARIABLE result |
| 5 | - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/test/googletest-download" | 5 | + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/googletest-download" |
| 6 | ) | 6 | ) |
| 7 | if(result) | 7 | if(result) |
| 8 | message(FATAL_ERROR "CMake step for googletest failed: ${result}") | 8 | message(FATAL_ERROR "CMake step for googletest failed: ${result}") |
| 9 | endif() | 9 | endif() |
| 10 | execute_process(COMMAND "${CMAKE_COMMAND}" --build . | 10 | execute_process(COMMAND "${CMAKE_COMMAND}" --build . |
| 11 | RESULT_VARIABLE result | 11 | RESULT_VARIABLE result |
| 12 | - WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/test/googletest-download" | 12 | + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/googletest-download" |
| 13 | ) | 13 | ) |
| 14 | if(result) | 14 | if(result) |
| 15 | message(FATAL_ERROR "Build step for googletest failed: ${result}") | 15 | message(FATAL_ERROR "Build step for googletest failed: ${result}") |
| @@ -21,8 +21,8 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) | @@ -21,8 +21,8 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) | ||
| 21 | 21 | ||
| 22 | # Add googletest directly to our build. This defines | 22 | # Add googletest directly to our build. This defines |
| 23 | # the gtest and gtest_main targets. | 23 | # the gtest and gtest_main targets. |
| 24 | -add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src EXCLUDE_FROM_ALL | ||
| 25 | - ${CMAKE_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL | 24 | +add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src EXCLUDE_FROM_ALL |
| 25 | + ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL | ||
| 26 | ) | 26 | ) |
| 27 | 27 | ||
| 28 | # define all test sources | 28 | # define all test sources |
test/CMakeLists.txt.in
| @@ -6,8 +6,8 @@ include(ExternalProject) | @@ -6,8 +6,8 @@ include(ExternalProject) | ||
| 6 | ExternalProject_Add(googletest | 6 | ExternalProject_Add(googletest |
| 7 | GIT_REPOSITORY https://github.com/google/googletest.git | 7 | GIT_REPOSITORY https://github.com/google/googletest.git |
| 8 | GIT_TAG master | 8 | GIT_TAG master |
| 9 | - SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" | ||
| 10 | - BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" | 9 | + SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" |
| 10 | + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" | ||
| 11 | CONFIGURE_COMMAND "" | 11 | CONFIGURE_COMMAND "" |
| 12 | BUILD_COMMAND "" | 12 | BUILD_COMMAND "" |
| 13 | INSTALL_COMMAND "" | 13 | INSTALL_COMMAND "" |