From eafa9d4684e6298481b82923799a750b26852da1 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Fri, 28 Oct 2011 09:59:20 +0200 Subject: [PATCH] cec: moved CECBusDevice.cpp to devices/CECBusDevice.cpp --- src/lib/CECProcessor.cpp | 2 +- src/lib/Makefile.am | 4 ++-- src/lib/{ => devices}/CECBusDevice.cpp | 10 +++++----- src/lib/{ => devices}/CECBusDevice.h | 4 ++-- src/lib/implementations/ANCommandHandler.cpp | 2 +- src/lib/implementations/CECCommandHandler.cpp | 2 +- src/lib/implementations/SLCommandHandler.cpp | 1 - 7 files changed, 12 insertions(+), 13 deletions(-) rename src/lib/{ => devices}/CECBusDevice.cpp (95%) rename src/lib/{ => devices}/CECBusDevice.h (97%) diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 468d981..e9ae43e 100644 --- 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 243c317..31d630d 100644 --- 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 19f4e66..f89d730 100644 --- 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 7f96e6f..a115346 100644 --- a/src/lib/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -32,8 +32,8 @@ */ #include -#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 3b88680..394cfa9 100644 --- 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 9e3867e..35a5704 100644 --- 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 7c216e9..144cfc9 100644 --- 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. * -- 2.34.1