diff --git a/src/kded/x11eventnotifier.h b/src/kded/x11eventnotifier.h index e98f425..ec01a7e 100644 --- a/src/kded/x11eventnotifier.h +++ b/src/kded/x11eventnotifier.h @@ -1,89 +1,89 @@ /* * This file is part of the KDE wacomtablet project. For copyright * information and license terms see the AUTHORS and COPYING files * in the top-level directory of this distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #ifndef X11EVENTNOTIFIER_H #define X11EVENTNOTIFIER_H #include "eventnotifier.h" #include #include namespace Wacom { class X11EventNotifierPrivate; /** * @brief Singleton that listens to X11 events, mainly tablet plug/unplug events */ class X11EventNotifier : public EventNotifier, public QAbstractNativeEventFilter { Q_OBJECT public: ~X11EventNotifier() override; /** * Returns an instance of this class. */ static X11EventNotifier& instance(); /** * @see EventNotifier::start() */ - void start() final; + void start() final override; /** * @see EventNotifier::stop() */ - void stop() final; + void stop() final override; protected: /** * Called by Qt when a new X11 event is detected. */ bool nativeEventFilter(const QByteArray& eventType, void* message, long int* result) Q_DECL_OVERRIDE; private: X11EventNotifier(); explicit X11EventNotifier(const X11EventNotifier& notifier) = delete; X11EventNotifier& operator= (const X11EventNotifier& notifier) = delete; /** * Handles X11 input events which signal adding or removal of a device. * This method should not be called directly, but only by our X11 event * handler method. */ void handleX11InputEvent(xcb_ge_generic_event_t* event); /** * Register the eventhandler with the X11 system */ int registerForNewDeviceEvent(xcb_connection_t* display); Q_DECLARE_PRIVATE( X11EventNotifier ) X11EventNotifierPrivate *const d_ptr; }; // CLASS } // NAMESPACE #endif // HEADER PROTECTION diff --git a/src/tabletfinder/hwbuttondialog.h b/src/tabletfinder/hwbuttondialog.h index 8e98f6a..d02a438 100644 --- a/src/tabletfinder/hwbuttondialog.h +++ b/src/tabletfinder/hwbuttondialog.h @@ -1,68 +1,68 @@ /* * This file is part of the KDE wacomtablet project. For copyright * information and license terms see the AUTHORS and COPYING files * in the top-level directory of this distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ #ifndef HWBUTTONDIALOG_H #define HWBUTTONDIALOG_H #include namespace Ui { class HWButtonDialog; } namespace Wacom { /** * @brief Dialog that allows the user to press the buttons on the tablet for correct mapping * * The Tablet buttons 1-x are not directly mapped to the X11 buttons 1-x. * Button 4-7 are used for wheel events for example. * * Also button 1 is not always Button 1 but sometimes 9 and so on * This dialog lets the user press the logical tablet buttons and captures the X11 events * for the real X11 button connected to it. * */ class HWButtonDialog : public QDialog { Q_OBJECT public: explicit HWButtonDialog(int maxButtons, QWidget *parent = nullptr); ~HWButtonDialog() override; QList buttonMap() const; protected: - void mousePressEvent(QMouseEvent *event) final; + void mousePressEvent(QMouseEvent *event) final override; private: void hwKey(unsigned int button); void nextButton(); Ui::HWButtonDialog *ui = nullptr; int m_maxButtons; int m_nextButton; QList m_buttonMap; }; } #endif // HWBUTTONDIALOG_H