Merge pull request #284 from damageboy/master

Resolve majority of clang+libstdc++ warnings
master
pixl 2 years ago committed by GitHub
commit 8e87b73d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      .editorconfig
  2. 2
      src/logid/actions/Action.h
  3. 4
      src/logid/actions/gesture/Gesture.h
  4. 2
      src/logid/backend/dj/Receiver.h
  5. 2
      src/logid/backend/dj/ReceiverMonitor.h
  6. 1
      src/logid/backend/hidpp20/Feature.h
  7. 8
      src/logid/backend/hidpp20/features/ReprogControls.h
  8. 2
      src/logid/backend/raw/DeviceMonitor.h
  9. 1
      src/logid/features/DeviceFeature.h

@ -0,0 +1,25 @@
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*.{h,cpp}]
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
# Matches multiple files with brace expansion notation
# Set default charset
[*.json]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
# 4 space indentation
[CMakeLists.txt]
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true

@ -63,6 +63,8 @@ namespace actions {
virtual uint8_t reprogFlags() const = 0; virtual uint8_t reprogFlags() const = 0;
virtual ~Action() = default;
class Config class Config
{ {
protected: protected:

@ -31,7 +31,7 @@ namespace actions
explicit InvalidGesture(std::string what="") : _what (what) explicit InvalidGesture(std::string what="") : _what (what)
{ {
} }
virtual const char* what() virtual const char* what() const noexcept
{ {
return _what.c_str(); return _what.c_str();
} }
@ -49,6 +49,8 @@ namespace actions
virtual bool wheelCompatibility() const = 0; virtual bool wheelCompatibility() const = 0;
virtual bool metThreshold() const = 0; virtual bool metThreshold() const = 0;
virtual ~Gesture() = default;
class Config class Config
{ {
public: public:

@ -49,7 +49,7 @@ namespace dj
Reason _reason; Reason _reason;
}; };
class Receiver class Receiver final
{ {
public: public:
explicit Receiver(std::string path); explicit Receiver(std::string path);

@ -33,7 +33,7 @@ namespace dj
{ {
public: public:
explicit ReceiverMonitor(std::string path); explicit ReceiverMonitor(std::string path);
~ReceiverMonitor(); virtual ~ReceiverMonitor();
void enumerate(); void enumerate();
void run(); void run();

@ -41,6 +41,7 @@ namespace hidpp20 {
static const uint16_t ID; static const uint16_t ID;
virtual uint16_t getID() = 0; virtual uint16_t getID() = 0;
uint8_t featureIndex(); uint8_t featureIndex();
virtual ~Feature() = default;
protected: protected:
explicit Feature(Device* dev, uint16_t _id); explicit Feature(Device* dev, uint16_t _id);
std::vector<uint8_t> callFunction(uint8_t function_id, std::vector<uint8_t> callFunction(uint8_t function_id,

@ -122,7 +122,7 @@ namespace hidpp20
{ {
public: public:
static const uint16_t ID = FeatureID::REPROG_CONTROLS_V2; static const uint16_t ID = FeatureID::REPROG_CONTROLS_V2;
virtual uint16_t getID() { return ID; } virtual uint16_t getID() override { return ID; }
explicit ReprogControlsV2(Device* dev); explicit ReprogControlsV2(Device* dev);
protected: protected:
@ -133,7 +133,7 @@ namespace hidpp20
{ {
public: public:
static const uint16_t ID = FeatureID::REPROG_CONTROLS_V2_2; static const uint16_t ID = FeatureID::REPROG_CONTROLS_V2_2;
virtual uint16_t getID() { return ID; } virtual uint16_t getID() override { return ID; }
explicit ReprogControlsV2_2(Device* dev); explicit ReprogControlsV2_2(Device* dev);
protected: protected:
@ -144,7 +144,7 @@ namespace hidpp20
{ {
public: public:
static const uint16_t ID = FeatureID::REPROG_CONTROLS_V3; static const uint16_t ID = FeatureID::REPROG_CONTROLS_V3;
virtual uint16_t getID() { return ID; } virtual uint16_t getID() override { return ID; }
explicit ReprogControlsV3(Device* dev); explicit ReprogControlsV3(Device* dev);
protected: protected:
@ -155,7 +155,7 @@ namespace hidpp20
{ {
public: public:
static const uint16_t ID = FeatureID::REPROG_CONTROLS_V4; static const uint16_t ID = FeatureID::REPROG_CONTROLS_V4;
virtual uint16_t getID() { return ID; } virtual uint16_t getID() override { return ID; }
bool supportsRawXY() override { return true; } bool supportsRawXY() override { return true; }

@ -40,7 +40,7 @@ namespace raw
void stop(); void stop();
protected: protected:
DeviceMonitor(); DeviceMonitor();
~DeviceMonitor(); virtual ~DeviceMonitor();
virtual void addDevice(std::string device) = 0; virtual void addDevice(std::string device) = 0;
virtual void removeDevice(std::string device) = 0; virtual void removeDevice(std::string device) = 0;
private: private:

@ -43,6 +43,7 @@ namespace features
} }
virtual void configure() = 0; virtual void configure() = 0;
virtual void listen() = 0; virtual void listen() = 0;
virtual ~DeviceFeature() = default;
class Config class Config
{ {
public: public:

Loading…
Cancel
Save