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
@@ -22,24 +22,26 @@
 
 #include <qpe/global.h>
 
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <ctype.h>
 
 
 #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),
     unicode(-1), qkeycode(0), modifiers(0)
 {
     //  setPalette(QPalette(QColor(240,240,230))); // Beige!
     //  setFont( QFont( "Helvetica", 8 ) );
 //    setPalette(QPalette(QColor(200,200,200))); // Gray
     setPalette(QPalette(QColor(220,220,220))); // Gray
 
     picks = new KeyboardPicks( this );
     picks->setFont( QFont( "smallsmooth", 9 ) );
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
@@ -14,24 +14,27 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qframe.h>
 #include "../pickboard/pickboardcfg.h"
 #include "../pickboard/pickboardpicks.h"
 
 class QTimer;
 
+namespace Dvorak
+{
+
 class KeyboardConfig : public DictFilterConfig
 {
 public:
     KeyboardConfig(PickboardPicks* p) : DictFilterConfig(p), backspaces(0) { nrows = 1; }
     virtual void generateText(const QString &s);
     void decBackspaces() { if (backspaces) backspaces--; }
     void incBackspaces() { backspaces++; }
     void resetBackspaces() { backspaces = 0; }
 private:
     int backspaces;
 };
 
@@ -92,12 +95,13 @@ private:
     int xoffs;
 
     int unicode;
     int qkeycode;
     int modifiers;
 
     int pressTid;
     bool pressed;
 
     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
@@ -14,47 +14,47 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qapplication.h>
 #include <qpixmap.h>
 #include "dvorak.h"
 #include "dvorakimpl.h"
 
 /* XPM */
-static const char * kb_xpm[] = {
+static const char * const kb_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
 "+      c #FFF7DD",
 "@      c #D6CFBA",
 " .......................... ",
 " .+++.+++.+++.+++.+++.++++. ",
 " .+@@.+@@.+@@.+@@.+@@.+@@@. ",
 " .......................... ",
 " .+++++.+++.+++.+++.++++++. ",
 " .+@@@@.+@@.+@@.+@@.+@@@@@. ",
 " .......................... ",
 " .++++++.+++.+++.+++.+++++. ",
 " .+@@@@@.+@@.+@@.+@@.+@@@@. ",
 " .......................... ",
 " .++++.++++++++++++++.++++. ",
 " .+@@@.+@@@@@@@@@@@@@.+@@@. ",
 " .......................... "};
 
 
 /* XPM */
-static char * opti_xpm[] = {
+static const char * const opti_xpm[] = {
 "28 13 4 1",
 "       c None",
 ".      c #4C4C4C",
 "+      c #FFF7DD",
 "@      c #D6CFBA",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
 " .+++.+++.+++.+++.+++.+++.  ",
 " .+@@.+@@.+@@.+@@.+@@.+@@.  ",
 " .........................  ",
@@ -72,25 +72,25 @@ KeyboardImpl::KeyboardImpl()
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 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;
 }
 
 void KeyboardImpl::resetState()
 {
     if ( input )
 	input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
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
@@ -13,39 +13,48 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef KEYBOARDIMPL_H
 #define KEYBOARDIMPL_H
 
 #include <qpe/inputmethodinterface.h>
 
-class Keyboard;
+namespace Dvorak
+{
+    class Keyboard;
+}
+
 class QPixmap;
 
+namespace
+{
+
 class KeyboardImpl : public InputMethodInterface
 {
 public:
     KeyboardImpl();
     virtual ~KeyboardImpl();
 
 #ifndef QT_NO_COMPONENT
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 #endif
 
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
     virtual void resetState();
     virtual QPixmap *icon();
     virtual QString name();
     virtual void onKeyPress( QObject *receiver, const char *slot );
 
 private:
-    Keyboard *input;
+    Dvorak::Keyboard *input;
     QPixmap *icn;
     ulong ref;
 };
 
+} // anonymous namespace
+
 #endif