-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 | 12 |
4 files changed, 18 insertions, 4 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 @@ -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 |