-rw-r--r-- | inputmethods/kjumpx/keyboard.cpp | 1 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboard.h | 5 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboardimpl.cpp | 4 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboardimpl.h | 10 |
4 files changed, 17 insertions, 3 deletions
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 @@ -141,4 +141,5 @@ static const int cursorMap[][2] = { }; +using namespace KJumpX; Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : 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 @@ -14,4 +14,7 @@ #include <qtimer.h> +namespace KJumpX +{ + class Keyboard : public QFrame { @@ -78,2 +81,4 @@ private: QTimer *rateTimer; }; + +} // 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 @@ -16,5 +16,5 @@ /* XPM */ -static char * icon_xpm[] = { +static const char * const icon_xpm[] = { "26 13 2 1", " c None", @@ -49,5 +49,5 @@ 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 @@ -15,7 +15,13 @@ #include <qpe/inputmethodinterface.h> +namespace KJumpX +{ class Keyboard; +} class QPixmap; +namespace +{ + class KeyboardImpl : public InputMethodInterface { @@ -36,8 +42,10 @@ public: private: - Keyboard *input; + KJumpX::Keyboard *input; QPixmap *icn; ulong ref; }; +} // anonymous namespace + #endif |