4 files changed, 19 insertions, 4 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 @@
 
+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