- 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)

1 files changed, 5 insertions, 0 deletions

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
@@ -1,39 +1,42 @@
 /**************************************************************************************94x78**
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 *********************************************************************************************/
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qtimer.h>
 
+namespace JumpX
+{
+
 class Keyboard : public QFrame
 {
     Q_OBJECT
 public:
     Keyboard( QWidget* parent=0, const char* name=0, WFlags f=0 );
 
     void resetState();
 
     void mousePressEvent(QMouseEvent*);
     void mouseReleaseEvent(QMouseEvent*);
     void mouseMoveEvent(QMouseEvent*);
     void resizeEvent(QResizeEvent*);
     void paintEvent(QPaintEvent* e);
     //void timerEvent(QTimerEvent* e);
 
     QSize sizeHint() const;
 
 signals:
     void key( ushort unicode, ushort qcode, ushort modifiers, bool, bool );
 
 private slots:
     void delayTimerDone();
     void rateTimerDone();
 
@@ -48,24 +51,26 @@ private:
     bool isnoncont;
     int pressed2x, pressed2y, pressed2w, pressed2h;
 
     int slideKeyUnicodeH, slideKeyQcodeH, slideKeyUnicodeV, slideKeyQcodeV;
     bool enableMouseTracking;
     QPixmap *slidePix, *slidePixH, *slidePixV;
 
     QPixmap releasedPlain;
     QPixmap releasedShift;
     QPixmap releasedParen;
 
     QPixmap pressedPlain;
     QPixmap pressedShift;
     QPixmap pressedParen;
     QPixmap pressedDigit;
 
     QPixmap offscreen;
 
     QPixmap *releasedPix;
     QPixmap *pressedPix;
 
     QTimer *delayTimer;
     QTimer *rateTimer;
 };
+
+} // namespace JumpX