Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

1 files changed, 144 insertions, 0 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h
new file mode 100644
index 0000000000..9a91c4e484
--- /dev/null
+++ b/src/plugins/platforminputcontexts/ibus/qibusinputcontextproxy.h
@@ -0,0 +1,144 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -N -p qibusinputcontextproxy -c QIBusInputContextProxy interfaces/org.freedesktop.IBus.InputContext.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef QIBUSINPUTCONTEXTPROXY_H_1308831153
+#define QIBUSINPUTCONTEXTPROXY_H_1308831153
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.freedesktop.IBus.InputContext
+ */
+class QIBusInputContextProxy: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.freedesktop.IBus.InputContext"; }
+
+public:
+    QIBusInputContextProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~QIBusInputContextProxy();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<> Destroy()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Destroy"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Disable()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Disable"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Enable()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Enable"), argumentList);
+    }
+
+    inline QDBusPendingReply<> FocusIn()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("FocusIn"), argumentList);
+    }
+
+    inline QDBusPendingReply<> FocusOut()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("FocusOut"), argumentList);
+    }
+
+    inline QDBusPendingReply<QDBusVariant> GetEngine()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("GetEngine"), argumentList);
+    }
+
+    inline QDBusPendingReply<bool> IsEnabled()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("IsEnabled"), argumentList);
+    }
+
+    inline QDBusPendingReply<bool> ProcessKeyEvent(uint keyval, uint keycode, uint state)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(keyval) << QVariant::fromValue(keycode) << QVariant::fromValue(state);
+        return asyncCallWithArgumentList(QLatin1String("ProcessKeyEvent"), argumentList);
+    }
+
+    inline QDBusPendingReply<> PropertyActivate(const QString &name, int state)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(name) << QVariant::fromValue(state);
+        return asyncCallWithArgumentList(QLatin1String("PropertyActivate"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Reset()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Reset"), argumentList);
+    }
+
+    inline QDBusPendingReply<> SetCapabilities(uint caps)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(caps);
+        return asyncCallWithArgumentList(QLatin1String("SetCapabilities"), argumentList);
+    }
+
+    inline QDBusPendingReply<> SetCursorLocation(int x, int y, int w, int h)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(x) << QVariant::fromValue(y) << QVariant::fromValue(w) << QVariant::fromValue(h);
+        return asyncCallWithArgumentList(QLatin1String("SetCursorLocation"), argumentList);
+    }
+
+    inline QDBusPendingReply<> SetEngine(const QString &name)
+    {
+        QList<QVariant> argumentList;
+        argumentList << QVariant::fromValue(name);
+        return asyncCallWithArgumentList(QLatin1String("SetEngine"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+    void CommitText(const QDBusVariant &text);
+    void CursorDownLookupTable();
+    void CursorUpLookupTable();
+    void Disabled();
+    void Enabled();
+    void ForwardKeyEvent(uint keyval, uint keycode, uint state);
+    void HideAuxiliaryText();
+    void HideLookupTable();
+    void HidePreeditText();
+    void PageDownLookupTable();
+    void PageUpLookupTable();
+    void RegisterProperties(const QDBusVariant &props);
+    void ShowAuxiliaryText();
+    void ShowLookupTable();
+    void ShowPreeditText();
+    void UpdateAuxiliaryText(const QDBusVariant &text, bool visible);
+    void UpdateLookupTable(const QDBusVariant &table, bool visible);
+    void UpdatePreeditText(const QDBusVariant &text, uint cursor_pos, bool visible);
+    void UpdateProperty(const QDBusVariant &prop);
+};
+
+#endif