summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-10-02 10:44:27 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-10-02 10:44:27 +0200
commitfa12408b959a856c53d9aeadede060530e1ccbd3 (patch)
treebf72dcd538a435d98e6b0573ddd464958e9cba7a
parent68d33b0c99cfac8f89c2224d457e1568232896f7 (diff)
nix warnings on osx clang build
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.h14
-rw-r--r--qfunctionconfigurator/qfunctionconfigurator.h8
2 files changed, 11 insertions, 11 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
index 72897f1f..2aeb4608 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
@@ -18,9 +18,9 @@ public:
FTNoIR_Protocol();
~FTNoIR_Protocol() override;
- bool correct();
- void pose(const double* headpose);
- QString game_name() {
+ bool correct() override;
+ void pose(const double* headpose) override;
+ QString game_name() override {
QMutexLocker foo(&game_name_mutex);
return connected_game;
}
@@ -38,8 +38,8 @@ class FTControls: public IProtocolDialog
Q_OBJECT
public:
FTControls();
- void register_protocol(IProtocol *) {}
- void unregister_protocol() {}
+ void register_protocol(IProtocol *) override {}
+ void unregister_protocol() override {}
private:
Ui::UICFTControls ui;
@@ -52,6 +52,6 @@ private slots:
class FTNoIR_ProtocolDll : public Metadata
{
public:
- QString name() { return QString("Wine -- Windows layer for Unix"); }
- QIcon icon() { return QIcon(":/images/wine.png"); }
+ QString name() override { return QString("Wine -- Windows layer for Unix"); }
+ QIcon icon() override { return QIcon(":/images/wine.png"); }
};
diff --git a/qfunctionconfigurator/qfunctionconfigurator.h b/qfunctionconfigurator/qfunctionconfigurator.h
index fab452a7..8957c898 100644
--- a/qfunctionconfigurator/qfunctionconfigurator.h
+++ b/qfunctionconfigurator/qfunctionconfigurator.h
@@ -40,10 +40,10 @@ public:
update();
}
protected slots:
- void paintEvent(QPaintEvent *e);
- void mousePressEvent(QMouseEvent *e);
- void mouseMoveEvent(QMouseEvent *e);
- void mouseReleaseEvent(QMouseEvent *e);
+ void paintEvent(QPaintEvent *e) override;
+ void mousePressEvent(QMouseEvent *e) override;
+ void mouseMoveEvent(QMouseEvent *e) override;
+ void mouseReleaseEvent(QMouseEvent *e) override;
private:
void drawBackground();
void drawFunction();