4 files changed, 17 insertions, 4 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
@@ -38,4 +38,5 @@
 #include <sys/utsname.h>
 
+using namespace MultiKey;
 
 /* Keyboard::Keyboard {{{1 */
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
@@ -26,4 +26,7 @@
 class QTimer;
 
+namespace MultiKey
+{
+
 class KeyboardConfig : public DictFilterConfig
 {
@@ -186,3 +189,3 @@ 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
@@ -24,5 +24,5 @@
 
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
 "       c None",
@@ -59,5 +59,5 @@ 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
@@ -23,7 +23,14 @@
 #include <qpe/inputmethodinterface.h>
 
+namespace MultiKey
+{
 class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
@@ -44,8 +51,10 @@ public:
 
 private:
-    Keyboard *input;
+    MultiKey::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif