summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.h
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-07-16 18:00:15 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-08-14 09:58:20 +0200
commit80602ce2b34e6999706200f7dac02e0b5b05ff1c (patch)
tree8cf62d0b6a2ec6d030aa57cebd6dbefd60a14a8c /src/corelib/kernel/qcoreapplication.h
parent72205c829b63736e016f4fc2bb0f8fc4bb2fee5e (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.h')
-rw-r--r--src/corelib/kernel/qcoreapplication.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 057a0bc65b..19ce85aa25 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@@ -124,9 +124,6 @@ public:
static void postEvent(QObject *receiver, QEvent *event, int priority = Qt::NormalEventPriority);
static void sendPostedEvents(QObject *receiver = nullptr, int event_type = 0);
static void removePostedEvents(QObject *receiver, int eventType = 0);
-#if QT_DEPRECATED_SINCE(5, 3)
- QT_DEPRECATED static bool hasPendingEvents();
-#endif
static QAbstractEventDispatcher *eventDispatcher();
static void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher);
@@ -156,18 +153,8 @@ public:
const char * key,
const char * disambiguation = nullptr,
int n = -1);
-#if QT_DEPRECATED_SINCE(5, 0)
- enum Encoding { UnicodeUTF8, Latin1, DefaultCodec = UnicodeUTF8, CodecForTr = UnicodeUTF8 };
- QT_DEPRECATED static inline QString translate(const char * context, const char * key,
- const char * disambiguation, Encoding, int n = -1)
- { return translate(context, key, disambiguation, n); }
-#endif
#ifndef QT_NO_QOBJECT
-# if QT_DEPRECATED_SINCE(5, 9)
- QT_DEPRECATED static void flush();
-# endif
-
void installNativeEventFilter(QAbstractNativeEventFilter *filterObj);
void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj);
@@ -201,9 +188,6 @@ protected:
private:
#ifndef QT_NO_QOBJECT
static bool sendSpontaneousEvent(QObject *receiver, QEvent *event);
-# if QT_DEPRECATED_SINCE(5,6)
- QT_DEPRECATED bool notifyInternal(QObject *receiver, QEvent *event); // ### Qt6 BIC: remove me
-# endif
static bool notifyInternal2(QObject *receiver, QEvent *);
static bool forwardEvent(QObject *receiver, QEvent *event, QEvent *originatingEvent = nullptr);
#endif
@@ -232,19 +216,10 @@ private:
friend class QCommandLineParserPrivate;
};
-#ifdef QT_NO_DEPRECATED
-# define QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)
-#else
-# define QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) \
- QT_DEPRECATED static inline QString trUtf8(const char *sourceText, const char *disambiguation = nullptr, int n = -1) \
- { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }
-#endif
-
#define Q_DECLARE_TR_FUNCTIONS(context) \
public: \
static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1) \
{ return QCoreApplication::translate(#context, sourceText, disambiguation, n); } \
- QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) \
private:
typedef void (*QtStartUpFunction)();