From 872cce92ffad0d00db6fdc5b24f3441864417f46 Mon Sep 17 00:00:00 2001 From: Lukasz Wlazly Date: Fri, 12 May 2017 15:31:45 +0200 Subject: [PATCH] Moving all source and headers into single directory Change-Id: If41e36ff2bdc7bf50a89a5db86a81611cf1ae133 --- {inc => src}/AccessoriesSwitchProvider.hpp | 0 {inc => src}/Activity.hpp | 0 {inc => src}/ActivityBuilder.hpp | 0 {inc => src}/ActivityBuilderFactory.hpp | 0 {inc => src}/ActivityDispatcher.hpp | 0 {inc => src}/ActivityObserver.hpp | 0 {inc => src}/ActivityTypes.hpp | 0 {inc => src}/AdHocActivityDispatcher.hpp | 0 {inc => src}/AsyncActivityConstructor.hpp | 0 src/CMakeLists.txt | 2 +- {inc => src}/CachedActivityBuilderFactory.hpp | 0 {inc => src}/CompositeSwitchProvider.hpp | 0 {inc => src}/Condition.hpp | 0 {inc => src}/ConditionAll.hpp | 0 {inc => src}/ConditionAny.hpp | 0 {inc => src}/ConditionEqual.hpp | 0 {inc => src}/Configuration.hpp | 0 {inc => src}/ConfigurationItem.hpp | 0 {inc => src}/ConfigurationItemObserver.hpp | 0 {inc => src}/Observer.hpp | 0 {inc => src}/QueryBuilder.hpp | 0 {inc => src}/SQLiteConfiguration.hpp | 0 {inc => src}/ScanningControlRequest.hpp | 0 {inc => src}/ScreenScanner.hpp | 0 {inc => src}/SelectActivityBuilder.hpp | 0 {inc => src}/Subject.hpp | 0 {inc => src}/Switch.hpp | 0 {inc => src}/SwitchManager.hpp | 0 {inc => src}/SwitchObserver.hpp | 0 src/SwitchProvider.cpp | 2 +- {inc => src}/SwitchProvider.hpp | 0 {inc => src}/UIElement.hpp | 0 {inc => src}/UIElementObserver.hpp | 0 {inc => src}/universalswitch.hpp | 0 tests/CMakeLists.txt | 2 +- tests/main.cpp | 1 + 36 files changed, 4 insertions(+), 3 deletions(-) rename {inc => src}/AccessoriesSwitchProvider.hpp (100%) rename {inc => src}/Activity.hpp (100%) rename {inc => src}/ActivityBuilder.hpp (100%) rename {inc => src}/ActivityBuilderFactory.hpp (100%) rename {inc => src}/ActivityDispatcher.hpp (100%) rename {inc => src}/ActivityObserver.hpp (100%) rename {inc => src}/ActivityTypes.hpp (100%) rename {inc => src}/AdHocActivityDispatcher.hpp (100%) rename {inc => src}/AsyncActivityConstructor.hpp (100%) rename {inc => src}/CachedActivityBuilderFactory.hpp (100%) rename {inc => src}/CompositeSwitchProvider.hpp (100%) rename {inc => src}/Condition.hpp (100%) rename {inc => src}/ConditionAll.hpp (100%) rename {inc => src}/ConditionAny.hpp (100%) rename {inc => src}/ConditionEqual.hpp (100%) rename {inc => src}/Configuration.hpp (100%) rename {inc => src}/ConfigurationItem.hpp (100%) rename {inc => src}/ConfigurationItemObserver.hpp (100%) rename {inc => src}/Observer.hpp (100%) rename {inc => src}/QueryBuilder.hpp (100%) rename {inc => src}/SQLiteConfiguration.hpp (100%) rename {inc => src}/ScanningControlRequest.hpp (100%) rename {inc => src}/ScreenScanner.hpp (100%) rename {inc => src}/SelectActivityBuilder.hpp (100%) rename {inc => src}/Subject.hpp (100%) rename {inc => src}/Switch.hpp (100%) rename {inc => src}/SwitchManager.hpp (100%) rename {inc => src}/SwitchObserver.hpp (100%) rename {inc => src}/SwitchProvider.hpp (100%) rename {inc => src}/UIElement.hpp (100%) rename {inc => src}/UIElementObserver.hpp (100%) rename {inc => src}/universalswitch.hpp (100%) diff --git a/inc/AccessoriesSwitchProvider.hpp b/src/AccessoriesSwitchProvider.hpp similarity index 100% rename from inc/AccessoriesSwitchProvider.hpp rename to src/AccessoriesSwitchProvider.hpp diff --git a/inc/Activity.hpp b/src/Activity.hpp similarity index 100% rename from inc/Activity.hpp rename to src/Activity.hpp diff --git a/inc/ActivityBuilder.hpp b/src/ActivityBuilder.hpp similarity index 100% rename from inc/ActivityBuilder.hpp rename to src/ActivityBuilder.hpp diff --git a/inc/ActivityBuilderFactory.hpp b/src/ActivityBuilderFactory.hpp similarity index 100% rename from inc/ActivityBuilderFactory.hpp rename to src/ActivityBuilderFactory.hpp diff --git a/inc/ActivityDispatcher.hpp b/src/ActivityDispatcher.hpp similarity index 100% rename from inc/ActivityDispatcher.hpp rename to src/ActivityDispatcher.hpp diff --git a/inc/ActivityObserver.hpp b/src/ActivityObserver.hpp similarity index 100% rename from inc/ActivityObserver.hpp rename to src/ActivityObserver.hpp diff --git a/inc/ActivityTypes.hpp b/src/ActivityTypes.hpp similarity index 100% rename from inc/ActivityTypes.hpp rename to src/ActivityTypes.hpp diff --git a/inc/AdHocActivityDispatcher.hpp b/src/AdHocActivityDispatcher.hpp similarity index 100% rename from inc/AdHocActivityDispatcher.hpp rename to src/AdHocActivityDispatcher.hpp diff --git a/inc/AsyncActivityConstructor.hpp b/src/AsyncActivityConstructor.hpp similarity index 100% rename from inc/AsyncActivityConstructor.hpp rename to src/AsyncActivityConstructor.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8ef960..d82ec1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,7 +17,7 @@ SET(SRCS ADD_LIBRARY(universal-switch-obj OBJECT ${SRCS}) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc ${pkgs_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS}) ADD_EXECUTABLE(${PROJECT_NAME} $) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LIBRARIES}) diff --git a/inc/CachedActivityBuilderFactory.hpp b/src/CachedActivityBuilderFactory.hpp similarity index 100% rename from inc/CachedActivityBuilderFactory.hpp rename to src/CachedActivityBuilderFactory.hpp diff --git a/inc/CompositeSwitchProvider.hpp b/src/CompositeSwitchProvider.hpp similarity index 100% rename from inc/CompositeSwitchProvider.hpp rename to src/CompositeSwitchProvider.hpp diff --git a/inc/Condition.hpp b/src/Condition.hpp similarity index 100% rename from inc/Condition.hpp rename to src/Condition.hpp diff --git a/inc/ConditionAll.hpp b/src/ConditionAll.hpp similarity index 100% rename from inc/ConditionAll.hpp rename to src/ConditionAll.hpp diff --git a/inc/ConditionAny.hpp b/src/ConditionAny.hpp similarity index 100% rename from inc/ConditionAny.hpp rename to src/ConditionAny.hpp diff --git a/inc/ConditionEqual.hpp b/src/ConditionEqual.hpp similarity index 100% rename from inc/ConditionEqual.hpp rename to src/ConditionEqual.hpp diff --git a/inc/Configuration.hpp b/src/Configuration.hpp similarity index 100% rename from inc/Configuration.hpp rename to src/Configuration.hpp diff --git a/inc/ConfigurationItem.hpp b/src/ConfigurationItem.hpp similarity index 100% rename from inc/ConfigurationItem.hpp rename to src/ConfigurationItem.hpp diff --git a/inc/ConfigurationItemObserver.hpp b/src/ConfigurationItemObserver.hpp similarity index 100% rename from inc/ConfigurationItemObserver.hpp rename to src/ConfigurationItemObserver.hpp diff --git a/inc/Observer.hpp b/src/Observer.hpp similarity index 100% rename from inc/Observer.hpp rename to src/Observer.hpp diff --git a/inc/QueryBuilder.hpp b/src/QueryBuilder.hpp similarity index 100% rename from inc/QueryBuilder.hpp rename to src/QueryBuilder.hpp diff --git a/inc/SQLiteConfiguration.hpp b/src/SQLiteConfiguration.hpp similarity index 100% rename from inc/SQLiteConfiguration.hpp rename to src/SQLiteConfiguration.hpp diff --git a/inc/ScanningControlRequest.hpp b/src/ScanningControlRequest.hpp similarity index 100% rename from inc/ScanningControlRequest.hpp rename to src/ScanningControlRequest.hpp diff --git a/inc/ScreenScanner.hpp b/src/ScreenScanner.hpp similarity index 100% rename from inc/ScreenScanner.hpp rename to src/ScreenScanner.hpp diff --git a/inc/SelectActivityBuilder.hpp b/src/SelectActivityBuilder.hpp similarity index 100% rename from inc/SelectActivityBuilder.hpp rename to src/SelectActivityBuilder.hpp diff --git a/inc/Subject.hpp b/src/Subject.hpp similarity index 100% rename from inc/Subject.hpp rename to src/Subject.hpp diff --git a/inc/Switch.hpp b/src/Switch.hpp similarity index 100% rename from inc/Switch.hpp rename to src/Switch.hpp diff --git a/inc/SwitchManager.hpp b/src/SwitchManager.hpp similarity index 100% rename from inc/SwitchManager.hpp rename to src/SwitchManager.hpp diff --git a/inc/SwitchObserver.hpp b/src/SwitchObserver.hpp similarity index 100% rename from inc/SwitchObserver.hpp rename to src/SwitchObserver.hpp diff --git a/src/SwitchProvider.cpp b/src/SwitchProvider.cpp index a4bfd1b..1f37436 100644 --- a/src/SwitchProvider.cpp +++ b/src/SwitchProvider.cpp @@ -1,4 +1,4 @@ -#include +#include "SwitchProvider.hpp" SwitchProvider::SwitchProvider(std::string id) : id(std::move(id)) diff --git a/inc/SwitchProvider.hpp b/src/SwitchProvider.hpp similarity index 100% rename from inc/SwitchProvider.hpp rename to src/SwitchProvider.hpp diff --git a/inc/UIElement.hpp b/src/UIElement.hpp similarity index 100% rename from inc/UIElement.hpp rename to src/UIElement.hpp diff --git a/inc/UIElementObserver.hpp b/src/UIElementObserver.hpp similarity index 100% rename from inc/UIElementObserver.hpp rename to src/UIElementObserver.hpp diff --git a/inc/universalswitch.hpp b/src/universalswitch.hpp similarity index 100% rename from inc/universalswitch.hpp rename to src/universalswitch.hpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7de2ca5..e39f439 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_SUBDIRECTORY(googletest) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc/) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/) INCLUDE_DIRECTORIES(cmocktest/include) INCLUDE_DIRECTORIES(googletest/googlemock/include/) INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS}) diff --git a/tests/main.cpp b/tests/main.cpp index 425926c..a8e5d14 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,4 +1,5 @@ #include + #include "Activity.hpp" using namespace ::testing; -- 2.7.4