- 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, 20 insertions, 5 deletions

diff --git a/inputmethods/dvorak/dvorak.cpp b/inputmethods/dvorak/dvorak.cpp
index 29b5bd0..97afa0a 100644
--- a/inputmethods/dvorak/dvorak.cpp
+++ b/inputmethods/dvorak/dvorak.cpp
@@ -31,6 +31,8 @@
 
 #define USE_SMALL_BACKSPACE
 
+using namespace Dvorak;
+
 Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
     QFrame(parent, name, f),  shift(FALSE), lock(FALSE), ctrl(FALSE),
     alt(FALSE), useLargeKeys(TRUE), useOptiKeys(0), pressedKey(-1),
diff --git a/inputmethods/dvorak/dvorak.h b/inputmethods/dvorak/dvorak.h
index 38ae338..216b5e5 100644
--- a/inputmethods/dvorak/dvorak.h
+++ b/inputmethods/dvorak/dvorak.h
@@ -23,6 +23,9 @@
 
 class QTimer;
 
+namespace Dvorak
+{
+
 class KeyboardConfig : public DictFilterConfig
 {
 public:
@@ -101,3 +104,4 @@ private:
     QTimer *repeatTimer;
 };
 
+} // namespace Dvorak
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 3c83464..8050ce1 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -23,7 +23,7 @@
 #include "dvorakimpl.h"
 
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
@@ -45,7 +45,7 @@ static const char * kb_xpm[] = {
 
 
 /* XPM */
-static char * opti_xpm[] = {
+static const char * const opti_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
@@ -81,7 +81,7 @@ KeyboardImpl::~KeyboardImpl()
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
-	input = new Keyboard( parent, "Keyboard", f );
+	input = new Dvorak::Keyboard( parent, "Keyboard", f );
     return input;
 }
 
diff --git a/inputmethods/dvorak/dvorakimpl.h b/inputmethods/dvorak/dvorakimpl.h
index e756364..bd9fa88 100644
--- a/inputmethods/dvorak/dvorakimpl.h
+++ b/inputmethods/dvorak/dvorakimpl.h
@@ -22,9 +22,16 @@
 
 #include <qpe/inputmethodinterface.h>
 
-class Keyboard;
+namespace Dvorak
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
 public:
@@ -43,9 +50,11 @@ public:
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
-    Keyboard *input;
+    Dvorak::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif