QEventDispatcherGlib: fix some narrowing conversion warnings
"notifier->socket()" returns qint64, but sockfd should be int, because pollfd.fd is a gint (aka int). Change-Id: If6618aa5e652d4284b989352d61a28b605106d09 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
39c191d003
commit
d8a688adf0
@ -405,7 +405,7 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
|
|||||||
void QEventDispatcherGlib::registerSocketNotifier(QSocketNotifier *notifier)
|
void QEventDispatcherGlib::registerSocketNotifier(QSocketNotifier *notifier)
|
||||||
{
|
{
|
||||||
Q_ASSERT(notifier);
|
Q_ASSERT(notifier);
|
||||||
int sockfd = notifier->socket();
|
int sockfd = int(notifier->socket());
|
||||||
int type = notifier->type();
|
int type = notifier->type();
|
||||||
#ifndef QT_NO_DEBUG
|
#ifndef QT_NO_DEBUG
|
||||||
if (sockfd < 0) {
|
if (sockfd < 0) {
|
||||||
@ -445,8 +445,7 @@ void QEventDispatcherGlib::unregisterSocketNotifier(QSocketNotifier *notifier)
|
|||||||
{
|
{
|
||||||
Q_ASSERT(notifier);
|
Q_ASSERT(notifier);
|
||||||
#ifndef QT_NO_DEBUG
|
#ifndef QT_NO_DEBUG
|
||||||
int sockfd = notifier->socket();
|
if (notifier->socket() < 0) {
|
||||||
if (sockfd < 0) {
|
|
||||||
qWarning("QSocketNotifier: Internal error");
|
qWarning("QSocketNotifier: Internal error");
|
||||||
return;
|
return;
|
||||||
} else if (notifier->thread() != thread()
|
} else if (notifier->thread() != thread()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user