Add implementation of virtual keyboard based on BPS events

Backport of a818a1eb2f3d2c5ac61da7e1a8cf1b341e63aed1

Change-Id: I32bc78eb465890702cbf657b077fdf1f8e8e4a63
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

8 files changed, 339 insertions, 43 deletions

diff --git a/src/plugins/platforms/blackberry/blackberry.pro b/src/plugins/platforms/blackberry/blackberry.pro
index 4070237..6fcef85 100644
--- a/src/plugins/platforms/blackberry/blackberry.pro
+++ b/src/plugins/platforms/blackberry/blackberry.pro
@@ -16,7 +16,7 @@ SOURCES =   main.cpp \
             qbbscreen.cpp \
             qbbwindow.cpp \
             qbbrasterwindowsurface.cpp \
-            qbbvirtualkeyboard.cpp \
+            qbbvirtualkeyboardpps.cpp \
             qbbclipboard.cpp \
             qbblocalethread.cpp \
             qbbrootwindow.cpp \
@@ -35,7 +35,7 @@ HEADERS =   qbbbuffer.h \
             qbbscreen.h \
             qbbwindow.h \
             qbbrasterwindowsurface.h \
-            qbbvirtualkeyboard.h \
+            qbbvirtualkeyboardpps.h \
             qbbclipboard.h \
             qbblocalethread.h \
             qbbrootwindow.h \
@@ -44,9 +44,11 @@ HEADERS =   qbbbuffer.h \
             qbbnativeinterface.h
 
 blackberry {
-    SOURCES += qbbbpseventfilter.cpp
+    SOURCES += qbbbpseventfilter.cpp \
+               qbbvirtualkeyboardbps.cpp
 
-    HEADERS += qbbbpseventfilter.h
+    HEADERS += qbbbpseventfilter.h \
+               qbbvirtualkeyboardbps.h
 }
 
 QMAKE_CXXFLAGS += -I./private
diff --git a/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp b/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
index 7d1701b..79a48f6 100644
--- a/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
+++ b/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
@@ -43,6 +43,7 @@
 #include "qbbnavigatoreventhandler.h"
 #include "qbbscreen.h"
 #include "qbbscreeneventhandler.h"
+#include "qbbvirtualkeyboardbps.h"
 
 #include <QAbstractEventDispatcher>
 #include <QDebug>
@@ -56,10 +57,12 @@ QT_BEGIN_NAMESPACE
 static QBBBpsEventFilter *sInstance;
 
 QBBBpsEventFilter::QBBBpsEventFilter(QBBNavigatorEventHandler *navigatorEventHandler,
-                                     QBBScreenEventHandler *screenEventHandler, QObject *parent)
+                                     QBBScreenEventHandler *screenEventHandler,
+                                     QBBVirtualKeyboardBps *virtualKeyboard, QObject *parent)
     : QObject(parent)
     , mNavigatorEventHandler(navigatorEventHandler)
     , mScreenEventHandler(screenEventHandler)
+    , mVirtualKeyboard(virtualKeyboard)
 {
     Q_ASSERT(sInstance == 0);
 
@@ -131,6 +134,9 @@ bool QBBBpsEventFilter::bpsEventFilter(bps_event_t *event)
     if (eventDomain == navigator_get_domain())
         return handleNavigatorEvent(event);
 
+    if (mVirtualKeyboard->handleEvent(event))
+        return true;
+
     return false;
 }
 
diff --git a/src/plugins/platforms/blackberry/qbbbpseventfilter.h b/src/plugins/platforms/blackberry/qbbbpseventfilter.h
index 67e6e76..e47c756 100644
--- a/src/plugins/platforms/blackberry/qbbbpseventfilter.h
+++ b/src/plugins/platforms/blackberry/qbbbpseventfilter.h
@@ -50,13 +50,15 @@ class QAbstractEventDispatcher;
 class QBBNavigatorEventHandler;
 class QBBScreen;
 class QBBScreenEventHandler;
+class QBBVirtualKeyboardBps;
 
 class QBBBpsEventFilter : public QObject
 {
     Q_OBJECT
 public:
     QBBBpsEventFilter(QBBNavigatorEventHandler *navigatorEventHandler,
-                      QBBScreenEventHandler *screenEventHandler, QObject *parent = 0);
+                      QBBScreenEventHandler *screenEventHandler,
+                      QBBVirtualKeyboardBps *virtualKeyboard, QObject *parent = 0);
     ~QBBBpsEventFilter();
 
     void installOnEventDispatcher(QAbstractEventDispatcher *dispatcher);
@@ -73,6 +75,7 @@ private:
 private:
     QBBNavigatorEventHandler *mNavigatorEventHandler;
     QBBScreenEventHandler *mScreenEventHandler;
+    QBBVirtualKeyboardBps *mVirtualKeyboard;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/blackberry/qbbintegration.cpp b/src/plugins/platforms/blackberry/qbbintegration.cpp
index 4767dcd..28484ba 100644
--- a/src/plugins/platforms/blackberry/qbbintegration.cpp
+++ b/src/plugins/platforms/blackberry/qbbintegration.cpp
@@ -50,7 +50,7 @@
 #include "qbbscreen.h"
 #include "qbbscreeneventhandler.h"
 #include "qbbwindow.h"
-#include "qbbvirtualkeyboard.h"
+#include "qbbvirtualkeyboardpps.h"
 #include "qgenericunixfontdatabase.h"
 #include "qbbclipboard.h"
 #include "qbbglcontext.h"
@@ -58,6 +58,7 @@
 #include "qbbnativeinterface.h"
 #if defined(Q_OS_BLACKBERRY)
 #include "qbbbpseventfilter.h"
+#include "qbbvirtualkeyboardbps.h"
 #endif
 
 #include <QtCore/QAbstractEventDispatcher>
@@ -134,21 +135,26 @@ QBBIntegration::QBBIntegration() :
 
 #if defined(Q_OS_BLACKBERRY)
     bps_initialize();
-    mBpsEventFilter = new QBBBpsEventFilter(mNavigatorEventHandler, mScreenEventHandler);
+
+    QBBVirtualKeyboardBps *virtualKeyboardBps = new QBBVirtualKeyboardBps;
+
+    mBpsEventFilter = new QBBBpsEventFilter(mNavigatorEventHandler, mScreenEventHandler, virtualKeyboardBps);
     Q_FOREACH (QPlatformScreen *platformScreen, mScreens) {
         QBBScreen *screen = static_cast<QBBScreen*>(platformScreen);
         mBpsEventFilter->registerForScreenEvents(screen);
     }
 
     mBpsEventFilter->installOnEventDispatcher(QAbstractEventDispatcher::instance());
-#endif
 
+    mVirtualKeyboard = virtualKeyboardBps;
+#else
     // create/start the keyboard class.
-    mVirtualKeyboard = new QBBVirtualKeyboard();
+    mVirtualKeyboard = new QBBVirtualKeyboardPps();
 
     // delay invocation of start() to the time the event loop is up and running
     // needed to have the QThread internals of the main thread properly initialized
     QMetaObject::invokeMethod(mVirtualKeyboard, "start", Qt::QueuedConnection);
+#endif
 
     // TODO check if we need to do this for all screens or only the primary one
     QObject::connect(mVirtualKeyboard, SIGNAL(heightChanged(int)),
@@ -167,9 +173,6 @@ QBBIntegration::~QBBIntegration()
 
     delete mNativeInterface;
 
-    // destroy the keyboard class.
-    delete mVirtualKeyboard;
-
 #ifdef QBBLOCALETHREAD_ENABLED
     // stop/destroy the locale thread.
     delete mLocaleThread;
@@ -190,6 +193,9 @@ QBBIntegration::~QBBIntegration()
     delete mBpsEventFilter;
 #endif
 
+    // destroy the keyboard class.
+    delete mVirtualKeyboard;
+
     delete mNavigatorEventHandler;
     delete mScreenEventHandler;
 
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp
new file mode 100644
index 0000000..c364f3b
--- /dev/null
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Research In Motion
+**
+** Contact: Research In Motion <blackberry-qt@qnx.com>
+** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//#define QBBVIRTUALKEYBOARD_DEBUG
+
+#include "qbbvirtualkeyboardbps.h"
+
+#include <QDebug>
+
+#include <bps/event.h>
+#include <bps/locale.h>
+#include <bps/virtualkeyboard.h>
+
+QT_BEGIN_NAMESPACE
+
+QBBVirtualKeyboardBps::QBBVirtualKeyboardBps(QObject *parent)
+    : QBBAbstractVirtualKeyboard(parent)
+{
+    if (locale_request_events(0) != BPS_SUCCESS)
+        qWarning("QBB: Failed to register for locale events");
+
+    if (virtualkeyboard_request_events(0) != BPS_SUCCESS)
+        qWarning("QBB: Failed to register for virtual keyboard events");
+
+    int height = 0;
+    if (virtualkeyboard_get_height(&height) != BPS_SUCCESS)
+        qWarning("QBB: Failed to get virtual keyboard height");
+
+    setHeight(height);
+}
+
+bool QBBVirtualKeyboardBps::handleEvent(bps_event_t *event)
+{
+    const int eventDomain = bps_event_get_domain(event);
+    if (eventDomain == locale_get_domain())
+        return handleLocaleEvent(event);
+
+    if (eventDomain == virtualkeyboard_get_domain())
+        return handleVirtualKeyboardEvent(event);
+
+    return false;
+}
+
+bool QBBVirtualKeyboardBps::showKeyboard()
+{
+#if defined(QBBVIRTUALKEYBOARD_DEBUG)
+    qDebug() << Q_FUNC_INFO << "current visibility=" << isVisible();
+#endif
+
+    virtualkeyboard_show();
+    return true;
+}
+
+bool QBBVirtualKeyboardBps::hideKeyboard()
+{
+#if defined(QBBVIRTUALKEYBOARD_DEBUG)
+    qDebug() << Q_FUNC_INFO << "current visibility=" << isVisible();
+#endif
+
+    virtualkeyboard_hide();
+    return true;
+}
+
+void QBBVirtualKeyboardBps::applyKeyboardMode(KeyboardMode mode)
+{
+    virtualkeyboard_layout_t layout = VIRTUALKEYBOARD_LAYOUT_DEFAULT;
+
+    switch (mode) {
+    case Url:
+        layout = VIRTUALKEYBOARD_LAYOUT_URL;
+        break;
+
+    case Email:
+        layout = VIRTUALKEYBOARD_LAYOUT_EMAIL;
+        break;
+
+    case Web:
+        layout = VIRTUALKEYBOARD_LAYOUT_WEB;
+        break;
+
+    case NumPunc:
+        layout = VIRTUALKEYBOARD_LAYOUT_NUM_PUNC;
+        break;
+
+    case Symbol:
+        layout = VIRTUALKEYBOARD_LAYOUT_SYMBOL;
+        break;
+
+    case Phone:
+        layout = VIRTUALKEYBOARD_LAYOUT_PHONE;
+        break;
+
+    case Pin:
+        layout = VIRTUALKEYBOARD_LAYOUT_PIN;
+        break;
+
+    case Default: // fall through
+    default:
+        layout = VIRTUALKEYBOARD_LAYOUT_DEFAULT;
+        break;
+    }
+
+#if defined(QBBVIRTUALKEYBOARD_DEBUG)
+    qDebug() << Q_FUNC_INFO << "mode=" << mode;
+#endif
+
+    virtualkeyboard_change_options(layout, VIRTUALKEYBOARD_ENTER_DEFAULT);
+}
+
+bool QBBVirtualKeyboardBps::handleLocaleEvent(bps_event_t *event)
+{
+    if (bps_event_get_code(event) == LOCALE_INFO) {
+        const QString language = QString::fromAscii(locale_event_get_language(event));
+        const QString country  = QString::fromAscii(locale_event_get_country(event));
+
+#if defined(QBBVIRTUALKEYBOARD_DEBUG)
+        qDebug() << Q_FUNC_INFO << "current language/country" << languageId() << "/" << countryId()
+                 << "new language/country=" << language << "/" << country;
+#endif
+        setLanguage(language);
+        setCountry(country);
+        return true;
+    }
+
+#if defined(QBBVIRTUALKEYBOARD_DEBUG)
+    qDebug() << "QBB: Unhandled locale event. code=" << bps_event_get_code(event);
+#endif
+
+    return false;
+}
+
+bool QBBVirtualKeyboardBps::handleVirtualKeyboardEvent(bps_event_t *event)
+{
+    switch (bps_event_get_code(event)) {
+    case VIRTUALKEYBOARD_EVENT_VISIBLE:
+        #if defined(QBBVIRTUALKEYBOARD_DEBUG)
+        qDebug() << Q_FUNC_INFO << "EVENT VISIBLE: current visibility=" << isVisible();
+        #endif
+
+        setVisible(true);
+        break;
+
+    case VIRTUALKEYBOARD_EVENT_HIDDEN:
+        #if defined(QBBVIRTUALKEYBOARD_DEBUG)
+        qDebug() << Q_FUNC_INFO << "EVENT HIDDEN: current visibility=" << isVisible();
+        #endif
+
+        setVisible(false);
+        break;
+
+    case VIRTUALKEYBOARD_EVENT_INFO: {
+        const int newHeight = virtualkeyboard_event_get_height(event);
+
+        #if defined(QBBVIRTUALKEYBOARD_DEBUG)
+        qDebug() << Q_FUNC_INFO << "EVENT INFO: current height=" << getHeight() << "new height=" << newHeight;
+        #endif
+
+        setHeight(newHeight);
+        break;
+    }
+
+    default:
+        #if defined(QBBVIRTUALKEYBOARD_DEBUG)
+        qDebug() << "QBB: Unhandled virtual keyboard event. code=" << bps_event_get_code(event);
+        #endif
+
+        return false;
+    }
+
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h
new file mode 100644
index 0000000..89b5cca
--- /dev/null
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Research In Motion
+**
+** Contact: Research In Motion <blackberry-qt@qnx.com>
+** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QBBVIRTUALKEYBOARDBPS_H
+#define QBBVIRTUALKEYBOARDBPS_H
+
+#include "qbbabstractvirtualkeyboard.h"
+
+struct bps_event_t;
+
+QT_BEGIN_NAMESPACE
+
+class QBBVirtualKeyboardBps : public QBBAbstractVirtualKeyboard
+{
+    Q_OBJECT
+public:
+    explicit QBBVirtualKeyboardBps(QObject *parent = 0);
+
+    bool handleEvent(bps_event_t *event);
+
+    bool showKeyboard();
+    bool hideKeyboard();
+
+protected:
+    void applyKeyboardMode(KeyboardMode mode);
+
+private:
+    bool handleLocaleEvent(bps_event_t *event);
+    bool handleVirtualKeyboardEvent(bps_event_t *event);
+};
+
+QT_END_NAMESPACE
+
+#endif // QBBVIRTUALKEYBOARDBPS_H
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.cpp
index a10b122..6504c7e 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#define QBBVIRTUALKEYBOARD_DEBUG
+//#define QBBVIRTUALKEYBOARD_DEBUG
 
-#include "qbbvirtualkeyboard.h"
+#include "qbbvirtualkeyboardpps.h"
 
 #include <QDebug>
 #include <QSocketNotifier>
@@ -61,13 +61,13 @@
 
 QT_BEGIN_NAMESPACE
 
-const char  *QBBVirtualKeyboard::sPPSPath = "/pps/services/input/control";
-const size_t QBBVirtualKeyboard::sBufferSize = 2048;
+const char  *QBBVirtualKeyboardPps::sPPSPath = "/pps/services/input/control";
+const size_t QBBVirtualKeyboardPps::sBufferSize = 2048;
 
 // Huge hack for keyboard shadow (see QNX PR 88400). Should be removed ASAP.
 #define KEYBOARD_SHADOW_HEIGHT 8
 
-QBBVirtualKeyboard::QBBVirtualKeyboard()
+QBBVirtualKeyboardPps::QBBVirtualKeyboardPps()
     : mEncoder(0),
       mDecoder(0),
       mBuffer(0),
@@ -76,12 +76,12 @@ QBBVirtualKeyboard::QBBVirtualKeyboard()
 {
 }
 
-QBBVirtualKeyboard::~QBBVirtualKeyboard()
+QBBVirtualKeyboardPps::~QBBVirtualKeyboardPps()
 {
     close();
 }
 
-void QBBVirtualKeyboard::start()
+void QBBVirtualKeyboardPps::start()
 {
 #ifdef QBBVIRTUALKEYBOARD_DEBUG
     qDebug() << "QBB: starting keyboard event processing";
@@ -91,12 +91,12 @@ void QBBVirtualKeyboard::start()
         return;
 }
 
-void QBBVirtualKeyboard::applyKeyboardMode(KeyboardMode mode)
+void QBBVirtualKeyboardPps::applyKeyboardMode(KeyboardMode mode)
 {
     applyKeyboardModeOptions(mode);
 }
 
-void QBBVirtualKeyboard::close()
+void QBBVirtualKeyboardPps::close()
 {
     delete mReadNotifier;
     mReadNotifier = 0;
@@ -123,7 +123,7 @@ void QBBVirtualKeyboard::close()
     mBuffer = 0;
 }
 
-bool QBBVirtualKeyboard::connect()
+bool QBBVirtualKeyboardPps::connect()
 {
     close();
 
@@ -157,7 +157,7 @@ bool QBBVirtualKeyboard::connect()
     return true;
 }
 
-bool QBBVirtualKeyboard::queryPPSInfo()
+bool QBBVirtualKeyboardPps::queryPPSInfo()
 {
     // Request info, requires id to regenerate res message.
     pps_encoder_add_string(mEncoder, "msg", "info");
@@ -173,7 +173,7 @@ bool QBBVirtualKeyboard::queryPPSInfo()
     return true;
 }
 
-void QBBVirtualKeyboard::ppsDataReady()
+void QBBVirtualKeyboardPps::ppsDataReady()
 {
     ssize_t nread = qt_safe_read(mFd, mBuffer, sBufferSize - 1);
 
@@ -230,7 +230,7 @@ void QBBVirtualKeyboard::ppsDataReady()
     }
 }
 
-void QBBVirtualKeyboard::handleKeyboardInfoMessage()
+void QBBVirtualKeyboardPps::handleKeyboardInfoMessage()
 {
     int newHeight = 0;
     const char* value;
@@ -268,7 +268,7 @@ void QBBVirtualKeyboard::handleKeyboardInfoMessage()
 #endif
 }
 
-bool QBBVirtualKeyboard::showKeyboard()
+bool QBBVirtualKeyboardPps::showKeyboard()
 {
 #ifdef QBBVIRTUALKEYBOARD_DEBUG
     qDebug() << "QBB: showKeyboard()";
@@ -299,7 +299,7 @@ bool QBBVirtualKeyboard::showKeyboard()
     return true;
 }
 
-bool QBBVirtualKeyboard::hideKeyboard()
+bool QBBVirtualKeyboardPps::hideKeyboard()
 {
 #ifdef QBBVIRTUALKEYBOARD_DEBUG
     qDebug() << "QBB: hideKeyboard()";
@@ -331,7 +331,7 @@ bool QBBVirtualKeyboard::hideKeyboard()
     return true;
 }
 
-void QBBVirtualKeyboard::applyKeyboardModeOptions(KeyboardMode mode)
+void QBBVirtualKeyboardPps::applyKeyboardModeOptions(KeyboardMode mode)
 {
     // Try to connect.
     if (mFd == -1 && !connect())
@@ -377,49 +377,49 @@ void QBBVirtualKeyboard::applyKeyboardModeOptions(KeyboardMode mode)
     pps_encoder_reset(mEncoder);
 }
 
-void QBBVirtualKeyboard::addDefaultModeOptions()
+void QBBVirtualKeyboardPps::addDefaultModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "default");
 }
 
-void QBBVirtualKeyboard::addUrlModeOptions()
+void QBBVirtualKeyboardPps::addUrlModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "url");
 }
 
-void QBBVirtualKeyboard::addEmailModeOptions()
+void QBBVirtualKeyboardPps::addEmailModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "email");
 }
 
-void QBBVirtualKeyboard::addWebModeOptions()
+void QBBVirtualKeyboardPps::addWebModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "web");
 }
 
-void QBBVirtualKeyboard::addNumPuncModeOptions()
+void QBBVirtualKeyboardPps::addNumPuncModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "numPunc");
 }
 
-void QBBVirtualKeyboard::addPhoneModeOptions()
+void QBBVirtualKeyboardPps::addPhoneModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "phone");
 }
 
-void QBBVirtualKeyboard::addPinModeOptions()
+void QBBVirtualKeyboardPps::addPinModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "pin");
 }
 
-void QBBVirtualKeyboard::addSymbolModeOptions()
+void QBBVirtualKeyboardPps::addSymbolModeOptions()
 {
     pps_encoder_add_string(mEncoder, "enter", "enter.default");
     pps_encoder_add_string(mEncoder, "type", "symbol");
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.h b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h
index e544622..0dd3c42 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.h
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef VIRTUALKEYBOARD_H_
-#define VIRTUALKEYBOARD_H_
+#ifndef QBBVIRTUALKEYBOARDPPS_H_
+#define QBBVIRTUALKEYBOARDPPS_H_
 
 #include "qbbabstractvirtualkeyboard.h"
 
@@ -49,12 +49,12 @@ QT_BEGIN_NAMESPACE
 class QSocketNotifier;
 
 /* Shamelessly copied from the browser - this should be rewritten once we have a proper PPS wrapper class */
-class QBBVirtualKeyboard : public QBBAbstractVirtualKeyboard
+class QBBVirtualKeyboardPps : public QBBAbstractVirtualKeyboard
 {
     Q_OBJECT
 public:
-    QBBVirtualKeyboard();
-    ~QBBVirtualKeyboard();
+    QBBVirtualKeyboardPps();
+    ~QBBVirtualKeyboardPps();
 
     bool showKeyboard();
     bool hideKeyboard();
@@ -96,4 +96,4 @@ private:
     void addPinModeOptions();
 };
 
-#endif /* VIRTUALKEYBOARD_H_ */
+#endif /* QBBVIRTUALKEYBOARDPPS_H_ */