Commit 11ac5183 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use consistently override

parent 51fad4d6
......@@ -31,16 +31,16 @@ class Fake : public KScreen::AbstractBackend
public:
explicit Fake();
virtual ~Fake();
~Fake() override;
void init(const QVariantMap &arguments) Q_DECL_OVERRIDE;
void init(const QVariantMap &arguments) override;
QString name() const Q_DECL_OVERRIDE;
QString serviceName() const Q_DECL_OVERRIDE;
KScreen::ConfigPtr config() const Q_DECL_OVERRIDE;
void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE;
QByteArray edid(int outputId) const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QString name() const override;
QString serviceName() const override;
KScreen::ConfigPtr config() const override;
void setConfig(const KScreen::ConfigPtr &config) override;
QByteArray edid(int outputId) const override;
bool isValid() const override;
void setConnected(int outputId, bool connected);
void setEnabled(int outputId, bool enabled);
......
......@@ -36,14 +36,14 @@ class WaylandBackend : public KScreen::AbstractBackend
public:
explicit WaylandBackend();
virtual ~WaylandBackend() = default;
QString name() const Q_DECL_OVERRIDE;
QString serviceName() const Q_DECL_OVERRIDE;
KScreen::ConfigPtr config() const Q_DECL_OVERRIDE;
void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QByteArray edid(int outputId) const Q_DECL_OVERRIDE;
~WaylandBackend() override = default;
QString name() const override;
QString serviceName() const override;
KScreen::ConfigPtr config() const override;
void setConfig(const KScreen::ConfigPtr &config) override;
bool isValid() const override;
QByteArray edid(int outputId) const override;
void updateConfig(KScreen::ConfigPtr &config);
......
......@@ -66,7 +66,7 @@ class WaylandConfig : public QObject
public:
explicit WaylandConfig(QObject *parent = nullptr);
virtual ~WaylandConfig();
~WaylandConfig() override;
KScreen::ConfigPtr toKScreenConfig();
void updateKScreenConfig(KScreen::ConfigPtr &config) const;
......
......@@ -42,7 +42,7 @@ class WaylandOutput : public QObject
Q_OBJECT
public:
virtual ~WaylandOutput();
~WaylandOutput() override;
KScreen::OutputPtr toKScreenOutput();
void updateKScreenOutput(KScreen::OutputPtr &output);
......
......@@ -37,7 +37,7 @@ class WaylandScreen : public QObject
public:
explicit WaylandScreen(WaylandConfig *config);
virtual ~WaylandScreen();
~WaylandScreen() override;
KScreen::ScreenPtr toKScreenScreen(KScreen::ConfigPtr &parent) const;
void updateKScreenScreen(KScreen::ScreenPtr &screen) const;
......
......@@ -37,13 +37,13 @@ class QScreenBackend : public KScreen::AbstractBackend
public:
explicit QScreenBackend();
virtual ~QScreenBackend();
~QScreenBackend() override;
QString name() const Q_DECL_OVERRIDE;
QString serviceName() const Q_DECL_OVERRIDE;
KScreen::ConfigPtr config() const Q_DECL_OVERRIDE;
void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QString name() const override;
QString serviceName() const override;
KScreen::ConfigPtr config() const override;
void setConfig(const KScreen::ConfigPtr &config) override;
bool isValid() const override;
private:
bool m_isValid;
......
......@@ -35,7 +35,7 @@ class QScreenConfig : public QObject
public:
explicit QScreenConfig(QObject *parent = nullptr);
virtual ~QScreenConfig();
~QScreenConfig() override;
KScreen::ConfigPtr toKScreenConfig() const;
void updateKScreenConfig(KScreen::ConfigPtr &config) const;
......
......@@ -37,7 +37,7 @@ class QScreenOutput : public QObject
public:
explicit QScreenOutput(const QScreen *qscreen, QObject *parent = nullptr);
virtual ~QScreenOutput();
~QScreenOutput() override;
KScreen::OutputPtr toKScreenOutput() const;
void updateKScreenOutput(KScreen::OutputPtr &output) const;
......
......@@ -37,7 +37,7 @@ class QScreenScreen : public QObject
public:
explicit QScreenScreen(QScreenConfig *config);
virtual ~QScreenScreen();
~QScreenScreen() override;
KScreen::ScreenPtr toKScreenScreen() const;
void updateKScreenScreen(KScreen::ScreenPtr &screen) const;
......
......@@ -33,9 +33,9 @@ class XCBEventListener : public QObject,
public:
XCBEventListener();
~XCBEventListener();
~XCBEventListener() override;
bool nativeEventFilter(const QByteArray& eventType, void* message, long int* result) Q_DECL_OVERRIDE;
bool nativeEventFilter(const QByteArray& eventType, void* message, long int* result) override;
Q_SIGNALS:
/* Emitted when only XRandR 1.1 or older is available */
......
......@@ -43,14 +43,14 @@ class XRandR : public KScreen::AbstractBackend
public:
explicit XRandR();
virtual ~XRandR();
QString name() const Q_DECL_OVERRIDE;
QString serviceName() const Q_DECL_OVERRIDE;
KScreen::ConfigPtr config() const Q_DECL_OVERRIDE;
void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QByteArray edid(int outputId) const Q_DECL_OVERRIDE;
~XRandR() override;
QString name() const override;
QString serviceName() const override;
KScreen::ConfigPtr config() const override;
void setConfig(const KScreen::ConfigPtr &config) override;
bool isValid() const override;
QByteArray edid(int outputId) const override;
static quint8 *outputEdid(xcb_randr_output_t outputId, size_t &len);
static xcb_randr_get_screen_resources_reply_t* screenResources();
......
......@@ -36,7 +36,7 @@ class XRandRConfig : public QObject
public:
explicit XRandRConfig();
virtual ~XRandRConfig();
~XRandRConfig() override;
XRandROutput::Map outputs() const;
XRandROutput *output(xcb_randr_output_t output) const;
......
......@@ -42,7 +42,7 @@ public:
typedef QMap<xcb_randr_mode_t, XRandRMode*> Map;
explicit XRandRMode(const xcb_randr_mode_info_t &modeInfo, XRandROutput *output);
virtual ~XRandRMode();
~XRandRMode() override;
KScreen::ModePtr toKScreenMode();
......
......@@ -44,7 +44,7 @@ public:
typedef QMap<xcb_randr_output_t, XRandROutput*> Map;
explicit XRandROutput(xcb_randr_output_t id, XRandRConfig *config);
virtual ~XRandROutput();
~XRandROutput() override;
void disabled();
void disconnected();
......
......@@ -37,7 +37,7 @@ class XRandRScreen : public QObject
public:
explicit XRandRScreen(XRandRConfig *config = nullptr);
virtual ~XRandRScreen();
~XRandRScreen() override;
KScreen::ScreenPtr toKScreenScreen() const;
void updateKScreenScreen(KScreen::ScreenPtr &screen) const;
......
......@@ -34,13 +34,13 @@ class XRandR11 : public KScreen::AbstractBackend
public:
explicit XRandR11();
virtual ~XRandR11();
~XRandR11() override;
QString name() const Q_DECL_OVERRIDE;
QString serviceName() const Q_DECL_OVERRIDE;
KScreen::ConfigPtr config() const Q_DECL_OVERRIDE;
void setConfig(const KScreen::ConfigPtr &config) Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
QString name() const override;
QString serviceName() const override;
KScreen::ConfigPtr config() const override;
void setConfig(const KScreen::ConfigPtr &config) override;
bool isValid() const override;
private Q_SLOTS:
void updateConfig();
......
......@@ -38,7 +38,7 @@ class KSCREEN_EXPORT AbstractBackend : public QObject
Q_OBJECT
public:
virtual ~AbstractBackend() {}
~AbstractBackend() override {}
/**
* This is where the backend should perform all initialization. This method
......
......@@ -37,7 +37,7 @@ class BackendDBusWrapper : public QObject
public:
explicit BackendDBusWrapper(KScreen::AbstractBackend *backend);
virtual ~BackendDBusWrapper();
~BackendDBusWrapper() override;
bool init();
......
......@@ -39,7 +39,7 @@ class BackendLoader : public QObject
public:
explicit BackendLoader();
~BackendLoader();
~BackendLoader() override;
bool init();
......
......@@ -56,7 +56,7 @@ public:
};
static BackendManager *instance();
~BackendManager();
~BackendManager() override;
KScreen::ConfigPtr config() const;
void setConfig(KScreen::ConfigPtr c);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment