diff options
| author | David Skoland <david.skoland@qt.io> | 2021-01-08 12:57:47 +0100 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2021-01-12 09:19:27 +0100 |
| commit | 9e09677c1dd4da92735736a0fbcb703416bf4d6d (patch) | |
| tree | ac921250db4b53b20101dd5f1aa0f3e9c83db8a2 /src/plugins/platforminputcontexts | |
| parent | 6a3f8cbc3ad47d8585aac25d3775ed2350afe20c (diff) | |
Remove QtDBus includes
Per the discussion of QTBUG-88831, we determined that module-wide
imports are unfortunate, especially for compile times. Following this,
all QtDBus includes have been replaced with the headers for the classes
actually used in each file. Additionally, some cleanup of header file
order and format has been performed in the changed files.
Pick-to: 6.0
Change-Id: I62c1b75682a48422f0ba1168dd5d7bd0952808ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts')
6 files changed, 46 insertions, 37 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h index 396a213aaa..3d11706c06 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h +++ b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h @@ -11,14 +11,16 @@ #ifndef QIBUSINPUTCONTEXTPROXY_H_1394889529 #define QIBUSINPUTCONTEXTPROXY_H_1394889529 -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> + /* * Proxy class for interface org.freedesktop.IBus.InputContext diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp index 7f8a0ea47b..32f9a834e0 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp @@ -38,30 +38,33 @@ ****************************************************************************/ #include "qibusplatforminputcontext.h" -#include <QtDebug> +#include <QDebug> #include <QTextCharFormat> #include <QGuiApplication> +#include <QWindow> +#include <QEvent> +#include <QFile> +#include <QStandardPaths> #include <QDBusVariant> -#include <qwindow.h> -#include <qevent.h> - -#include <qpa/qplatformcursor.h> -#include <qpa/qplatformscreen.h> -#include <qpa/qwindowsysteminterface_p.h> - -#include <QtGui/private/qguiapplication_p.h> - -#include <QtGui/private/qxkbcommon_p.h> +#include <QDBusPendingReply> +#include <QDBusReply> +#include <QDBusServiceWatcher> #include "qibusproxy.h" #include "qibusproxyportal.h" #include "qibusinputcontextproxy.h" #include "qibustypes.h" +#include <qpa/qplatformcursor.h> +#include <qpa/qplatformscreen.h> +#include <qpa/qwindowsysteminterface_p.h> + +#include <private/qguiapplication_p.h> +#include <private/qxkbcommon_p.h> + #include <sys/types.h> #include <signal.h> -#include <QtDBus> #ifndef IBUS_RELEASE_MASK #define IBUS_RELEASE_MASK (1 << 30) diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp index 6b46e106ab..9f6fbf4392 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.cpp @@ -13,6 +13,8 @@ #include "qibusproxy.h" +#include <QDBusReply> + /* * Implementation of interface class QIBusProxy */ diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxy.h b/src/plugins/platforminputcontexts/ibus/qibusproxy.h index c9876deebf..c66e900664 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxy.h +++ b/src/plugins/platforminputcontexts/ibus/qibusproxy.h @@ -11,14 +11,15 @@ #ifndef QIBUSPROXY_H_1308831142 #define QIBUSPROXY_H_1308831142 -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> #include "qibustypes.h" diff --git a/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h b/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h index bdd1d9c395..4b921db814 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h +++ b/src/plugins/platforminputcontexts/ibus/qibusproxyportal.h @@ -11,14 +11,15 @@ #ifndef QIBUSPROXYPORTAL_H #define QIBUSPROXYPORTAL_H -#include <QtCore/QObject> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariant> -#include <QtDBus/QtDBus> +#include <QObject> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QVariant> +#include <QDBusAbstractInterface> +#include <QDBusPendingReply> /* * Proxy class for interface org.freedesktop.IBus.Portal diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp index 443df271a8..eb1c0e3e06 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.cpp +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qibustypes.h" -#include <QtDBus> + #include <QHash> QT_BEGIN_NAMESPACE |