git.iko.soy/unity8
on xenial help sign in
Make notifier and notifierFd function local variables
a411cfcAlbert Astals Cid
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−2
compare with xenial
unifiedsplit
@@ -83,9 +83,9 @@ void QInputDeviceManagerPrivate::init()
83 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
83 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
84
84
85 udev_monitor_enable_receiving(udevMonitor);
85 udev_monitor_enable_receiving(udevMonitor);
86− notifierFd = udev_monitor_get_fd(udevMonitor);
86+ int notifierFd = udev_monitor_get_fd(udevMonitor);
87
87
88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
88+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
89 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
89 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
90
90
91 udev_enumerate_scan_devices(enumerate);
91 udev_enumerate_scan_devices(enumerate);
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2
@@ -83,8 +83,6 @@ private:
83
83
84 QInputDevice *addDevice(const QString &path);
84 QInputDevice *addDevice(const QString &path);
85 void removeDevice(const QString &path);
85 void removeDevice(const QString &path);
86− QSocketNotifier *notifier;
87− int notifierFd;
88 struct udev_monitor *udevMonitor;
86 struct udev_monitor *udevMonitor;
89 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
87 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
90 struct udev *udevice;
88 struct udev *udevice;