diff options
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 |