- properly namespace the input methods. fixes symbols clashes at run-time

  with names like 'Keyboard' or 'KeyboardConfig' . the qcom interface
  objects are in an anonymous namespace now and the actual keyboard
  implementations are in Dvorak, JumpX, etc. namespaces.

What's left is to solve the symbol clashes of the multiply compiled
pickboard classes. I'll leave that one (as part of the patch posted
yesterday) for another day for review. This part (namespacing) sounds like
a safe bet to me though, so comitting now. (got no comments anyway)

4 files changed, 18 insertions, 4 deletions

diff --git a/inputmethods/jumpx/keyboard.cpp b/inputmethods/jumpx/keyboard.cpp
index 0b8fc14..0cfb4be 100644
--- a/inputmethods/jumpx/keyboard.cpp
+++ b/inputmethods/jumpx/keyboard.cpp
@@ -126,2 +126,3 @@ static const int cursorMap[][2] = {
 
+using namespace JumpX;
 
diff --git a/inputmethods/jumpx/keyboard.h b/inputmethods/jumpx/keyboard.h
index 1be095d..689d95a 100644
--- a/inputmethods/jumpx/keyboard.h
+++ b/inputmethods/jumpx/keyboard.h
@@ -15,2 +15,5 @@
 
+namespace JumpX
+{
+
 class Keyboard : public QFrame
@@ -71 +74,3 @@ private:
 };
+
+} // namespace JumpX
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 92abb09..34c227f 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -17,3 +17,3 @@
 /* XPM */
-static const char * icon_xpm[] = {
+static const char * const icon_xpm[] = {
 "26 13 2 1",
@@ -50,3 +50,3 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
     if ( !input )
-	input = new Keyboard( parent, "Keyboard", f );
+	input = new JumpX::Keyboard( parent, "Keyboard", f );
     return input;
diff --git a/inputmethods/jumpx/keyboardimpl.h b/inputmethods/jumpx/keyboardimpl.h
index a82ec4a..087781f 100644
--- a/inputmethods/jumpx/keyboardimpl.h
+++ b/inputmethods/jumpx/keyboardimpl.h
@@ -16,5 +16,11 @@
 
-class Keyboard;
+namespace JumpX
+{
+    class Keyboard;
+};
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
@@ -37,3 +43,3 @@ public:
 private:
-    Keyboard *input;
+    JumpX::Keyboard *input;
     QPixmap *icn;
@@ -42,2 +48,4 @@ private:
 
+} // anonymous namespace
+
 #endif