[SCM] kodi-pvr-hts/master: moved Settings.h to the tvheadend/ subdirectory to reflect its actual namespace

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 014c6406876a54d35e9a39ab3d1f57974af5ef41
Author: Sam Stenvall <sam.stenvall at nordsoftware.com>
Date:   Wed Oct 14 10:30:51 2015 +0300

    moved Settings.h to the tvheadend/ subdirectory to reflect its
    actual namespace

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98cdda1..697c5f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ set(HTS_SOURCES src/AsyncState.cpp
                 src/HTSPDemuxer.cpp
                 src/HTSPTypes.h
                 src/HTSPVFS.cpp
-                src/Settings.h
                 src/Tvheadend.cpp
                 src/Tvheadend.h
                 src/TimeRecordings.cpp
@@ -33,6 +32,9 @@ set(HTS_SOURCES src/AsyncState.cpp
                 src/AutoRecordings.h
                 src/xbmc_codec_descriptor.hpp)
 
+set(HTS_SOURCES_TVHEADEND
+                src/tvheadend/Settings.h)
+
 set(HTS_SOURCES_TVHEADEND_ENTITY
                 src/tvheadend/entity/AutoRecording.h
                 src/tvheadend/entity/AutoRecording.cpp
@@ -59,6 +61,7 @@ set(HTS_SOURCES_TVHEADEND_UTILITIES
 				src/tvheadend/utilities/Utilities.h)
                 
 source_group("Source Files" FILES ${HTS_SOURCES})
+source_group("Source Files\\tvheadend" FILES ${HTS_SOURCES_TVHEADEND})
 source_group("Source Files\\tvheadend\\entity" FILES ${HTS_SOURCES_TVHEADEND_ENTITY})
 source_group("Source Files\\tvheadend\\status" FILES ${HTS_SOURCES_TVHEADEND_STATUS})
 source_group("Source Files\\tvheadend\\utilities" FILES ${HTS_SOURCES_TVHEADEND_UTILITIES})
@@ -76,6 +79,7 @@ source_group("Resource Files" FILES ${HTS_RESOURCES})
 
 # Combine the file lists
 list(APPEND HTS_SOURCES
+            ${HTS_SOURCES_TVHEADEND}
             ${HTS_SOURCES_TVHEADEND_ENTITY}
             ${HTS_SOURCES_TVHEADEND_UTILITIES}
             ${HTS_RESOURCES})
diff --git a/src/Tvheadend.h b/src/Tvheadend.h
index 69163c7..a7d82b3 100644
--- a/src/Tvheadend.h
+++ b/src/Tvheadend.h
@@ -29,7 +29,7 @@
 #include "kodi/xbmc_codec_types.h"
 #include "kodi/xbmc_stream_utils.hpp"
 #include "kodi/libXBMC_addon.h"
-#include "Settings.h"
+#include "tvheadend/Settings.h"
 #include "HTSPTypes.h"
 #include "AsyncState.h"
 #include "tvheadend/entity/Tag.h"
diff --git a/src/client.cpp b/src/client.cpp
index e8ba62c..6941d8c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -25,7 +25,7 @@
 #include "platform/threads/mutex.h"
 #include "platform/threads/atomics.h"
 #include "platform/util/util.h"
-#include "Settings.h"
+#include "tvheadend/Settings.h"
 #include "Tvheadend.h"
 
 using namespace std;
diff --git a/src/Settings.h b/src/tvheadend/Settings.h
similarity index 100%
rename from src/Settings.h
rename to src/tvheadend/Settings.h

-- 
kodi-pvr-hts packaging