diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:43:58 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
commit | 03deed59ba31bd2e5ac1e799e0eb03cd4e8f5e41 (patch) | |
tree | 6379ef4c3ac2bdaa1d6e4e36662511a4026f5753 /src/corelib/kernel/qsocketnotifier.cpp | |
parent | 6fa1bbdce09bbbee2ea50b9360c821e54c81be51 (diff) |
Remove the remaining QT3_SUPPORT code in corelib
Change-Id: I6641c62d75d2034a46ea7cc869ae65285ae8b8f4
Reviewed-on: http://codereview.qt.nokia.com/866
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qsocketnotifier.cpp')
-rw-r--r-- | src/corelib/kernel/qsocketnotifier.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp index d59838ba23..5e99d1d483 100644 --- a/src/corelib/kernel/qsocketnotifier.cpp +++ b/src/corelib/kernel/qsocketnotifier.cpp @@ -185,40 +185,6 @@ QSocketNotifier::QSocketNotifier(int socket, Type type, QObject *parent) } } -#ifdef QT3_SUPPORT -/*! - \obsolete - - Use the QSocketNotifier() constructor combined with the - QObject::setObjectName() function instead. - - \oldcode - QSocketNotifier *notifier = new QSocketNotifier(socket, type, parent, name); - \newcode - QSocketNotifier *notifier = new QSocketNotifier(socket, type, parent); - notifier->setObjectName(name); - \endcode -*/ - -QSocketNotifier::QSocketNotifier(int socket, Type type, QObject *parent, - const char *name) - : QObject(parent) -{ - setObjectName(QString::fromAscii(name)); - if (socket < 0) - qWarning("QSocketNotifier: Invalid socket specified"); - sockfd = socket; - sntype = type; - snenabled = true; - - Q_D(QObject); - if (!d->threadData->eventDispatcher) { - qWarning("QSocketNotifier: Can only be used with threads started with QThread"); - } else { - d->threadData->eventDispatcher->registerSocketNotifier(this); - } -} -#endif /*! Destroys this socket notifier. */ |