diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-25 09:53:52 +0100 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-12-25 09:53:52 +0100 | 
| commit | bab093ebbe392927a92ef201fe60344d5c1191dd (patch) | |
| tree | 7f062abab2f17f614a3a81e2836a15e90cef3496 /proto-ft | |
| parent | 323dd162f5326b998e1c92ab4cfec8a63574023f (diff) | |
compat/shm, proto/wine: remove duplication
The X-Plane plugin is next and should build on win32 then.
Diffstat (limited to 'proto-ft')
| -rw-r--r-- | proto-ft/ftnoir_protocol_ft.h | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h index 0056721c..a01ff722 100644 --- a/proto-ft/ftnoir_protocol_ft.h +++ b/proto-ft/ftnoir_protocol_ft.h @@ -19,7 +19,7 @@  #include <cinttypes>  #include "freetrackclient/fttypes.h" -#include "compat/shm.h" +#include "compat/shm.hpp"  #include "options/options.hpp"  #include <memory> @@ -46,7 +46,7 @@ public:      QString game_name() override;  private:      settings s; -    shm_wrapper shm { FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap) }; +    mem shm { FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap) };      FTHeap* pMemData { (FTHeap*) shm.ptr() };      QProcess dummyTrackIR; @@ -66,8 +66,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;      settings s;  | 
