20 files changed, 94 insertions, 25 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
@@ -33,2 +33,4 @@
 
+using namespace Dvorak;
+
 Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
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
@@ -25,2 +25,5 @@ class QTimer;
 
+namespace Dvorak
+{
+
 class KeyboardConfig : public DictFilterConfig
@@ -103 +106,2 @@ private:
 
+} // 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
@@ -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 opti_xpm[] = {
 "28 13 4 1",
@@ -83,3 +83,3 @@ 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
@@ -24,5 +24,12 @@
 
-class Keyboard;
+namespace Dvorak
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
@@ -45,3 +52,3 @@ public:
 private:
-    Keyboard *input;
+    Dvorak::Keyboard *input;
     QPixmap *icn;
@@ -50,2 +57,4 @@ private:
 
+} // anonymous namespace
+
 #endif
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
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
diff --git a/inputmethods/kjumpx/keyboard.cpp b/inputmethods/kjumpx/keyboard.cpp
index 3af6a78..dc44805 100644
--- a/inputmethods/kjumpx/keyboard.cpp
+++ b/inputmethods/kjumpx/keyboard.cpp
@@ -142,2 +142,3 @@ static const int cursorMap[][2] = {
 
+using namespace KJumpX;
 
diff --git a/inputmethods/kjumpx/keyboard.h b/inputmethods/kjumpx/keyboard.h
index 148cb72..ca83915 100644
--- a/inputmethods/kjumpx/keyboard.h
+++ b/inputmethods/kjumpx/keyboard.h
@@ -15,2 +15,5 @@
 
+namespace KJumpX
+{
+
 class Keyboard : public QFrame
@@ -79 +82,3 @@ private:
 };
+
+} // namespace KJumpX
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 5d8e0d3..976d816 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -17,3 +17,3 @@
 /* XPM */
-static 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 KJumpX::Keyboard( parent, "Keyboard", f );
     return input;
diff --git a/inputmethods/kjumpx/keyboardimpl.h b/inputmethods/kjumpx/keyboardimpl.h
index a82ec4a..1ff1034 100644
--- a/inputmethods/kjumpx/keyboardimpl.h
+++ b/inputmethods/kjumpx/keyboardimpl.h
@@ -16,5 +16,11 @@
 
-class Keyboard;
+namespace KJumpX
+{
+    class Keyboard;
+}
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
@@ -37,3 +43,3 @@ public:
 private:
-    Keyboard *input;
+    KJumpX::Keyboard *input;
     QPixmap *icn;
@@ -42,2 +48,4 @@ private:
 
+} // anonymous namespace
+
 #endif
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