4 files changed, 18 insertions, 5 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 84c0c74..c22fbb1 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -39,2 +39,3 @@
 
+using namespace MultiKey;
 
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index bc74e71..20c5cee 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -27,2 +27,5 @@ class QTimer;
 
+namespace MultiKey
+{
+
 class KeyboardConfig : public DictFilterConfig
@@ -187,2 +190,2 @@ private:
 
-
+} // namespace MultiKey
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp
index cebd43d..4cfbcd5 100644
--- a/inputmethods/multikey/keyboardimpl.cpp
+++ b/inputmethods/multikey/keyboardimpl.cpp
@@ -25,3 +25,3 @@
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
@@ -60,3 +60,3 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
     if ( !input )
-	input = new Keyboard( parent, "Keyboard", f );
+	input = new MultiKey::Keyboard( parent, "Keyboard", f );
     return input;
diff --git a/inputmethods/multikey/keyboardimpl.h b/inputmethods/multikey/keyboardimpl.h
index e756364..76a2955 100644
--- a/inputmethods/multikey/keyboardimpl.h
+++ b/inputmethods/multikey/keyboardimpl.h
@@ -24,5 +24,12 @@
 
-class Keyboard;
+namespace MultiKey
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
@@ -45,3 +52,3 @@ public:
 private:
-    Keyboard *input;
+    MultiKey::Keyboard *input;
     QPixmap *icn;
@@ -50,2 +57,4 @@ private:
 
+} // anonymous namespace
+
 #endif