cec: moved CECBusDevice.cpp to devices/CECBusDevice.cpp

diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 468d981776f900768e3d8a3655ddb325044b008d..e9ae43e1e1a665460cc8cdd0435ebfe15158a429 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -33,7 +33,7 @@
 #include "CECProcessor.h"
 
 #include "AdapterCommunication.h"
-#include "CECBusDevice.h"
+#include "devices/CECBusDevice.h"
 #include "LibCEC.h"
 #include "util/StdString.h"
 #include "platform/timeutils.h"

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 243c3177b7ef452321b85e36b370d37098a7496f..31d630de034c2e2693fba0bb0cfb852c5e330278 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,14 +12,14 @@ libcec_la_SOURCES = AdapterCommunication.cpp \
                     AdapterCommunication.h \
                     AdapterDetection.cpp \
                     AdapterDetection.h \
-                    CECBusDevice.cpp \
-                    CECBusDevice.h \
                     CECProcessor.cpp \
                     CECProcessor.h \
                     LibCEC.cpp \
                     LibCEC.h \
                     LibCECC.cpp \
                     util/StdString.h \
+                    devices/CECBusDevice.cpp \
+                    devices/CECBusDevice.h \
                     implementations/ANCommandHandler.cpp \
                     implementations/ANCommandHandler.h \
                     implementations/CECCommandHandler.cpp \

diff --git a/src/lib/CECBusDevice.cpp b/src/lib/devices/CECBusDevice.cpp
similarity index 95%
rename from src/lib/CECBusDevice.cpp
rename to src/lib/devices/CECBusDevice.cpp
index 19f4e669b3c24a9cf29cb7bc4b05256c71e1a0cc..f89d730c47d56b1ba70e3d74a70ab6eedf43b5cf 100644 (file)
--- a/src/lib/CECBusDevice.cpp
+++ b/src/lib/devices/CECBusDevice.cpp
@@ -31,11 +31,11 @@
  */
 
 #include "CECBusDevice.h"
-#include "CECProcessor.h"
-#include "implementations/ANCommandHandler.h"
-#include "implementations/CECCommandHandler.h"
-#include "implementations/SLCommandHandler.h"
-#include "platform/timeutils.h"
+#include "../CECProcessor.h"
+#include "../implementations/ANCommandHandler.h"
+#include "../implementations/CECCommandHandler.h"
+#include "../implementations/SLCommandHandler.h"
+#include "../platform/timeutils.h"
 
 using namespace CEC;
 

diff --git a/src/lib/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
similarity index 97%
rename from src/lib/CECBusDevice.h
rename to src/lib/devices/CECBusDevice.h
index 7f96e6f4f8d3dda10d03575e8f3f1bf219b66f89..a115346e00c1677a00cfbe6fd21ad1717cd04d3e 100644 (file)
--- a/src/lib/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -32,8 +32,8 @@
  */
 
 #include <cectypes.h>
-#include "platform/threads.h"
-#include "util/StdString.h"
+#include "../platform/threads.h"
+#include "../util/StdString.h"
 
 namespace CEC
 {

diff --git a/src/lib/implementations/ANCommandHandler.cpp b/src/lib/implementations/ANCommandHandler.cpp
index 3b8868062fc7b2872e0a4a43f2ebb2e2f4e1e4fe..394cfa93f2a0e40fb784470a5c32763c44f37847 100644 (file)
--- a/src/lib/implementations/ANCommandHandler.cpp
+++ b/src/lib/implementations/ANCommandHandler.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "ANCommandHandler.h"
-#include "../CECBusDevice.h"
+#include "../devices/CECBusDevice.h"
 #include "../CECProcessor.h"
 #include "../util/StdString.h"
 

diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
index 9e3867ef192957fd97caf653d4d1028d3168dedb..35a5704516af5a09159965ca0320d303d0bae42e 100644 (file)
--- a/src/lib/implementations/CECCommandHandler.cpp
+++ b/src/lib/implementations/CECCommandHandler.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "CECCommandHandler.h"
-#include "../CECBusDevice.h"
+#include "../devices/CECBusDevice.h"
 #include "../CECProcessor.h"
 
 using namespace CEC;

diff --git a/src/lib/implementations/SLCommandHandler.cpp b/src/lib/implementations/SLCommandHandler.cpp
index 7c216e949ec6d1b61ee3e4385ad3f6eacab819c3..144cfc92d933bd033f4d7ac79908f30eef03770e 100644 (file)
--- a/src/lib/implementations/SLCommandHandler.cpp
+++ b/src/lib/implementations/SLCommandHandler.cpp
@@ -1,4 +1,3 @@
-#pragma once
 /*
  * This file is part of the libCEC(R) library.
  *