summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qtimer.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-06-28 23:43:58 +0200
committerQt by Nokia <qt-info@nokia.com>2011-06-29 15:10:14 +0200
commit03deed59ba31bd2e5ac1e799e0eb03cd4e8f5e41 (patch)
tree6379ef4c3ac2bdaa1d6e4e36662511a4026f5753 /src/corelib/kernel/qtimer.cpp
parent6fa1bbdce09bbbee2ea50b9360c821e54c81be51 (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/qtimer.cpp')
-rw-r--r--src/corelib/kernel/qtimer.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 0edcb3b3ac..5870885c63 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -147,18 +147,6 @@ QTimer::QTimer(QObject *parent)
}
-#ifdef QT3_SUPPORT
-/*!
- Constructs a timer called \a name, with a \a parent.
-*/
-
-QTimer::QTimer(QObject *parent, const char *name)
- : QObject(parent), id(INV_TIMER), single(0), nulltimer(0)
-{
- setObjectName(QString::fromAscii(name));
-}
-#endif
-
/*!
Destroys the timer.
*/
@@ -235,24 +223,6 @@ void QTimer::start(int msec)
}
-#ifdef QT3_SUPPORT
-/*! \overload start()
-
- Call setSingleShot(\a sshot) and start(\a msec) instead.
-*/
-
-int QTimer::start(int msec, bool sshot)
-{
- if (id >=0 && nulltimer && !msec && sshot)
- return id;
- stop();
- setInterval(msec);
- setSingleShot(sshot);
- start();
- return timerId();
-}
-#endif
-
/*!
Stops the timer.