| author | simon <simon> | 2002-11-22 10:56:30 (UTC) |
|---|---|---|
| committer | simon <simon> | 2002-11-22 10:56:30 (UTC) |
| commit | 480284c491e26427c630131a25e56f9ed1d129b2 (patch) (side-by-side diff) | |
| tree | 3bdd60afe34e8c466fbea92dcf89fcab381b110d /inputmethods/multikey/keyboard.h | |
| parent | 772c1321e4e95a415b9de700c3474f81f98b5482 (diff) | |
| download | opie-480284c491e26427c630131a25e56f9ed1d129b2.zip opie-480284c491e26427c630131a25e56f9ed1d129b2.tar.gz opie-480284c491e26427c630131a25e56f9ed1d129b2.tar.bz2 | |
- 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)
Diffstat (limited to 'inputmethods/multikey/keyboard.h') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | inputmethods/multikey/keyboard.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index bc74e71..20c5cee 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h @@ -25,6 +25,9 @@ class QTimer; +namespace MultiKey +{ + class KeyboardConfig : public DictFilterConfig { public: @@ -185,4 +188,4 @@ private: ConfigDlg *configdlg; }; - +} // namespace MultiKey |