1
0
Fork 0

C++11 improvements in Mac event-input code

This commit is contained in:
James Turner 2018-08-19 12:34:47 +01:00
parent 09918a6862
commit 8b72229ffd

View file

@ -94,10 +94,10 @@ static std::string nameForUsage(uint32_t usagePage, uint32_t usage)
class FGMacOSXEventInputPrivate class FGMacOSXEventInputPrivate
{ {
public: public:
IOHIDManagerRef hidManager; IOHIDManagerRef hidManager = nullptr;
FGMacOSXEventInput* p; FGMacOSXEventInput* p = nullptr;
double currentDt; double currentDt = 0.0;
int currentModifiers; int currentModifiers = 0;
void matchedDevice(IOHIDDeviceRef device); void matchedDevice(IOHIDDeviceRef device);
void removedDevice(IOHIDDeviceRef device); void removedDevice(IOHIDDeviceRef device);
@ -170,8 +170,8 @@ private:
std::string nameForHIDElement(IOHIDElementRef element) const; std::string nameForHIDElement(IOHIDElementRef element) const;
IOHIDDeviceRef _hid; IOHIDDeviceRef _hid = nullptr;
IOHIDQueueRef _queue; IOHIDQueueRef _queue = nullptr;
FGMacOSXEventInputPrivate* _subsystem; FGMacOSXEventInputPrivate* _subsystem;
typedef std::map<std::string, IOHIDElementRef> NameElementDict; typedef std::map<std::string, IOHIDElementRef> NameElementDict;