4 files changed, 20 insertions, 7 deletions
diff --git a/inputmethods/keyboard/keyboard.cpp b/inputmethods/keyboard/keyboard.cpp
index 0f0b188..a85a7b1 100644
--- a/inputmethods/keyboard/keyboard.cpp
+++ b/inputmethods/keyboard/keyboard.cpp
@@ -27,12 +27,13 @@
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <ctype.h>
 
 #include <sys/utsname.h>
 
+using namespace KeyboardInput;
 
 #define USE_SMALL_BACKSPACE
 
 Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     QFrame(parent, _name, f),  shift(FALSE), lock(FALSE), ctrl(FALSE),
     alt(FALSE), useLargeKeys(TRUE), useOptiKeys(0), pressedKey(-1),
diff --git a/inputmethods/keyboard/keyboard.h b/inputmethods/keyboard/keyboard.h
index 38ae338..cc7f3f5 100644
--- a/inputmethods/keyboard/keyboard.h
+++ b/inputmethods/keyboard/keyboard.h
@@ -20,12 +20,15 @@
 #include <qframe.h>
 #include "../pickboard/pickboardcfg.h"
 #include "../pickboard/pickboardpicks.h"
 
 class QTimer;
 
+namespace KeyboardInput
+{
+
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
@@ -98,6 +101,8 @@ private:
     int pressTid;
     bool pressed;
 
     QTimer *repeatTimer;
 };
 
+} // namespace KeyboardInput
+
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index bc96402..3c77fe6 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -20,13 +20,13 @@
 #include <qapplication.h>
 #include <qpixmap.h>
 #include "keyboard.h"
 #include "keyboardimpl.h"
 
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
 "+      c #FFF7DD",
 "@      c #D6CFBA",
 " .......................... ",
@@ -42,13 +42,13 @@ static const char * kb_xpm[] = {
 " .++++.++++++++++++++.++++. ",
 " .+@@@.+@@@@@@@@@@@@@.+@@@. ",
 " .......................... "};
 
 
 /* XPM */
-static char * opti_xpm[] = {
+static const char * const ipti_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
 "+      c #FFF7DD",
 "@      c #D6CFBA",
 " .........................  ",
@@ -62,14 +62,12 @@ static char * opti_xpm[] = {
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  "};
 
-
-
 KeyboardImpl::KeyboardImpl()
     : input(0), icn(0), ref(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
@@ -78,13 +76,13 @@ KeyboardImpl::~KeyboardImpl()
     delete icn;
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
-	input = new Keyboard( parent, "Keyboard", f );
+	input = new KeyboardInput::Keyboard( parent, "Keyboard", f );
     return input;
 }
 
 void KeyboardImpl::resetState()
 {
     if ( input )
diff --git a/inputmethods/keyboard/keyboardimpl.h b/inputmethods/keyboard/keyboardimpl.h
index e756364..d33a822 100644
--- a/inputmethods/keyboard/keyboardimpl.h
+++ b/inputmethods/keyboard/keyboardimpl.h
@@ -19,15 +19,22 @@
 **********************************************************************/
 #ifndef KEYBOARDIMPL_H
 #define KEYBOARDIMPL_H
 
 #include <qpe/inputmethodinterface.h>
 
-class Keyboard;
+namespace KeyboardInput
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
 public:
     KeyboardImpl();
     virtual ~KeyboardImpl();
 
@@ -40,12 +47,14 @@ public:
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
-    Keyboard *input;
+    KeyboardInput::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif