From 985be4cd97bb3bff97b7c4356985b472f46be43c Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Thu, 22 Aug 2013 14:59:31 -0500 Subject: [PATCH 1/2] Supresses compiler warning about unused parameters by replacing a member variable usage with the paramater, the runtime behavior should remain the same --- src/zeroconf/avahi/qxtavahipoll.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zeroconf/avahi/qxtavahipoll.cpp b/src/zeroconf/avahi/qxtavahipoll.cpp index 442b1966..70352955 100644 --- a/src/zeroconf/avahi/qxtavahipoll.cpp +++ b/src/zeroconf/avahi/qxtavahipoll.cpp @@ -169,7 +169,7 @@ void AvahiWatch::setEventType(AvahiWatchEvent event) void AvahiWatch::activated(int fd) { _lastEvent = _event; - _callback(this, _fd, _event, _userdata); + _callback(this, fd, _event, _userdata); _lastEvent = (AvahiWatchEvent)0; } From 97d47c21e5a63a9b27423ad52a25e2f1bb098f19 Mon Sep 17 00:00:00 2001 From: Michael Jones Date: Fri, 23 Aug 2013 11:52:04 -0500 Subject: [PATCH 2/2] Supresses compiler warning about unused parameter using Q_UNUSED macro --- src/zeroconf/avahi/qxtavahipoll.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zeroconf/avahi/qxtavahipoll.cpp b/src/zeroconf/avahi/qxtavahipoll.cpp index 70352955..85caa68a 100644 --- a/src/zeroconf/avahi/qxtavahipoll.cpp +++ b/src/zeroconf/avahi/qxtavahipoll.cpp @@ -168,8 +168,9 @@ void AvahiWatch::setEventType(AvahiWatchEvent event) void AvahiWatch::activated(int fd) { + Q_UNUSED(fd); _lastEvent = _event; - _callback(this, fd, _event, _userdata); + _callback(this, _fd, _event, _userdata); _lastEvent = (AvahiWatchEvent)0; }