Fix clang-format config, clang-format everything

Author: fredemmott

.clang-format

@@ -17,6 +17,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
 ConstructorInitializerIndentWidth: '2'
 ContinuationIndentWidth: '2'
 DeriveLineEnding: false
+DerivePointerAlignment: false
 IndentRequires: true
 IndentWidth: '2'
 MaxEmptyLinesToKeep: '1'

lib/InputDevice.cpp

@@ -261,7 +261,7 @@ void InputDevice::activate() {
   printf("----- DEBUG '%s' -----\n", name.c_str());
   printf(
     "  Counts: a: %d, b: %d, h: %d\n",
-    (int) controls.axes.size(),
+    (int)controls.axes.size(),
     controls.buttons,
     controls.hats);
   printf(

lib/MappableInput.h

@@ -17,7 +17,7 @@ namespace fredemmott::inputmapping {
 
 class EventSource;
 
-class MappableInput final  {
+class MappableInput final {
  private:
   class Impl;
   std::shared_ptr<Impl> p;

lib/Mapper.cpp

@@ -21,22 +21,22 @@ struct DeviceOffsets {
   const off_t firstAxis;
   const off_t firstHat;
   const off_t firstButton;
-  DeviceOffsets(InputDevice *dev)
+  DeviceOffsets(InputDevice* dev)
     : firstAxis(0),
       firstHat(firstAxis + (sizeof(long) * dev->getAxisCount())),
       firstButton(firstHat + sizeof(int32_t) * dev->getHatCount()) {
   }
 };
 
 struct DeviceState {
-  const long *const axes;
-  const bool *const buttons;
-  const int32_t *const hats;
-
-  DeviceState(const uint8_t *data, const DeviceOffsets &offsets)
-    : axes((long *)(data + offsets.firstAxis)),
-      buttons((bool *)(data + offsets.firstButton)),
-      hats((int32_t *)(data + offsets.firstHat)) {
+  const long* const axes;
+  const bool* const buttons;
+  const int32_t* const hats;
+
+  DeviceState(const uint8_t* data, const DeviceOffsets& offsets)
+    : axes((long*)(data + offsets.firstAxis)),
+      buttons((bool*)(data + offsets.firstButton)),
+      hats((int32_t*)(data + offsets.firstHat)) {
   }
 };
 
@@ -46,10 +46,10 @@ BOOL WINAPI exit_event_handler(DWORD dwCtrlType) {
   return true;
 }
 
-Mapper *gActiveInstance = nullptr;
+Mapper* gActiveInstance = nullptr;
 
 struct ActiveInstanceGuard {
-  ActiveInstanceGuard(Mapper *active) {
+  ActiveInstanceGuard(Mapper* active) {
     gActiveInstance = active;
   }
   ~ActiveInstanceGuard() {
@@ -59,16 +59,16 @@ struct ActiveInstanceGuard {
 }// namespace
 
 void Mapper::setDevices(
-  const std::vector<MappableInput> &inputs,
-  const std::vector<std::shared_ptr<OutputDevice>> &outputs) {
-  for (const auto &input: inputs) {
+  const std::vector<MappableInput>& inputs,
+  const std::vector<std::shared_ptr<OutputDevice>>& outputs) {
+  for (const auto& input: inputs) {
     mEventSources.push_back(input.getEventSource());
   }
   mEventSinks
     = std::vector<std::shared_ptr<EventSink>>(outputs.begin(), outputs.end());
 }
 
-void Mapper::passthrough(MappableInput &s, const MappableVJoyOutput &t) {
+void Mapper::passthrough(MappableInput& s, const MappableVJoyOutput& t) {
   s.XAxis >> t.XAxis;
   s.YAxis >> t.YAxis;
   s.ZAxis >> t.ZAxis;
@@ -109,15 +109,15 @@ void Mapper::run() {
   std::vector<HANDLE> fixed_events {gExitEvent};
 
   std::map<HANDLE, std::shared_ptr<EventSource>> handle_to_source;
-  for (const auto &source: mEventSources) {
+  for (const auto& source: mEventSources) {
     auto handle = source->getHandle();
     fixed_events.push_back(handle);
     handle_to_source.insert({handle, source});
   }
   printf("---\nProfile running, hit Ctrl-C to exit and clean up HidHide.\n");
   while (true) {
     auto events = fixed_events;
-    for (const auto &[event, _]: mInjected) {
+    for (const auto& [event, _]: mInjected) {
       events.push_back(event);
     }
     const auto res
@@ -150,7 +150,7 @@ void Mapper::run() {
 }
 
 void Mapper::flush() {
-  for (const auto &output: mEventSinks) {
+  for (const auto& output: mEventSinks) {
     output->flush();
   }
 }
@@ -163,18 +163,18 @@ typedef std::chrono::
 }
 
 void Mapper::inject(
-  const std::chrono::steady_clock::duration &delay,
-  const std::function<void()> &handler) {
+  const std::chrono::steady_clock::duration& delay,
+  const std::function<void()>& handler) {
   if (!gActiveInstance) {
     return;
   }
   int64_t target_time;
-  GetSystemTimeAsFileTime((FILETIME *)&target_time);
+  GetSystemTimeAsFileTime((FILETIME*)&target_time);
   target_time += std::chrono::duration_cast<FILETIME_RESOLUTION>(delay).count();
 
   auto timer = CreateWaitableTimer(nullptr, true, nullptr);
   SetWaitableTimer(
-    timer, (LARGE_INTEGER *)&target_time, 0, nullptr, nullptr, false);
+    timer, (LARGE_INTEGER*)&target_time, 0, nullptr, nullptr, false);
   gActiveInstance->mInjected.emplace(timer, handler);
 }
 }// namespace fredemmott::inputmapping

lib/OutputDevice.h

@@ -11,7 +11,6 @@
 
 namespace fredemmott::inputmapping {
 
-class OutputDevice : public EventSink {
-};
+class OutputDevice : public EventSink {};
 
 }// namespace fredemmott::inputmapping

lib/Profile.h

@@ -44,25 +44,26 @@ const detail::ViGEmX360ID VIGEM_X360_PAD;
 const detail::ViGEmDS4ID VIGEM_DS4_PAD;
 
 class DeviceWithVisibility {
-  private:
-    DeviceSpecifier impl;
-  public:
-    explicit DeviceWithVisibility(const DeviceSpecifier& ds);
-    operator const DeviceSpecifier& () const;
+ private:
+  DeviceSpecifier impl;
+
+ public:
+  explicit DeviceWithVisibility(const DeviceSpecifier& ds);
+  operator const DeviceSpecifier&() const;
 };
 
 class UnhiddenDevice final : public DeviceWithVisibility {
-  public:
-    using DeviceWithVisibility::DeviceWithVisibility;
+ public:
+  using DeviceWithVisibility::DeviceWithVisibility;
 };
 
 class HiddenDevice final : public DeviceWithVisibility {
-  public:
-// clang-format off
+ public:
+  // clang-format off
     template<std::convertible_to<DeviceSpecifier> T>
     requires (!std::convertible_to<T, UnhiddenDevice>)
     HiddenDevice(const T& ds): DeviceWithVisibility(DeviceSpecifier(ds)) {}
-// clang-format on
+  // clang-format on
 };
 
 class Profile final {
@@ -132,7 +133,7 @@ void fill_hidden_ids(
   std::vector<HiddenDevice>& hidden_devices,
   const First& first,
   Rest... rest) {
-  if constexpr(std::convertible_to<First, HiddenDevice>) {
+  if constexpr (std::convertible_to<First, HiddenDevice>) {
     hidden_devices.push_back(first);
   }
 

lib/VJoyDevice.cpp

@@ -99,52 +99,52 @@ long normalize_axis(long dx) {
 }
 }// namespace
 
-VJoyDevice *VJoyDevice::setXAxis(long value) {
+VJoyDevice* VJoyDevice::setXAxis(long value) {
   p->state.wAxisX = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setYAxis(long value) {
+VJoyDevice* VJoyDevice::setYAxis(long value) {
   p->state.wAxisY = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setZAxis(long value) {
+VJoyDevice* VJoyDevice::setZAxis(long value) {
   p->state.wAxisZ = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setRXAxis(long value) {
+VJoyDevice* VJoyDevice::setRXAxis(long value) {
   p->state.wAxisXRot = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setRYAxis(long value) {
+VJoyDevice* VJoyDevice::setRYAxis(long value) {
   p->state.wAxisYRot = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setRZAxis(long value) {
+VJoyDevice* VJoyDevice::setRZAxis(long value) {
   p->state.wAxisZRot = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setSlider(long value) {
+VJoyDevice* VJoyDevice::setSlider(long value) {
   p->state.wSlider = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setDial(long value) {
+VJoyDevice* VJoyDevice::setDial(long value) {
   p->state.wDial = normalize_axis(value);
   return this;
 }
 
-VJoyDevice *VJoyDevice::setButton(uint8_t button, bool value) {
+VJoyDevice* VJoyDevice::setButton(uint8_t button, bool value) {
   button--;
   off_t offset = button % 32;
   auto mask = 1 << offset;
 
-  LONG *data = nullptr;
+  LONG* data = nullptr;
   if (button < 32) {
     data = &p->state.lButtons;
   } else if (button < 64) {
@@ -165,7 +165,7 @@ VJoyDevice *VJoyDevice::setButton(uint8_t button, bool value) {
   return this;
 }
 
-VJoyDevice *VJoyDevice::setHat(uint8_t hat, uint16_t v) {
+VJoyDevice* VJoyDevice::setHat(uint8_t hat, uint16_t v) {
   const DWORD value = v == Hat::CENTER ? DWORD(-1) : v;
   switch (hat) {
     case 1:

render.cpp

@@ -13,10 +13,10 @@
 #include "lib/easymode.h"
 #include "lib/render_axis.h"
 
+using fredemmott::inputmapping::maybe_shared_ptr;
 using fredemmott::inputmapping::render_axis;
 using fredemmott::inputmapping::Sink;
 using fredemmott::inputmapping::Source;
-using fredemmott::inputmapping::maybe_shared_ptr;
 
 int main() {
   render_axis("linear.bmp", [](Axis::Value next) { return next; });