diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 18:00:15 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-14 09:58:20 +0200 |
commit | 80602ce2b34e6999706200f7dac02e0b5b05ff1c (patch) | |
tree | 8cf62d0b6a2ec6d030aa57cebd6dbefd60a14a8c /src/corelib/kernel/qcoreapplication.cpp | |
parent | 72205c829b63736e016f4fc2bb0f8fc4bb2fee5e (diff) |
QCoreApplication: purge deprecated API
Since 5.9 flush()
Since 5.6 notifyInternal()
Since 5.0 trUtf8()
Change-Id: I1cc0fc5ebc3d7f2f4809c4494ab2a7486a481b10
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 7c47e324f5..728ac6e7c1 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -712,26 +712,6 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p) // QCoreApplicationPrivate::eventDispatcher->startingUp(); } -#ifndef QT_NO_QOBJECT -/*! - \deprecated - This function is equivalent to calling \c {QCoreApplication::eventDispatcher()->flush()}, - which also is deprecated, see QAbstractEventDispatcher::flush(). Use sendPostedEvents() - and processEvents() for more fine-grained control of the event loop instead. - - Historically this functions was used to flush the platform-specific native event queues. - - \sa sendPostedEvents(), processEvents(), QAbstractEventDispatcher::flush() -*/ -#if QT_DEPRECATED_SINCE(5, 9) -void QCoreApplication::flush() -{ - if (self && self->d_func()->eventDispatcher) - self->d_func()->eventDispatcher->flush(); -} -#endif -#endif - /*! Constructs a Qt core application. Core applications are applications without a graphical user interface. Such applications are used at the console or as @@ -1030,20 +1010,6 @@ void QCoreApplication::setQuitLockEnabled(bool enabled) quitLockRefEnabled = enabled; } -#if QT_DEPRECATED_SINCE(5, 6) -/*! - \internal - \deprecated - - This function is here to make it possible for Qt extensions to - hook into event notification without subclassing QApplication -*/ -bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event) -{ - return notifyInternal2(receiver, event); -} -#endif - /*! \internal \since 5.6 @@ -2933,29 +2899,6 @@ void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filte } /*! - \deprecated - - This function returns \c true if there are pending events; otherwise - returns \c false. Pending events can be either from the window - system or posted events using postEvent(). - - \note this function is not thread-safe. It may only be called in the main - thread and only if there are no other threads running in the application - (including threads Qt starts for its own purposes). - - \sa QAbstractEventDispatcher::hasPendingEvents() -*/ -#if QT_DEPRECATED_SINCE(5, 3) -bool QCoreApplication::hasPendingEvents() -{ - QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); - if (eventDispatcher) - return eventDispatcher->hasPendingEvents(); - return false; -} -#endif - -/*! Returns a pointer to the event dispatcher object for the main thread. If no event dispatcher exists for the thread, this function returns \nullptr. */ |