diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-05-29 17:32:27 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 15:19:19 +0200 |
| commit | 5e9aebf0fcc81cc68ccb3cc2290777d72c5373df (patch) | |
| tree | 64d7893b4eab7fb925eb7a9835f15b4feddcfe92 /src/corelib | |
| parent | 6ddd8f6bd9beec1e408ed5dff5d8cb988f0fbd40 (diff) | |
Socket FD are now of type qintptr.
This should've been done together with the bulk of other changes in:
bdce61002255b5f8b3213e93175cefdfebfde2cc and
bf7f17060773803f332e8c729a70f47b94243890
Task-number: QTBUG-19004
Change-Id: I6d95a29140c1de5e6800812add9d7882511b909a
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qsocketnotifier.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qsocketnotifier.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp index 22ede139e2..c108b967e2 100644 --- a/src/corelib/kernel/qsocketnotifier.cpp +++ b/src/corelib/kernel/qsocketnotifier.cpp @@ -221,7 +221,7 @@ QSocketNotifier::~QSocketNotifier() \sa type() */ -int QSocketNotifier::socket() const +qintptr QSocketNotifier::socket() const { Q_D(const QSocketNotifier); return d->sockfd; diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index 65b7926769..24632609f5 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -60,7 +60,7 @@ public: QSocketNotifier(qintptr socket, Type, QObject *parent = 0); ~QSocketNotifier(); - int socket() const; + qintptr socket() const; Type type() const; bool isEnabled() const; |