diff options
Diffstat (limited to 'src/widgets/kernel/qwhatsthis.cpp')
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index c32645dfc4..4c988e4af3 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -10,7 +10,6 @@ #include "qpixmap.h" #include "qscreen.h" #include "qpainter.h" -#include "qtimer.h" #if QT_CONFIG(action) #include "qaction.h" #endif // QT_CONFIG(action) @@ -97,8 +96,6 @@ QT_BEGIN_NAMESPACE \sa QToolTip */ -Q_CORE_EXPORT void qDeleteInEventHandler(QObject *o); - class QWhatsThat : public QWidget { Q_OBJECT @@ -464,7 +461,7 @@ QWhatsThisAction::QWhatsThisAction(QObject *parent) : QAction(tr("What's This?") setIcon(p); #endif setCheckable(true); - connect(this, SIGNAL(triggered()), this, SLOT(actionTriggered())); + connect(this, &QWhatsThisAction::triggered, this, &QWhatsThisAction::actionTriggered); #ifndef QT_NO_SHORTCUT setShortcut(Qt::ShiftModifier | Qt::Key_F1); #endif @@ -610,7 +607,7 @@ void QWhatsThis::showText(const QPoint &pos, const QString &text, QWidget *w) */ void QWhatsThis::hideText() { - qDeleteInEventHandler(QWhatsThat::instance); + delete QWhatsThat::instance; } /*! |