Rename class and files.

Author: netfab

configure.ac

@@ -83,7 +83,7 @@ AC_ARG_ENABLE( [debug-gkdbus],
 				[enable_gkdbus_debugging=$enableval], [enable_gkdbus_debugging=no])
 
 AC_ARG_ENABLE( [debug-libusb],
-				AC_HELP_STRING( [--enable-debug-libusb], [Enable LibUSB extra debugging, default: no]),
+				AC_HELP_STRING( [--enable-debug-libusb], [Enable libusb extra debugging, default: no]),
 				[enable_libusb_extra_debugging=$enableval], [enable_libusb_extra_debugging=no])
 
 AC_ARG_ENABLE( [debug-pbmfont],
@@ -198,7 +198,7 @@ GDT_DEBUG_FLAG(	[$enable_gkdbus_debugging],
 
 GDT_DEBUG_FLAG(	[$enable_libusb_extra_debugging],
 				[DEBUG_LIBUSB_EXTRA],
-				[LibUSB extra debugging])
+				[libusb extra debugging])
 
 GDT_DEBUG_FLAG(	[$enable_pbmfont_debugging],
 				[DEBUG_PBMFONT],
@@ -423,7 +423,7 @@ AC_MSG_NOTICE([
   Global debugging : ${enable_debugging}
               keys : ${enable_keys_debugging}
             GKDBus : ${enable_gkdbus_debugging}
-            LibUSB : ${enable_libusb_extra_debugging}
+            libusb : ${enable_libusb_extra_debugging}
            PBMFont : ${enable_pbmfont_debugging}
        LCD plugins : ${enable_lcd_plugins_debugging}
          debug dir : ${DEBUG_DIR}

src/bin/daemon/Makefile.am

@@ -55,8 +55,8 @@ GLogiKd_LDADD += \
 				@LIBUSB_LIBS@
 
 GLogiKd_SOURCES += \
-		%D%/libUSB.cpp \
-		%D%/libUSB.hpp
+		%D%/libusb.cpp \
+		%D%/libusb.hpp
 endif
 
 if WITH_HIDAPI

src/bin/daemon/USBDevice.hpp

@@ -66,7 +66,7 @@ class USBDevice
 
 #if GKLIBUSB
 	private:
-		friend class LibUSB;
+		friend class libusb;
 
 		std::mutex					_libUSBMutex;
 #endif

src/bin/daemon/devicesManager.cpp

@@ -41,7 +41,7 @@
 #include "devicesManager.hpp"
 
 #if GKLIBUSB
-#include "libUSB.hpp"
+#include "libusb.hpp"
 #elif GKHIDAPI
 #include "hidapi.hpp"
 #endif
@@ -871,7 +871,7 @@ void DevicesManager::resetDevicesStates(void) {
 
 /*
  *	Throws GLogiKExcept in many ways on udev related functions failures.
- *	LibUSB failures on devices start/stop are catched internally.
+ *	USB library failures on devices start/stop are catched internally.
  */
 void DevicesManager::startMonitoring(void) {
 #if DEBUGGING_ON
@@ -909,7 +909,7 @@ void DevicesManager::startMonitoring(void) {
 #endif
 			try {
 #if GKLIBUSB
-				_drivers.push_back( new LogitechG510<LibUSB>() );
+				_drivers.push_back( new LogitechG510<libusb>() );
 #elif GKHIDAPI
 				_drivers.push_back( new LogitechG510<hidapi>() );
 #endif

src/bin/daemon/libUSB.cpp renamed to src/bin/daemon/libusb.cpp

@@ -30,16 +30,16 @@
 
 #include "lib/utils/utils.hpp"
 
-#include "libUSB.hpp"
+#include "libusb.hpp"
 
 namespace GLogiK
 {
 
 using namespace NSGKUtils;
 
-libusb_context * LibUSB::pContext = nullptr;
-uint8_t LibUSB::counter = 0;
-bool LibUSB::status = false;
+libusb_context * libusb::pContext = nullptr;
+uint8_t libusb::counter = 0;
+bool libusb::status = false;
 
 /*
  * --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
@@ -51,38 +51,40 @@ bool LibUSB::status = false;
  * --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
  */
 
-LibUSB::LibUSB(void)
+libusb::libusb(void)
 {
-	LibUSB::counter++;
+	libusb::counter++;
 
-	if( ! LibUSB::status ) {
+	if( ! libusb::status ) {
 #if DEBUGGING_ON
 		LOG(DEBUG3) << "initializing libusb";
 #endif
-		int ret = libusb_init( &(LibUSB::pContext) );
+		int ret = libusb_init( &(libusb::pContext) );
 		if ( this->USBError(ret) ) {
 			throw GLogiKExcept("libusb initialization failure");
 		}
 
-		LibUSB::status = true;
+		libusb::status = true;
 	}
 }
 
-LibUSB::~LibUSB() {
-	LibUSB::counter--;
+libusb::~libusb()
+{
+	libusb::counter--;
 
-	if (LibUSB::status and LibUSB::counter == 0) {
+	if (libusb::status and libusb::counter == 0) {
 #if DEBUGGING_ON
 		LOG(DEBUG3) << "closing libusb";
 #endif
-		libusb_exit(LibUSB::pContext);
-		LibUSB::status = false;
+		libusb_exit(libusb::pContext);
+		libusb::status = false;
 	}
 }
 
-void LibUSB::openUSBDevice(USBDevice & device) {
+void libusb::openUSBDevice(USBDevice & device)
+{
 	libusb_device **list;
-	int numDevices = libusb_get_device_list(LibUSB::pContext, &(list));
+	int numDevices = libusb_get_device_list(libusb::pContext, &(list));
 	if( numDevices < 0 ) {
 		this->USBError(numDevices);
 		throw GLogiKExcept("error getting USB devices list");
@@ -127,7 +129,8 @@ void LibUSB::openUSBDevice(USBDevice & device) {
 	}
 }
 
-void LibUSB::closeUSBDevice(USBDevice & device) noexcept {
+void libusb::closeUSBDevice(USBDevice & device) noexcept
+{
 	if( device.runDeviceUSBRequests() ) {
 		/* if we ever claimed or detached some interfaces, set them back
 		 * to the same state in which we found them */
@@ -144,7 +147,7 @@ void LibUSB::closeUSBDevice(USBDevice & device) noexcept {
 #endif
 }
 
-void LibUSB::sendControlRequest(
+void libusb::sendControlRequest(
 	USBDevice & device,
 	const unsigned char * data,
 	uint16_t wLength)
@@ -194,7 +197,7 @@ void LibUSB::sendControlRequest(
 	}
 }
 
-int LibUSB::performKeysInterruptTransfer(
+int libusb::performKeysInterruptTransfer(
 	USBDevice & device,
 	unsigned int timeout)
 {
@@ -225,7 +228,7 @@ int LibUSB::performKeysInterruptTransfer(
 	return ret;
 }
 
-int LibUSB::performLCDScreenInterruptTransfer(
+int libusb::performLCDScreenInterruptTransfer(
 	USBDevice & device,
 	const unsigned char * buffer,
 	int bufferLength,
@@ -272,7 +275,8 @@ int LibUSB::performLCDScreenInterruptTransfer(
  * --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
  */
 
-int LibUSB::USBError(int errorCode) noexcept {
+int libusb::USBError(int errorCode) noexcept
+{
 	switch(errorCode) {
 		case LIBUSB_SUCCESS:
 			break;
@@ -287,7 +291,8 @@ int LibUSB::USBError(int errorCode) noexcept {
 	return errorCode;
 }
 
-void LibUSB::releaseUSBDeviceInterfaces(USBDevice & device) noexcept {
+void libusb::releaseUSBDeviceInterfaces(USBDevice & device) noexcept
+{
 	int ret = 0;
 	for(auto it = device._toRelease.begin(); it != device._toRelease.end();) {
 		int numInt = (*it);
@@ -322,7 +327,8 @@ void LibUSB::releaseUSBDeviceInterfaces(USBDevice & device) noexcept {
  *			libusb_set_configuration() may succeed.
  *
  */
-void LibUSB::setUSBDeviceActiveConfiguration(USBDevice & device) {
+void libusb::setUSBDeviceActiveConfiguration(USBDevice & device)
+{
 	int ret = 0;
 
 #if DEBUGGING_ON
@@ -407,7 +413,7 @@ void LibUSB::setUSBDeviceActiveConfiguration(USBDevice & device) {
 	this->attachUSBDeviceInterfacesToKernelDrivers(device);
 }
 
-void LibUSB::findUSBDeviceInterface(USBDevice & device) {
+void libusb::findUSBDeviceInterface(USBDevice & device) {
 	int ret = 0;
 
 #if DEBUGGING_ON
@@ -684,9 +690,10 @@ void LibUSB::findUSBDeviceInterface(USBDevice & device) {
 
 		libusb_free_config_descriptor( configDescriptor ); /* free */
 	} /* for .bNumConfigurations */
-
 }
-void LibUSB::attachUSBDeviceInterfacesToKernelDrivers(USBDevice & device) noexcept {
+
+void libusb::attachUSBDeviceInterfacesToKernelDrivers(USBDevice & device) noexcept
+{
 	int ret = 0;
 	for(auto it = device._toAttach.begin(); it != device._toAttach.end();) {
 		int numInt = (*it);
@@ -704,7 +711,8 @@ void LibUSB::attachUSBDeviceInterfacesToKernelDrivers(USBDevice & device) noexce
 	device._toAttach.clear();
 }
 
-void LibUSB::detachKernelDriverFromUSBDeviceInterface(USBDevice & device, int numInt) {
+void libusb::detachKernelDriverFromUSBDeviceInterface(USBDevice & device, int numInt)
+{
 	int ret = libusb_kernel_driver_active(device._pUSBDeviceHandle, numInt);
 	if( ret < 0 ) {
 		this->USBError(ret);

src/bin/daemon/libUSB.hpp renamed to src/bin/daemon/libusb.hpp

@@ -31,13 +31,13 @@
 namespace GLogiK
 {
 
-class LibUSB
+class libusb
 {
 	public:
 
 	protected:
-		LibUSB(void);
-		~LibUSB(void);
+		libusb(void);
+		~libusb(void);
 
 		void openUSBDevice(USBDevice & device);
 		void closeUSBDevice(USBDevice & device) noexcept;

tools/vim.project

@@ -128,8 +128,8 @@ GLogiK=$PWD/.. CD=. {
 				LCDScreenPluginsManager.hpp
 				hidapi.cpp
 				hidapi.hpp
-				libUSB.cpp
-				libUSB.hpp
+				libusb.cpp
+				libusb.hpp
 				logitechG510.cpp
 				logitechG510.hpp
 				macrosManager.cpp