Fix some lint errors (mostly whitespace)

OpenLightingProject · Apr 22, 2019 · 4e88ff6 · 4e88ff6
1 parent c508e96
commit 4e88ff6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/plugins/usbdmx/EuroliteProFactory.cpp b/plugins/usbdmx/EuroliteProFactory.cpp
@@ -44,18 +44,17 @@ const char EuroliteProFactory::EXPECTED_PRODUCT_MK2[] = "FT232R USB UART";
 const uint16_t EuroliteProFactory::PRODUCT_ID_MK2 = 0x6001;
 const uint16_t EuroliteProFactory::VENDOR_ID_MK2 = 0x0403;
 
-const char EuroliteProFactory::ENABLE_EUROLITE_MK2_KEY[] = "enable_eurolite_mk2";
+const char EuroliteProFactory::ENABLE_EUROLITE_MK2_KEY[] =
+  "enable_eurolite_mk2";
 
 EuroliteProFactory::EuroliteProFactory(ola::usb::LibUsbAdaptor *adaptor,
                                        Preferences *preferences)
   : BaseWidgetFactory<class EurolitePro>("EuroliteProFactory"),
     m_adaptor(adaptor),
-    m_enable_eurolite_mk2(IsEuroliteMk2Enabled(preferences))
-{
+    m_enable_eurolite_mk2(IsEuroliteMk2Enabled(preferences)) {
 }
 
-bool EuroliteProFactory::IsEuroliteMk2Enabled(Preferences *preferences)
-{
+bool EuroliteProFactory::IsEuroliteMk2Enabled(Preferences *preferences) {
   bool enabled;
   if (!StringToBool(preferences->GetValue(ENABLE_EUROLITE_MK2_KEY),
                     &enabled)) {

diff --git a/plugins/usbdmx/EuroliteProFactory.h b/plugins/usbdmx/EuroliteProFactory.h
@@ -44,7 +44,7 @@ class EuroliteProFactory : public BaseWidgetFactory<class EurolitePro> {
                    const struct libusb_device_descriptor &descriptor);
 
   static bool IsEuroliteMk2Enabled(Preferences *preferences);
-   
+
  private:
   ola::usb::LibUsbAdaptor *m_adaptor;
   bool m_enable_eurolite_mk2;
@@ -60,7 +60,7 @@ class EuroliteProFactory : public BaseWidgetFactory<class EurolitePro> {
   static const char EXPECTED_PRODUCT_MK2[];
 
   static const char ENABLE_EUROLITE_MK2_KEY[];
-	
+
   DISALLOW_COPY_AND_ASSIGN(EuroliteProFactory);
 };
 }  // namespace usbdmx

diff --git a/plugins/usbdmx/UsbDmxPlugin.cpp b/plugins/usbdmx/UsbDmxPlugin.cpp
@@ -109,13 +109,12 @@ bool UsbDmxPlugin::SetDefaultPreferences() {
   return true;
 }
 
-void UsbDmxPlugin::ConflictsWith(std::set<ola_plugin_id>* conflicting_plugins) const
-{
-  if(EuroliteProFactory::IsEuroliteMk2Enabled(m_preferences))
-  {
+void UsbDmxPlugin::ConflictsWith(
+  std::set<ola_plugin_id>* conflicting_plugins) const {
+  if( EuroliteProFactory::IsEuroliteMk2Enabled(m_preferences)) {
     conflicting_plugins->insert(OLA_PLUGIN_USBPRO);
     conflicting_plugins->insert(OLA_PLUGIN_FTDIDMX);
-  } 
+  }
 }
 
 }  // namespace usbdmx

diff --git a/plugins/usbdmx/UsbDmxPlugin.h b/plugins/usbdmx/UsbDmxPlugin.h
@@ -22,6 +22,7 @@
 #define PLUGINS_USBDMX_USBDMXPLUGIN_H_
 
 #include <memory>
+#include <set>
 #include <string>
 #include "ola/base/Macro.h"
 #include "ola/plugin_id.h"
@@ -60,8 +61,9 @@ class UsbDmxPlugin: public ola::Plugin {
   ola_plugin_id Id() const { return OLA_PLUGIN_USBDMX; }
   std::string PluginPrefix() const { return PLUGIN_PREFIX; }
 
-  virtual void ConflictsWith(std::set<ola_plugin_id>* conflicting_plugins) const override;
-
+  void ConflictsWith(
+    std::set<ola_plugin_id>* conflicting_plugins) const override;
+
  private:
   std::auto_ptr<class PluginImplInterface> m_impl;