From 761dcc45a8a0fb5480c3d0898b7b7ffadd4a479c Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Thu, 13 Oct 2011 00:27:38 +0200 Subject: [PATCH] renamed: CECExports.h => cec.h, CECExportsC.h => cecc.h, CECLoader.h => cecloader.h, CECTypes.h => cectypes.h --- include/{libcec/CECExports.h => cec.h} | 2 +- include/{libcec/CECExportsC.h => cecc.h} | 2 +- include/{libcec/CECLoader.h => cecloader.h} | 0 include/{libcec/CECTypes.h => cectypes.h} | 0 src/lib/AdapterCommunication.h | 2 +- src/lib/AdapterDetection.h | 2 +- src/lib/CECProcessor.h | 2 +- src/lib/LibCEC.h | 3 +-- src/lib/LibCECC.cpp | 4 ++-- src/lib/LibCECDll.cpp | 4 ---- src/lib/Makefile.am | 11 ++++------- src/lib/libcec.pc.in | 6 +++--- src/lib/platform/serialport.h | 2 +- src/testclient/main.cpp | 4 ++-- 14 files changed, 18 insertions(+), 26 deletions(-) rename include/{libcec/CECExports.h => cec.h} (99%) rename include/{libcec/CECExportsC.h => cecc.h} (99%) rename include/{libcec/CECLoader.h => cecloader.h} (100%) rename include/{libcec/CECTypes.h => cectypes.h} (100%) diff --git a/include/libcec/CECExports.h b/include/cec.h similarity index 99% rename from include/libcec/CECExports.h rename to include/cec.h index 0da18cf..7afb065 100644 --- a/include/libcec/CECExports.h +++ b/include/cec.h @@ -34,7 +34,7 @@ #ifndef CECEXPORTS_H_ #define CECEXPORTS_H_ -#include +#include namespace CEC { diff --git a/include/libcec/CECExportsC.h b/include/cecc.h similarity index 99% rename from include/libcec/CECExportsC.h rename to include/cecc.h index e14f814..1d4c26c 100644 --- a/include/libcec/CECExportsC.h +++ b/include/cecc.h @@ -34,7 +34,7 @@ #ifndef CECEXPORTS_C_H_ #define CECEXPORTS_C_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/libcec/CECLoader.h b/include/cecloader.h similarity index 100% rename from include/libcec/CECLoader.h rename to include/cecloader.h diff --git a/include/libcec/CECTypes.h b/include/cectypes.h similarity index 100% rename from include/libcec/CECTypes.h rename to include/cectypes.h diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h index 4693d97..fcb2817 100644 --- a/src/lib/AdapterCommunication.h +++ b/src/lib/AdapterCommunication.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include #include "platform/threads.h" #include diff --git a/src/lib/AdapterDetection.h b/src/lib/AdapterDetection.h index 5115497..359a515 100644 --- a/src/lib/AdapterDetection.h +++ b/src/lib/AdapterDetection.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include namespace CEC { diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index c1dbfad..39f1a2e 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -32,7 +32,7 @@ */ #include -#include +#include #include "platform/threads.h" #include "util/buffer.h" diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h index a700034..2ad32da 100644 --- a/src/lib/LibCEC.h +++ b/src/lib/LibCEC.h @@ -32,8 +32,7 @@ */ #include -#include -#include +#include #include "util/buffer.h" namespace CEC diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp index 615c02f..d55681e 100644 --- a/src/lib/LibCECC.cpp +++ b/src/lib/LibCECC.cpp @@ -30,8 +30,8 @@ * http://www.pulse-eight.net/ */ -#include -#include +#include +#include using namespace CEC; using namespace std; diff --git a/src/lib/LibCECDll.cpp b/src/lib/LibCECDll.cpp index fb25d0e..fb0ed9a 100644 --- a/src/lib/LibCECDll.cpp +++ b/src/lib/LibCECDll.cpp @@ -30,10 +30,6 @@ * http://www.pulse-eight.net/ */ -#include "CECExports.h" - -using namespace CEC; - int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*) { return 1; diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 5d93660..e3354e1 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,9 +1,9 @@ lib_LTLIBRARIES = libcec.la library_includedir=$(includedir)/libcec -library_include_HEADERS = ../../include/libcec/CECExports.h \ - ../../include/libcec/CECExportsC.h \ - ../../include/libcec/CECTypes.h \ - ../../include/libcec/CECLoader.h +library_include_HEADERS = ../../include/cec.h \ + ../../include/cecc.h \ + ../../include/cectypes.h \ + ../../include/cecloader.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcec.pc @@ -17,9 +17,6 @@ libcec_la_SOURCES = AdapterCommunication.cpp \ LibCEC.cpp \ LibCEC.h \ LibCECC.cpp \ - ../../include/CECExports.h \ - ../../include/CECExportsCpp.h \ - ../../include/CECExportsC.h \ util/StdString.h \ platform/timeutils.h \ platform/baudrate.h \ diff --git a/src/lib/libcec.pc.in b/src/lib/libcec.pc.in index d0a6e7b..1734233 100644 --- a/src/lib/libcec.pc.in +++ b/src/lib/libcec.pc.in @@ -1,12 +1,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@ +includedir=@includedir@/libcec Name: libcec -Description: CEC interface library +Description: Pulse-Eight CEC adapter library URL: http://www.pulse-eight.com/ Version: @VERSION@ Requires: @REQUIRES@ -Libs: -L${libdir} -lcec +Libs: -L${libdir}` -lcec Cflags: -I${includedir} diff --git a/src/lib/platform/serialport.h b/src/lib/platform/serialport.h index f912abb..4d1be82 100644 --- a/src/lib/platform/serialport.h +++ b/src/lib/platform/serialport.h @@ -19,7 +19,7 @@ */ #include "os-dependent.h" -#include +#include #include #include #include "../platform/threads.h" diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index dc20968..817d267 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -30,7 +30,7 @@ * http://www.pulse-eight.net/ */ -#include +#include #include #include @@ -45,7 +45,7 @@ using namespace std; #define CEC_TEST_CLIENT_VERSION 7 -#include +#include inline bool HexStrToInt(const std::string& data, uint8_t& value) { -- 2.34.1