4 files changed, 19 insertions, 6 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
@@ -31,4 +31,5 @@
 #include <sys/utsname.h>
 
+using namespace KeyboardInput;
 
 #define USE_SMALL_BACKSPACE
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
@@ -24,4 +24,7 @@
 class QTimer;
 
+namespace KeyboardInput
+{
+
 class KeyboardConfig : public DictFilterConfig
 {
@@ -102,2 +105,4 @@ private:
 };
 
+} // 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
@@ -24,5 +24,5 @@
 
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
 "       c None",
@@ -46,5 +46,5 @@ static const char * kb_xpm[] = {
 
 /* XPM */
-static char * opti_xpm[] = {
+static const char * const ipti_xpm[] = {
 "28 13 4 1",
 "       c None",
@@ -66,6 +66,4 @@ static char * opti_xpm[] = {
 " .........................  "};
 
-
-
 KeyboardImpl::KeyboardImpl()
     : input(0), icn(0), ref(0)
@@ -82,5 +80,5 @@ 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;
 }
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
@@ -23,7 +23,14 @@
 #include <qpe/inputmethodinterface.h>
 
+namespace KeyboardInput
+{
 class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
@@ -44,8 +51,10 @@ public:
 
 private:
-    Keyboard *input;
+    KeyboardInput::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif