git.iko.soy/unity8
on xenial help sign in
Make notifier and notifierFd function local variables

No need for them to be class members if we only use them in init()

commit8ff9181697cb65f39db2081673445a7e8ad9deba authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 17 Jun 2016, 01:15 (10 years ago) parent6caad0aa411cfc
2 files changed+2−4
compare with xenial
unifiedsplit
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−2 plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+2−2
@@ -85,9 +85,9 @@ void QInputDeviceManagerPrivate::init()
8585 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());
8686
8787 udev_monitor_enable_receiving(udevMonitor);
88− notifierFd = udev_monitor_get_fd(udevMonitor);
88+ int notifierFd = udev_monitor_get_fd(udevMonitor);
8989
90− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);
9191 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));
9292
9393 udev_enumerate_scan_devices(enumerate);
plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2
@@ -83,8 +83,6 @@ private:
8383
8484 QInputDevice *addDevice(const QString &path);
8585 void removeDevice(const QString &path);
86− QSocketNotifier *notifier;
87− int notifierFd;
8886 struct udev_monitor *udevMonitor;
8987 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);
9088 struct udev *udevice;