4 files changed, 17 insertions, 3 deletions

diff --git a/inputmethods/jumpx/keyboard.cpp b/inputmethods/jumpx/keyboard.cpp
index 0b8fc14..0cfb4be 100644
--- a/inputmethods/jumpx/keyboard.cpp
+++ b/inputmethods/jumpx/keyboard.cpp
@@ -115,24 +115,25 @@ static const mapElement mod2Map[] = {
     { Qt::Key_Shift,      0 },
     { myParenID,          0 },
 };
 
 static const int cursorMap[][2] = {
     { Qt::Key_Home, Qt::Key_PageUp   },
     { Qt::Key_End,  Qt::Key_PageDown },
     { Qt::Key_Up,   Qt::Key_Up       },
     { Qt::Key_Left, Qt::Key_Right    },
     { Qt::Key_Down, Qt::Key_Down     },
 };
 
+using namespace JumpX;
 
 Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
     QFrame(parent, name, f),
     shift(0), paren(0), ctrl(0), alt(0),
     pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0),
     isnoncont(false),
     slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0),
     enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL),
     releasedPix(NULL), pressedPix(NULL)
 {
     //setPalette(QPalette(QColor(240,240,230))); // Beige!
 
diff --git a/inputmethods/jumpx/keyboard.h b/inputmethods/jumpx/keyboard.h
index 1be095d..689d95a 100644
--- a/inputmethods/jumpx/keyboard.h
+++ b/inputmethods/jumpx/keyboard.h
@@ -4,24 +4,27 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 *********************************************************************************************/
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 
+namespace JumpX
+{
+
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
     void resetState();
 
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void mouseMoveEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
@@ -60,12 +63,14 @@ private:
     QPixmap pressedShift;
     QPixmap pressedParen;
     QPixmap pressedDigit;
 
     QPixmap offscreen;
 
     QPixmap *releasedPix;
     QPixmap *pressedPix;
 
     QTimer *delayTimer;
     QTimer *rateTimer;
 };
+
+} // namespace JumpX
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 92abb09..34c227f 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -6,25 +6,25 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 *********************************************************************************************/
 #include <qapplication.h>
 #include <qpixmap.h>
 #include "keyboard.h"
 #include "keyboardimpl.h"
 
 /* XPM */
-static const char * icon_xpm[] = {
+static const char * const icon_xpm[] = {
 "26 13 2 1",
 " 	c None",
 ".	c #000000",
 " ... ... ... ... ... ...  ",
 ".   .   .   .   .   .   . ",
 ".   .   .   .   .   .   . ",
 ".   .   .   .   .   .   . ",
 " ....... ... ... .......  ",
 ".       .   .   .       . ",
 ".       .   .   .       . ",
 ".       .   .   .       . ",
 " ....... ... ... .......  ",
@@ -39,25 +39,25 @@ KeyboardImpl::KeyboardImpl()
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
-	input = new Keyboard( parent, "Keyboard", f );
+	input = new JumpX::Keyboard( parent, "Keyboard", f );
     return input;
 }
 
 void KeyboardImpl::resetState()
 {
     if ( input )
 	input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
diff --git a/inputmethods/jumpx/keyboardimpl.h b/inputmethods/jumpx/keyboardimpl.h
index a82ec4a..087781f 100644
--- a/inputmethods/jumpx/keyboardimpl.h
+++ b/inputmethods/jumpx/keyboardimpl.h
@@ -5,39 +5,47 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 *********************************************************************************************/
 #ifndef KEYBOARDIMPL_H
 #define KEYBOARDIMPL_H
 
 #include <qpe/inputmethodinterface.h>
 
+namespace JumpX
+{
 class Keyboard;
+};
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
 public:
     KeyboardImpl();
     virtual ~KeyboardImpl();
 
 #ifndef QT_NO_COMPONENT
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
-    Keyboard *input;
+    JumpX::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif