diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-14 22:45:10 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2018-06-18 12:27:00 +0000 |
| commit | 7654fc11a6442e6ee2a463d6dee6458c0f53768f (patch) | |
| tree | 7eb16a57b879747842bb0401dfee7fb47cd16f95 /src/device-manager.cpp | |
| parent | Fix build issue caused by f09962028d017896279b717a6621a4de772d1b4f on GTK+ <3... (diff) | |
| download | inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.tar.gz inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.zip | |
Run clang-tidy’s modernize-use-override pass.
This adds the override specifier on all methods which override a virtual
method, whether they were already virtual or missing this specifier.
Diffstat (limited to 'src/device-manager.cpp')
| -rw-r--r-- | src/device-manager.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 185d417fb..df6567a30 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -168,20 +168,20 @@ InputDevice::~InputDevice() {} class InputDeviceImpl : public InputDevice { public: InputDeviceImpl(Glib::RefPtr<Gdk::Device> device, std::set<Glib::ustring> &knownIDs); - virtual ~InputDeviceImpl() {} - - virtual Glib::ustring getId() const {return id;} - virtual Glib::ustring getName() const {return name;} - virtual Gdk::InputSource getSource() const {return source;} - virtual Gdk::InputMode getMode() const {return (device->get_mode());} - virtual gint getNumAxes() const {return device->get_n_axes();} - virtual bool hasCursor() const {return device->get_has_cursor();} - virtual int getNumKeys() const {return device->get_n_keys();} - virtual Glib::ustring getLink() const {return link;} + ~InputDeviceImpl() override {} + + Glib::ustring getId() const override {return id;} + Glib::ustring getName() const override {return name;} + Gdk::InputSource getSource() const override {return source;} + Gdk::InputMode getMode() const override {return (device->get_mode());} + gint getNumAxes() const override {return device->get_n_axes();} + bool hasCursor() const override {return device->get_has_cursor();} + int getNumKeys() const override {return device->get_n_keys();} + Glib::ustring getLink() const override {return link;} virtual void setLink( Glib::ustring const& link ) {this->link = link;} - virtual gint getLiveAxes() const {return liveAxes;} + gint getLiveAxes() const override {return liveAxes;} virtual void setLiveAxes(gint axes) {liveAxes = axes;} - virtual gint getLiveButtons() const {return liveButtons;} + gint getLiveButtons() const override {return liveButtons;} virtual void setLiveButtons(gint buttons) {liveButtons = buttons;} // internal methods not on public superclass: @@ -287,23 +287,23 @@ class DeviceManagerImpl : public DeviceManager { public: DeviceManagerImpl(); - virtual void loadConfig(); - virtual void saveConfig(); + void loadConfig() override; + void saveConfig() override; - virtual std::list<Glib::RefPtr<InputDevice const> > getDevices(); + std::list<Glib::RefPtr<InputDevice const> > getDevices() override; - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalDeviceChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalAxesChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalButtonsChanged(); - virtual sigc::signal<void, Glib::RefPtr<InputDevice const> > signalLinkChanged(); + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalDeviceChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalAxesChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalButtonsChanged() override; + sigc::signal<void, Glib::RefPtr<InputDevice const> > signalLinkChanged() override; - virtual void addAxis(Glib::ustring const & id, gint axis); - virtual void addButton(Glib::ustring const & id, gint button); - virtual void setLinkedTo(Glib::ustring const & id, Glib::ustring const& link); + void addAxis(Glib::ustring const & id, gint axis) override; + void addButton(Glib::ustring const & id, gint button) override; + void setLinkedTo(Glib::ustring const & id, Glib::ustring const& link) override; - virtual void setMode( Glib::ustring const & id, Gdk::InputMode mode ); - virtual void setAxisUse( Glib::ustring const & id, guint index, Gdk::AxisUse use ); - virtual void setKey( Glib::ustring const & id, guint index, guint keyval, Gdk::ModifierType mods ); + void setMode( Glib::ustring const & id, Gdk::InputMode mode ) override; + void setAxisUse( Glib::ustring const & id, guint index, Gdk::AxisUse use ) override; + void setKey( Glib::ustring const & id, guint index, guint keyval, Gdk::ModifierType mods ) override; protected: std::list<Glib::RefPtr<InputDeviceImpl> > devices; |
