Clean up includes

src/logid/CMakeLists.txt

@@ -83,7 +83,7 @@ find_library(EVDEV_LIBRARY
 set(IPCGULL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ipcgull/src/include)
 message(${IPCGULL_INCLUDE_DIRS})
 
-include_directories(${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
+include_directories(. ${EVDEV_INCLUDE_DIR} ${LIBUDEV_INCLUDE_DIRECTORIES} ${IPCGULL_INCLUDE_DIRS})
 
 target_link_libraries(logid ${CMAKE_THREAD_LIBS_INIT} ${EVDEV_LIBRARY} config++
         ${LIBUDEV_LIBRARIES} ipcgull)

src/logid/Configuration.cpp

@@ -16,11 +16,9 @@
  *
  */
 
+#include <Configuration.h>
+#include <util/log.h>
 #include <utility>
-#include <vector>
-
-#include "Configuration.h"
-#include "util/log.h"
 
 using namespace logid;
 using namespace libconfig;

src/logid/Configuration.h

@@ -19,14 +19,12 @@
 #ifndef LOGID_CONFIGURATION_H
 #define LOGID_CONFIGURATION_H
 
-#include <map>
+#include <config/schema.h>
+#include <ipcgull/interface.h>
 #include <libconfig.h++>
 #include <memory>
 #include <chrono>
 #include <set>
-#include <ipcgull/interface.h>
-
-#include "config/schema.h"
 
 namespace logid {
     namespace defaults {

src/logid/Device.cpp

@@ -16,19 +16,18 @@
  *
  */
 
+#include <Device.h>
+#include <DeviceManager.h>
+#include <features/SmartShift.h>
+#include <features/DPI.h>
+#include <features/RemapButton.h>
+#include <features/HiresScroll.h>
+#include <features/DeviceStatus.h>
+#include <features/ThumbWheel.h>
+#include <backend/hidpp20/features/Reset.h>
+#include <util/log.h>
 #include <thread>
 #include <utility>
-#include "util/log.h"
-#include "features/DPI.h"
-#include "Device.h"
-#include "DeviceManager.h"
-#include "Receiver.h"
-#include "features/SmartShift.h"
-#include "features/RemapButton.h"
-#include "backend/hidpp20/features/Reset.h"
-#include "features/HiresScroll.h"
-#include "features/DeviceStatus.h"
-#include "features/ThumbWheel.h"
 
 using namespace logid;
 using namespace logid::backend;

src/logid/Device.h

@@ -19,13 +19,12 @@
 #ifndef LOGID_DEVICE_H
 #define LOGID_DEVICE_H
 
+#include <features/DeviceFeature.h>
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp/defs.h>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
-#include "backend/hidpp/defs.h"
-#include "backend/hidpp20/Device.h"
-#include "features/DeviceFeature.h"
-#include "Configuration.h"
-#include "util/log.h"
+#include <Configuration.h>
 
 namespace logid {
     class DeviceManager;
@@ -103,8 +102,6 @@ namespace logid {
             try {
                 return std::dynamic_pointer_cast<T>(it->second);
             } catch (std::bad_cast& e) {
-                logPrintf(ERROR, "bad_cast while getting device feature %s: %s",
-                          name.c_str(), e.what());
                 return nullptr;
             }
         }

src/logid/DeviceManager.cpp

@@ -16,16 +16,13 @@
  *
  */
 
+#include <DeviceManager.h>
+#include <backend/Error.h>
+#include <util/log.h>
+#include <ipcgull/function.h>
 #include <thread>
 #include <sstream>
 #include <utility>
-#include <ipcgull/function.h>
-
-#include "DeviceManager.h"
-#include "Receiver.h"
-#include "util/log.h"
-#include "backend/hidpp10/Error.h"
-#include "backend/Error.h"
 
 using namespace logid;
 using namespace logid::backend;

src/logid/DeviceManager.h

@@ -19,17 +19,12 @@
 #ifndef LOGID_DEVICEMANAGER_H
 #define LOGID_DEVICEMANAGER_H
 
-#include <map>
-#include <thread>
-#include <mutex>
+#include <backend/raw/DeviceMonitor.h>
+#include <Device.h>
+#include <Receiver.h>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
 
-#include "backend/raw/DeviceMonitor.h"
-#include "backend/hidpp/Device.h"
-#include "Device.h"
-#include "Receiver.h"
-
 namespace logid {
     class InputDevice;
 

src/logid/InputDevice.cpp

@@ -16,10 +16,9 @@
  *
  */
 
+#include <InputDevice.h>
 #include <system_error>
 
-#include "InputDevice.h"
-
 extern "C"
 {
 #include <libevdev/libevdev.h>

src/logid/Receiver.cpp

@@ -16,12 +16,10 @@
  *
  */
 
-#include "Receiver.h"
-#include "DeviceManager.h"
-#include "util/log.h"
-#include "backend/hidpp10/Error.h"
-#include "backend/hidpp20/Error.h"
-#include "backend/Error.h"
+#include <Receiver.h>
+#include <DeviceManager.h>
+#include <backend/Error.h>
+#include <util/log.h>
 
 using namespace logid;
 using namespace logid::backend;

src/logid/Receiver.h

@@ -20,8 +20,8 @@
 #define LOGID_RECEIVER_H
 
 #include <string>
-#include "backend/dj/ReceiverMonitor.h"
-#include "Device.h"
+#include <Device.h>
+#include <backend/dj/ReceiverMonitor.h>
 
 namespace logid {
     class ReceiverNickname {

src/logid/actions/Action.cpp

@@ -16,16 +16,15 @@
  *
  */
 
-#include <algorithm>
-#include "Action.h"
-#include "KeypressAction.h"
-#include "ToggleSmartShift.h"
-#include "ToggleHiresScroll.h"
-#include "GestureAction.h"
-#include "NullAction.h"
-#include "CycleDPI.h"
-#include "ChangeDPI.h"
-#include "ChangeHostAction.h"
+#include <actions/Action.h>
+#include <actions/KeypressAction.h>
+#include <actions/ToggleSmartShift.h>
+#include <actions/ToggleHiresScroll.h>
+#include <actions/GestureAction.h>
+#include <actions/NullAction.h>
+#include <actions/CycleDPI.h>
+#include <actions/ChangeDPI.h>
+#include <actions/ChangeHostAction.h>
 
 using namespace logid;
 using namespace logid::actions;

src/logid/actions/Action.h

@@ -19,13 +19,12 @@
 #define LOGID_ACTION_H
 
 #include <atomic>
-#include <libconfig.h++>
 #include <memory>
 #include <utility>
+#include <shared_mutex>
 #include <ipcgull/node.h>
 #include <ipcgull/interface.h>
-#include <shared_mutex>
-#include "../config/schema.h"
+#include <config/schema.h>
 
 namespace logid {
     class Device;

src/logid/actions/ChangeDPI.cpp

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ChangeDPI.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/ChangeDPI.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 

src/logid/actions/ChangeDPI.h

@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CHANGEDPI_H
 #define LOGID_ACTION_CHANGEDPI_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/DPI.h"
+#include <actions/Action.h>
+#include <features/DPI.h>
 
 namespace logid::actions {
     class ChangeDPI : public Action {

src/logid/actions/ChangeHostAction.cpp

@@ -15,11 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <actions/ChangeHostAction.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
 #include <algorithm>
-#include "ChangeHostAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
-#include "../util/task.h"
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;

src/logid/actions/ChangeHostAction.h

@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CHANGEHOSTACTION_H
 #define LOGID_ACTION_CHANGEHOSTACTION_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../backend/hidpp20/features/ChangeHost.h"
+#include <actions/Action.h>
+#include <backend/hidpp20/features/ChangeHost.h>
 
 namespace logid::actions {
     class ChangeHostAction : public Action {

src/logid/actions/CycleDPI.cpp

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "CycleDPI.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/CycleDPI.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace libconfig;

src/logid/actions/CycleDPI.h

@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_CYCLEDPI_H
 #define LOGID_ACTION_CYCLEDPI_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/DPI.h"
+#include <actions/Action.h>
+#include <features/DPI.h>
 
 namespace logid::actions {
     class CycleDPI : public Action {

src/logid/actions/GestureAction.cpp

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <actions/GestureAction.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/log.h>
 #include <algorithm>
-#include "GestureAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
 
 using namespace logid::actions;
 using namespace logid;

src/logid/actions/GestureAction.h

@@ -19,9 +19,8 @@
 #define LOGID_ACTION_GESTUREACTION_H
 
 #include <map>
-#include <libconfig.h++>
-#include "Action.h"
-#include "gesture/Gesture.h"
+#include <actions/Action.h>
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class GestureAction : public Action {

src/logid/actions/KeypressAction.cpp

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "KeypressAction.h"
-#include "../Device.h"
-#include "../InputDevice.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/KeypressAction.h>
+#include <Device.h>
+#include <InputDevice.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;

src/logid/actions/KeypressAction.h

@@ -19,8 +19,7 @@
 #define LOGID_ACTION_KEYPRESS_H
 
 #include <vector>
-#include <libconfig.h++>
-#include "Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class KeypressAction : public Action {

src/logid/actions/NullAction.cpp

@@ -15,9 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "NullAction.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/NullAction.h>
+#include <backend/hidpp20/features/ReprogControls.h>
 
 using namespace logid::actions;
 

src/logid/actions/NullAction.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_NULL_H
 #define LOGID_ACTION_NULL_H
 
-#include "Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class NullAction : public Action {

src/logid/actions/ToggleHiresScroll.cpp

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ToggleHiresScroll.h"
-#include "../Device.h"
-#include "../util/task.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
+#include <actions/ToggleHiresScroll.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;

src/logid/actions/ToggleHiresScroll.h

@@ -18,8 +18,8 @@
 #ifndef LOGID_ACTION_TOGGLEHIRESSCROLL_H
 #define LOGID_ACTION_TOGGLEHIRESSCROLL_H
 
-#include "Action.h"
-#include "../features/HiresScroll.h"
+#include <actions/Action.h>
+#include <features/HiresScroll.h>
 
 namespace logid::actions {
     class ToggleHiresScroll : public Action {

src/logid/actions/ToggleSmartShift.cpp

@@ -15,10 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ToggleSmartShift.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/ReprogControls.h"
-#include "../util/task.h"
+
+#include <actions/ToggleSmartShift.h>
+#include <Device.h>
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 using namespace logid::backend;

src/logid/actions/ToggleSmartShift.h

@@ -18,9 +18,8 @@
 #ifndef LOGID_ACTION_TOGGLESMARTSHIFT_H
 #define LOGID_ACTION_TOGGLESMARTSHIFT_H
 
-#include <libconfig.h++>
-#include "Action.h"
-#include "../features/SmartShift.h"
+#include <actions/Action.h>
+#include <features/SmartShift.h>
 
 namespace logid::actions {
     class ToggleSmartShift : public Action {

src/logid/actions/gesture/AxisGesture.cpp

@@ -16,9 +16,10 @@
  *
  */
 #include <cmath>
-#include "AxisGesture.h"
-#include "../../Device.h"
-#include "../../InputDevice.h"
+#include <actions/gesture/AxisGesture.h>
+#include <Device.h>
+#include <InputDevice.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 

src/logid/actions/gesture/AxisGesture.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_AXISGESTURE_H
 #define LOGID_ACTION_AXISGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class AxisGesture : public Gesture {

src/logid/actions/gesture/Gesture.cpp

@@ -16,13 +16,13 @@
  *
  */
 
+#include <actions/gesture/Gesture.h>
 #include <utility>
-#include "Gesture.h"
-#include "ReleaseGesture.h"
-#include "ThresholdGesture.h"
-#include "IntervalGesture.h"
-#include "AxisGesture.h"
-#include "NullGesture.h"
+#include <actions/gesture/ReleaseGesture.h>
+#include <actions/gesture/ThresholdGesture.h>
+#include <actions/gesture/IntervalGesture.h>
+#include <actions/gesture/AxisGesture.h>
+#include <actions/gesture/NullGesture.h>
 
 using namespace logid;
 using namespace logid::actions;

src/logid/actions/gesture/Gesture.h

@@ -19,8 +19,7 @@
 #define LOGID_ACTION_GESTURE_H
 
 #include <utility>
-
-#include "../Action.h"
+#include <actions/Action.h>
 
 namespace logid::actions {
     class InvalidGesture : public std::exception {

src/logid/actions/gesture/IntervalGesture.cpp

@@ -15,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "IntervalGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/IntervalGesture.h>
+#include <Configuration.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 

src/logid/actions/gesture/IntervalGesture.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_INTERVALGESTURE_H
 #define LOGID_ACTION_INTERVALGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class IntervalGesture : public Gesture {

src/logid/actions/gesture/NullGesture.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "NullGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/NullGesture.h>
+#include <Configuration.h>
 
 using namespace logid::actions;
 

src/logid/actions/gesture/NullGesture.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_NULLGESTURE_H
 #define LOGID_ACTION_NULLGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class NullGesture : public Gesture {

src/logid/actions/gesture/ReleaseGesture.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ReleaseGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/ReleaseGesture.h>
+#include <Configuration.h>
 
 using namespace logid::actions;
 

src/logid/actions/gesture/ReleaseGesture.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_RELEASEGESTURE_H
 #define LOGID_ACTION_RELEASEGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class ReleaseGesture : public Gesture {

src/logid/actions/gesture/ThresholdGesture.cpp

@@ -15,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ThresholdGesture.h"
-#include "../../Configuration.h"
+#include <actions/gesture/ThresholdGesture.h>
+#include <Configuration.h>
+#include <util/log.h>
 
 using namespace logid::actions;
 

src/logid/actions/gesture/ThresholdGesture.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_ACTION_THRESHOLDGESTURE_H
 #define LOGID_ACTION_THRESHOLDGESTURE_H
 
-#include "Gesture.h"
+#include <actions/gesture/Gesture.h>
 
 namespace logid::actions {
     class ThresholdGesture : public Gesture {

src/logid/backend/Error.cpp

@@ -16,7 +16,7 @@
  *
  */
 
-#include "Error.h"
+#include <backend/Error.h>
 
 const char* logid::backend::TimeoutError::what() const noexcept {
     return "Device timed out";

src/logid/backend/dj/Error.cpp

@@ -16,7 +16,7 @@
  *
  */
 
-#include "Error.h"
+#include <backend/dj/Error.h>
 
 using namespace logid::backend::dj;
 

src/logid/backend/dj/Receiver.cpp

@@ -16,10 +16,9 @@
  *
  */
 
+#include <backend/dj/Receiver.h>
 #include <cassert>
-#include "Report.h"
-#include "Receiver.h"
-#include "Error.h"
+#include <backend/dj/Error.h>
 
 using namespace logid::backend::dj;
 using namespace logid::backend;

src/logid/backend/dj/Receiver.h

@@ -20,10 +20,10 @@
 #define LOGID_BACKEND_DJ_RECEIVER_H
 
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "Report.h"
-#include "../hidpp/Report.h"
-#include "../hidpp10/Device.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/dj/Report.h>
+#include <backend/hidpp/Report.h>
+#include <backend/hidpp10/Device.h>
 
 namespace logid::backend::dj {
     struct EventHandler {

src/logid/backend/dj/ReceiverMonitor.cpp

@@ -16,12 +16,11 @@
  *
  */
 
-#include "ReceiverMonitor.h"
-#include "../../util/task.h"
-#include "../../util/log.h"
-
+#include <backend/dj/ReceiverMonitor.h>
 #include <utility>
 #include <cassert>
+#include <util/task.h>
+#include <util/log.h>
 
 using namespace logid::backend::dj;
 

src/logid/backend/dj/ReceiverMonitor.h

@@ -21,8 +21,8 @@
 
 #include <cstdint>
 #include <string>
-#include "Receiver.h"
-#include "../hidpp/defs.h"
+#include <backend/dj/Receiver.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     // This class will run on the RawDevice thread,

src/logid/backend/dj/Report.cpp

@@ -16,10 +16,10 @@
  *
  */
 
-#include <array>
+#include <backend/dj/Report.h>
 #include <algorithm>
+#include <array>
 #include <cassert>
-#include "Report.h"
 
 using namespace logid::backend::dj;
 using namespace logid::backend;

src/logid/backend/dj/Report.h

@@ -20,9 +20,9 @@
 #define LOGID_BACKEND_DJ_REPORT_H
 
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "defs.h"
-#include "../hidpp/defs.h"
+#include <vector>
+#include <backend/dj/defs.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     namespace Offset {

src/logid/backend/hidpp/Device.cpp

@@ -16,15 +16,15 @@
  *
  */
 
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/features/DeviceName.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp10/Error.h>
+#include <backend/dj/Receiver.h>
+#include <backend/Error.h>
 #include <cassert>
 #include <utility>
-#include "Device.h"
-#include "Report.h"
-#include "../hidpp20/features/Root.h"
-#include "../hidpp20/features/DeviceName.h"
-#include "../hidpp10/Error.h"
-#include "../Error.h"
-#include "../dj/Receiver.h"
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp;

src/logid/backend/hidpp/Device.h

@@ -25,9 +25,9 @@
 #include <memory>
 #include <functional>
 #include <map>
-#include "../raw/RawDevice.h"
-#include "Report.h"
-#include "defs.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/Report.h>
+#include <backend/hidpp/defs.h>
 
 namespace logid::backend::dj {
     // Need to define here for a constructor

src/logid/backend/hidpp/Report.cpp

@@ -16,12 +16,12 @@
  *
  */
 
+#include <backend/hidpp/Report.h>
 #include <array>
 #include <algorithm>
 #include <cassert>
-#include "Report.h"
-#include "../hidpp10/Error.h"
-#include "../hidpp20/Error.h"
+#include <backend/hidpp10/Error.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp;
 using namespace logid::backend;

src/logid/backend/hidpp/Report.h

@@ -19,9 +19,9 @@
 #ifndef LOGID_BACKEND_HIDPP_REPORT_H
 #define LOGID_BACKEND_HIDPP_REPORT_H
 
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/defs.h>
 #include <cstdint>
-#include "../raw/RawDevice.h"
-#include "defs.h"
 
 /* Some devices only support a subset of these reports */
 #define HIDPP_REPORT_SHORT_SUPPORTED      1U

src/logid/backend/hidpp10/Device.cpp

@@ -16,11 +16,10 @@
  *
  */
 
+#include <backend/hidpp10/Device.h>
+#include <backend/Error.h>
 #include <cassert>
 #include <utility>
-#include "Device.h"
-#include "defs.h"
-#include "../Error.h"
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp10;

src/logid/backend/hidpp10/Device.h

@@ -21,10 +21,9 @@
 
 #include <optional>
 #include <variant>
-
-#include "../hidpp/Device.h"
-#include "Error.h"
-#include "defs.h"
+#include <backend/hidpp/Device.h>
+#include <backend/hidpp10/Error.h>
+#include <backend/hidpp10/defs.h>
 
 namespace logid::backend::hidpp10 {
     class Device : public hidpp::Device {

src/logid/backend/hidpp10/Error.cpp

@@ -16,9 +16,8 @@
  *
  */
 
+#include <backend/hidpp10/Error.h>
 #include <cassert>
-#include <string>
-#include "Error.h"
 
 using namespace logid::backend::hidpp10;
 

src/logid/backend/hidpp20/Device.cpp

@@ -17,10 +17,9 @@
  */
 
 #include <cassert>
-
-#include "Device.h"
-#include "../Error.h"
-#include "../dj/Receiver.h"
+#include <backend/hidpp20/Device.h>
+#include <backend/Error.h>
+#include <backend/dj/Receiver.h>
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp20;

src/logid/backend/hidpp20/Device.h

@@ -22,9 +22,8 @@
 #include <cstdint>
 #include <optional>
 #include <variant>
-
-#include "../hidpp/Device.h"
-#include "Error.h"
+#include <backend/hidpp20/Error.h>
+#include <backend/hidpp/Device.h>
 
 namespace logid::backend::hidpp20 {
     class Device : public hidpp::Device {

src/logid/backend/hidpp20/Error.cpp

@@ -16,8 +16,8 @@
  *
  */
 
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "Error.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/EssentialFeature.cpp

@@ -16,11 +16,11 @@
  *
  */
 
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "EssentialFeature.h"
-#include "feature_defs.h"
-#include "features/Root.h"
-#include "Error.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/EssentialFeature.h

@@ -25,7 +25,7 @@
  * hidpp::Device class. No version checks are provided here
  */
 
-#include "Device.h"
+#include <backend/hidpp/Device.h>
 
 namespace logid::backend::hidpp20 {
     class EssentialFeature {

src/logid/backend/hidpp20/Feature.cpp

@@ -16,10 +16,9 @@
  *
  */
 
-#include "Error.h"
-#include "Feature.h"
-#include "feature_defs.h"
-#include "features/Root.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/Device.h>
+#include <backend/hidpp20/features/Root.h>
 
 using namespace logid::backend::hidpp20;
 
@@ -64,6 +63,6 @@ Feature::Feature(Device* dev, uint16_t _id) : _device(dev) {
     }
 }
 
-uint8_t Feature::featureIndex() {
+uint8_t Feature::featureIndex() const {
     return _index;
 }

src/logid/backend/hidpp20/Feature.h

@@ -20,9 +20,12 @@
 #define LOGID_BACKEND_HIDPP20_FEATURE_H
 
 #include <cstdint>
-#include "Device.h"
+#include <exception>
+#include <vector>
 
 namespace logid::backend::hidpp20 {
+    class Device;
+
     class UnsupportedFeature : public std::exception {
     public:
         explicit UnsupportedFeature(uint16_t ID) : _f_id(ID) {}
@@ -41,7 +44,7 @@ namespace logid::backend::hidpp20 {
 
         virtual uint16_t getID() = 0;
 
-        uint8_t featureIndex();
+        [[nodiscard]] uint8_t featureIndex() const;
 
         virtual ~Feature() = default;
 

src/logid/backend/hidpp20/features/AdjustableDPI.cpp

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "AdjustableDPI.h"
+#include <backend/hidpp20/features/AdjustableDPI.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/AdjustableDPI.h

@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_ADJUSTABLEDPI_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_ADJUSTABLEDPI_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class AdjustableDPI : public Feature {

src/logid/backend/hidpp20/features/ChangeHost.cpp

@@ -15,7 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "ChangeHost.h"
+#include <backend/hidpp20/features/ChangeHost.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/ChangeHost.h

@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_CHANGEHOST_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_CHANGEHOST_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
 
 namespace logid::backend::hidpp20 {
     class ChangeHost : public Feature {

src/logid/backend/hidpp20/features/DeviceName.cpp

@@ -16,7 +16,7 @@
  *
  */
 
-#include "DeviceName.h"
+#include <backend/hidpp20/features/DeviceName.h>
 
 using namespace logid::backend;
 using namespace logid::backend::hidpp20;

src/logid/backend/hidpp20/features/DeviceName.h

@@ -19,9 +19,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_DEVICENAME_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_DEVICENAME_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
-#include "../EssentialFeature.h"
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class DeviceName : public EssentialFeature {

src/logid/backend/hidpp20/features/FeatureSet.cpp

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "FeatureSet.h"
+#include <backend/hidpp20/features/FeatureSet.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/FeatureSet.h

@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_FEATURESET_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_FEATURESET_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <map>
 
 namespace logid::backend::hidpp20 {
     class FeatureSet : public Feature {

src/logid/backend/hidpp20/features/HiresScroll.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/HiresScroll.h>
 #include <cassert>
-#include "HiresScroll.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/HiresScroll.h

@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_HIRESSCROLL_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_HIRESSCROLL_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class HiresScroll : public Feature {

src/logid/backend/hidpp20/features/ReprogControls.cpp

@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/ReprogControls.h>
+#include <backend/hidpp20/Error.h>
 #include <cassert>
-#include "../Error.h"
-#include "ReprogControls.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/ReprogControls.h

@@ -18,10 +18,12 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_REPROGCONTROLS_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_REPROGCONTROLS_H
 
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp/Report.h>
 #include <map>
-
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <set>
+#include <memory>
 
 namespace logid::backend::hidpp20 {
     class ReprogControls : public Feature {

src/logid/backend/hidpp20/features/Reset.cpp

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "Reset.h"
+#include <backend/hidpp20/features/Reset.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/Reset.h

@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_RESET_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_RESET_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
     class Reset : public Feature {

src/logid/backend/hidpp20/features/Root.cpp

@@ -16,7 +16,9 @@
  *
  */
 
-#include "Root.h"
+#include <backend/hidpp20/features/Root.h>
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/Error.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/Root.h

@@ -19,9 +19,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_ROOT_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_ROOT_H
 
-#include "../Feature.h"
-#include "../EssentialFeature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/EssentialFeature.h>
+#include <backend/hidpp20/feature_defs.h>
 
 namespace logid::backend::hidpp20 {
 

src/logid/backend/hidpp20/features/SmartShift.cpp

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "SmartShift.h"
+#include <backend/hidpp20/features/SmartShift.h>
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/SmartShift.h

@@ -18,8 +18,8 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_SMARTSHIFT_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_SMARTSHIFT_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp20/Feature.h>
 
 namespace logid::backend::hidpp20 {
     class SmartShift : public Feature {

src/logid/backend/hidpp20/features/ThumbWheel.cpp

@@ -16,8 +16,8 @@
  *
  */
 
+#include <backend/hidpp20/features/ThumbWheel.h>
 #include <cassert>
-#include "ThumbWheel.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/ThumbWheel.h

@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_THUMBWHEEL_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_THUMBWHEEL_H
 
-#include "../feature_defs.h"
-#include "../Feature.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class ThumbWheel : public Feature {

src/logid/backend/hidpp20/features/WirelessDeviceStatus.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/hidpp20/features/WirelessDeviceStatus.h>
 #include <cassert>
-#include "WirelessDeviceStatus.h"
 
 using namespace logid::backend::hidpp20;
 

src/logid/backend/hidpp20/features/WirelessDeviceStatus.h

@@ -18,8 +18,9 @@
 #ifndef LOGID_BACKEND_HIDPP20_FEATURE_WIRELESSDEVICESTATUS_H
 #define LOGID_BACKEND_HIDPP20_FEATURE_WIRELESSDEVICESTATUS_H
 
-#include "../Feature.h"
-#include "../feature_defs.h"
+#include <backend/hidpp20/Feature.h>
+#include <backend/hidpp20/feature_defs.h>
+#include <backend/hidpp/Report.h>
 
 namespace logid::backend::hidpp20 {
     class WirelessDeviceStatus : public Feature {

src/logid/backend/raw/DeviceMonitor.cpp

@@ -16,12 +16,12 @@
  *
  */
 
-#include "DeviceMonitor.h"
-#include "../../util/task.h"
-#include "../../util/log.h"
-#include "RawDevice.h"
-#include "../hidpp/Device.h"
-
+#include <backend/raw/DeviceMonitor.h>
+#include <backend/raw/IOMonitor.h>
+#include <backend/raw/RawDevice.h>
+#include <backend/hidpp/Device.h>
+#include <util/task.h>
+#include <util/log.h>
 #include <system_error>
 
 extern "C"

src/logid/backend/raw/DeviceMonitor.h

@@ -23,7 +23,6 @@
 #include <mutex>
 #include <atomic>
 #include <memory>
-#include "IOMonitor.h"
 
 extern "C"
 {
@@ -32,6 +31,8 @@ struct udev_monitor;
 }
 
 namespace logid::backend::raw {
+    class IOMonitor;
+
     static constexpr int ready_wait = 2000;
 
     class DeviceMonitor {

src/logid/backend/raw/IOMonitor.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <backend/raw/IOMonitor.h>
 #include <cassert>
-#include "IOMonitor.h"
 
 extern "C"
 {

src/logid/backend/raw/RawDevice.cpp

@@ -16,10 +16,10 @@
  *
  */
 
-#include "RawDevice.h"
-#include "DeviceMonitor.h"
-#include "IOMonitor.h"
-#include "../../util/log.h"
+#include <backend/raw/RawDevice.h>
+#include <backend/raw/DeviceMonitor.h>
+#include <backend/raw/IOMonitor.h>
+#include <util/log.h>
 
 #include <string>
 #include <system_error>

src/logid/backend/raw/RawDevice.h

@@ -26,8 +26,7 @@
 #include <future>
 #include <set>
 #include <list>
-
-#include "EventHandler.h"
+#include <backend/raw/EventHandler.h>
 
 namespace logid::backend::raw {
     class DeviceMonitor;

src/logid/config/group.h

@@ -22,7 +22,6 @@
 #include <type_traits>
 #include <functional>
 #include <utility>
-#include "../util/log.h"
 
 namespace logid::config {
     template<typename T>

src/logid/config/map.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_CONFIG_MAP_H
 #define LOGID_CONFIG_MAP_H
 
-#include "group.h"
+#include <config/group.h>
 #include <map>
 #include <optional>
 #include <utility>

src/logid/config/schema.h

@@ -18,7 +18,7 @@
 #ifndef LOGID_CONFIG_SCHEMA_H
 #define LOGID_CONFIG_SCHEMA_H
 
-#include "types.h"
+#include <config/types.h>
 
 namespace logid::actions {
     class ChangeDPI;

src/logid/config/types.h

@@ -18,16 +18,15 @@
 #ifndef LOGID_CONFIG_PRIMITIVE_H
 #define LOGID_CONFIG_PRIMITIVE_H
 
+#include <config/map.h>
+#include <config/group.h>
+#include <ipcgull/property.h>
 #include <libconfig.h++>
 #include <type_traits>
 #include <optional>
 #include <variant>
 #include <list>
 #include <set>
-#include <ipcgull/property.h>
-#include "group.h"
-#include "map.h"
-#include "../util/log.h"
 
 /// TODO: A single element failing should not cause the container to be invalid.
 

src/logid/features/DPI.cpp

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <features/DPI.h>
+#include <Device.h>
 #include <algorithm>
 #include <cmath>
-#include "DPI.h"
-#include "../Device.h"
 
 using namespace logid::features;
 using namespace logid::backend;

src/logid/features/DPI.h

@@ -18,9 +18,9 @@
 #ifndef LOGID_FEATURE_DPI_H
 #define LOGID_FEATURE_DPI_H
 
-#include "../backend/hidpp20/features/AdjustableDPI.h"
-#include "DeviceFeature.h"
-#include "../config/schema.h"
+#include <backend/hidpp20/features/AdjustableDPI.h>
+#include <features/DeviceFeature.h>
+#include <config/schema.h>
 
 namespace logid::features {
     class DPI : public DeviceFeature {

src/logid/features/DeviceStatus.cpp

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "DeviceStatus.h"
-#include "../util/task.h"
+#include <features/DeviceStatus.h>
+#include <util/task.h>
 
 using namespace logid::features;
 using namespace logid::backend;

src/logid/features/DeviceStatus.h

@@ -19,9 +19,9 @@
 #define LOGID_FEATURE_DEVICESTATUS_H
 
 
-#include "DeviceFeature.h"
-#include "../Device.h"
-#include "../backend/hidpp20/features/WirelessDeviceStatus.h"
+#include <features/DeviceFeature.h>
+#include <Device.h>
+#include <backend/hidpp20/features/WirelessDeviceStatus.h>
 
 namespace logid::features {
     class DeviceStatus : public DeviceFeature {

src/logid/features/HiresScroll.cpp

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "HiresScroll.h"
-#include "../Device.h"
-#include "../InputDevice.h"
-#include "../actions/gesture/AxisGesture.h"
+#include <features/HiresScroll.h>
+#include <actions/gesture/AxisGesture.h>
+#include <Device.h>
+#include <InputDevice.h>
 
 using namespace logid::features;
 using namespace logid::backend;

src/logid/features/HiresScroll.h

@@ -18,9 +18,14 @@
 #ifndef LOGID_FEATURE_HIRESSCROLL_H
 #define LOGID_FEATURE_HIRESSCROLL_H
 
-#include "../backend/hidpp20/features/HiresScroll.h"
-#include "DeviceFeature.h"
-#include "../actions/gesture/Gesture.h"
+#include <features/DeviceFeature.h>
+#include <actions/gesture/Gesture.h>
+#include <backend/hidpp20/features/HiresScroll.h>
+#include <backend/hidpp/Device.h>
+#include <memory>
+#include <optional>
+#include <variant>
+#include <chrono>
 
 namespace logid::features {
     class HiresScroll : public DeviceFeature {

src/logid/features/RemapButton.cpp

@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include <features/RemapButton.h>
+#include <actions/GestureAction.h>
+#include <Device.h>
 #include <sstream>
-#include "../actions/GestureAction.h"
-#include "../Device.h"
-#include "RemapButton.h"
+#include <util/log.h>
 
 using namespace logid::features;
 using namespace logid::backend;
@@ -55,10 +56,8 @@ RemapButton::RemapButton(Device* dev) : DeviceFeature(dev),
                      hidpp20::ReprogControls::RawXYDiverted) &&
                     (!_reprog_controls->supportsRawXY() ||
                      !(info.additionalFlags & hidpp20::ReprogControls::RawXY)))
-                    logPrintf(WARN,
-                              "%s: Cannot divert raw XY movements for CID "
-                              "0x%02x", _device->name().c_str(),
-                              info.controlID);
+                    logPrintf(WARN, "%s: Cannot divert raw XY movements for CID 0x%02x",
+                              _device->name().c_str(), info.controlID);
 
                 report.flags |= action->reprogFlags();
             }