a411cfc · unity8 · git.iko.soy

git.iko.soy/unity8

Make notifier and notifierFd function local variables

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

commita411cfc657cc41cf7d29316da0e117234eac96e0 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 26 May 2016, 11:07 (10 years ago) parent64d3f31

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

@@ -83,9 +83,9 @@ void QInputDeviceManagerPrivate::init()

8383 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());

8484

8585 udev_monitor_enable_receiving(udevMonitor);

86− notifierFd = udev_monitor_get_fd(udevMonitor);

86+ int notifierFd = udev_monitor_get_fd(udevMonitor);

8787

88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

88+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

8989 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));

9090

9191 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;