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
@@ -32,2 +32,3 @@
 
+using namespace KeyboardInput;
 
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
@@ -25,2 +25,5 @@ class QTimer;
 
+namespace KeyboardInput
+{
+
 class KeyboardConfig : public DictFilterConfig
@@ -103 +106,3 @@ 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
@@ -25,3 +25,3 @@
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
@@ -47,3 +47,3 @@ static const char * kb_xpm[] = {
 /* XPM */
-static char * opti_xpm[] = {
+static const char * const ipti_xpm[] = {
 "28 13 4 1",
@@ -67,4 +67,2 @@ static char * opti_xpm[] = {
 
-
-
 KeyboardImpl::KeyboardImpl()
@@ -83,3 +81,3 @@ 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
@@ -24,5 +24,12 @@
 
-class Keyboard;
+namespace KeyboardInput
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
@@ -45,3 +52,3 @@ public:
 private:
-    Keyboard *input;
+    KeyboardInput::Keyboard *input;
     QPixmap *icn;
@@ -50,2 +57,4 @@ private:
 
+} // anonymous namespace
+
 #endif