projects
/
profile
/
ivi
/
qtbase.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the remaining QT3_SUPPORT code in corelib
[profile/ivi/qtbase.git]
/
src
/
corelib
/
kernel
/
qtimer.h
diff --git
a/src/corelib/kernel/qtimer.h
b/src/corelib/kernel/qtimer.h
index
02f6ba4
..
707bc83
100644
(file)
--- a/
src/corelib/kernel/qtimer.h
+++ b/
src/corelib/kernel/qtimer.h
@@
-61,9
+61,6
@@
class Q_CORE_EXPORT QTimer : public QObject
Q_PROPERTY(bool active READ isActive)
public:
explicit QTimer(QObject *parent = 0);
Q_PROPERTY(bool active READ isActive)
public:
explicit QTimer(QObject *parent = 0);
-#ifdef QT3_SUPPORT
- QT3_SUPPORT_CONSTRUCTOR QTimer(QObject *parent, const char *name);
-#endif
~QTimer();
inline bool isActive() const { return id >= 0; }
~QTimer();
inline bool isActive() const { return id >= 0; }
@@
-83,11
+80,6
@@
public Q_SLOTS:
void start();
void stop();
void start();
void stop();
-#ifdef QT3_SUPPORT
- inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); }
- QT_MOC_COMPAT int start(int msec, bool sshot);
-#endif
-
Q_SIGNALS:
void timeout();
Q_SIGNALS:
void timeout();