author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/inputmethodinterface.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
Diffstat (limited to 'library/inputmethodinterface.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | library/inputmethodinterface.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/library/inputmethodinterface.h b/library/inputmethodinterface.h index ae14218..88a121d 100644 --- a/library/inputmethodinterface.h +++ b/library/inputmethodinterface.h | |||
@@ -1,8 +1,8 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
@@ -35,8 +35,9 @@ | |||
35 | 35 | ||
36 | class QWidget; | 36 | class QWidget; |
37 | class QPixmap; | 37 | class QPixmap; |
38 | class QObject; | 38 | class QObject; |
39 | class QWSInputMethod; | ||
39 | 40 | ||
40 | struct InputMethodInterface : public QUnknownInterface | 41 | struct InputMethodInterface : public QUnknownInterface |
41 | { | 42 | { |
42 | virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ) = 0; | 43 | virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ) = 0; |
@@ -45,5 +46,19 @@ struct InputMethodInterface : public QUnknownInterface | |||
45 | virtual QString name() = 0; | 46 | virtual QString name() = 0; |
46 | virtual void onKeyPress( QObject *receiver, const char *slot ) = 0; | 47 | virtual void onKeyPress( QObject *receiver, const char *slot ) = 0; |
47 | }; | 48 | }; |
48 | 49 | ||
50 | // {70F0991C-8282-4625-A279-BD9D7D959FF6} | ||
51 | #ifndef IID_ExtInputMethod | ||
52 | #define IID_ExtInputMethod QUuid( 0x70f0991c, 0x8282, 0x4625, 0xa2, 0x79, 0xbd, 0x9d, 0x7d, 0x95, 0x9f, 0xf6) | ||
53 | #endif | ||
54 | |||
55 | struct ExtInputMethodInterface : public QUnknownInterface | ||
56 | { | ||
57 | virtual QWSInputMethod *inputMethod() = 0; | ||
58 | virtual QPixmap *icon() = 0; | ||
59 | virtual QString name() = 0; | ||
60 | virtual QWidget *widget( QWidget *parent, Qt::WFlags f )= 0; | ||
61 | }; | ||
62 | |||
63 | |||
49 | #endif | 64 | #endif |