From 56850d6cd7b9c3480b0efdf77a835429d034ac8b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 19 Apr 2012 09:51:18 +0300 Subject: [PATCH] Remove internal QClipboardEvent MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This class is not in use with QPA. Also remove useless sending of QEvent::Clipboard from the QGuiApplication dtor. That event is not (cannot be) handled by the platform plugins and is not used at all. Perhaps it should be removed altogether from the public API. Change-Id: I478b31ff9875a8dfff99bddafd335ab02a5fe477 Reviewed-by: Samuel Rødal --- src/gui/kernel/qevent.cpp | 25 ------------------------- src/gui/kernel/qevent.h | 11 ----------- src/gui/kernel/qguiapplication.cpp | 7 ------- 3 files changed, 43 deletions(-) diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 505e89b..52f040e 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -3214,31 +3214,6 @@ QDebug operator<<(QDebug dbg, const QEvent *e) { } #endif -#ifndef QT_NO_CLIPBOARD -/*! - \class QClipboardEvent - \ingroup events - \internal - - \brief The QClipboardEvent class provides the parameters used in a clipboard event. - - This class is for internal use only, and exists to aid the clipboard on various - platforms to get all the information it needs. Use QEvent::Clipboard instead. - - \sa QClipboard -*/ - -QClipboardEvent::QClipboardEvent(QEventPrivate *data) - : QEvent(QEvent::Clipboard) -{ - d = data; -} - -QClipboardEvent::~QClipboardEvent() -{ -} -#endif // QT_NO_CLIPBOARD - /*! \class QShortcutEvent \brief The QShortcutEvent class provides an event which is generated when diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 7761bab..d94257f 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -682,17 +682,6 @@ protected: }; #endif -#ifndef QT_NO_CLIPBOARD -class Q_GUI_EXPORT QClipboardEvent : public QEvent -{ -public: - explicit QClipboardEvent(QEventPrivate *data); - ~QClipboardEvent(); - - QEventPrivate *data() { return d; } -}; -#endif - class Q_GUI_EXPORT QWindowStateChangeEvent: public QEvent { public: diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fc6e926..6e54b36 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -348,13 +348,6 @@ QGuiApplication::QGuiApplication(QGuiApplicationPrivate &p) QGuiApplication::~QGuiApplication() { Q_D(QGuiApplication); - // flush clipboard contents -#ifndef QT_NO_CLIPBOARD - if (QGuiApplicationPrivate::qt_clipboard) { - QEvent event(QEvent::Clipboard); - QGuiApplication::sendEvent(QGuiApplicationPrivate::qt_clipboard, &event); - } -#endif d->eventDispatcher->closingDown(); d->eventDispatcher = 0; -- 2.7.4