summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherImpl.cc2
-rw-r--r--inputmethods/dvorak/dvorakimpl.cpp2
-rw-r--r--inputmethods/handwriting/handwritingimpl.cpp2
-rw-r--r--inputmethods/jumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/keyboard/keyboardimpl.cpp2
-rw-r--r--inputmethods/kjumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/multikey/keyboardimpl.cpp2
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp2
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.cpp2
9 files changed, 18 insertions, 0 deletions
diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc
index 55c21b1..9513802 100644
--- a/inputmethods/dasher/QtDasherImpl.cc
+++ b/inputmethods/dasher/QtDasherImpl.cc
@@ -50,36 +50,38 @@ QPixmap *QtDasherImpl::icon()
50 if ( !icn ) 50 if ( !icn )
51 icn = new QPixmap( (const char **)qtdasher_xpm ); 51 icn = new QPixmap( (const char **)qtdasher_xpm );
52 return icn; 52 return icn;
53} 53}
54 54
55QString QtDasherImpl::name() 55QString QtDasherImpl::name()
56{ 56{
57 return qApp->translate( "InputMethods", "Dasher" ); 57 return qApp->translate( "InputMethods", "Dasher" );
58} 58}
59 59
60void QtDasherImpl::onKeyPress( QObject *receiver, const char *slot ) 60void QtDasherImpl::onKeyPress( QObject *receiver, const char *slot )
61{ 61{
62 if ( qtdasherwidget ) 62 if ( qtdasherwidget )
63 QObject::connect( qtdasherwidget, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 63 QObject::connect( qtdasherwidget, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
64} 64}
65 65
66#ifndef QT_NO_COMPONENT 66#ifndef QT_NO_COMPONENT
67QRESULT QtDasherImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 67QRESULT QtDasherImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
68{ 68{
69 *iface = 0; 69 *iface = 0;
70 if ( uuid == IID_QUnknown ) 70 if ( uuid == IID_QUnknown )
71 *iface = this; 71 *iface = this;
72 else if ( uuid == IID_InputMethod ) 72 else if ( uuid == IID_InputMethod )
73 *iface = this; 73 *iface = this;
74 else
75 return QS_FALSE;
74 76
75 if ( *iface ) 77 if ( *iface )
76 (*iface)->addRef(); 78 (*iface)->addRef();
77 return QS_OK; 79 return QS_OK;
78} 80}
79 81
80Q_EXPORT_INTERFACE() 82Q_EXPORT_INTERFACE()
81{ 83{
82 Q_CREATE_INSTANCE( QtDasherImpl ) 84 Q_CREATE_INSTANCE( QtDasherImpl )
83} 85}
84#endif 86#endif
85 87
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 8050ce1..9e9fed9 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -96,35 +96,37 @@ QPixmap *KeyboardImpl::icon()
96 if ( !icn ) 96 if ( !icn )
97 icn = new QPixmap( (const char **)kb_xpm ); 97 icn = new QPixmap( (const char **)kb_xpm );
98 return icn; 98 return icn;
99} 99}
100 100
101QString KeyboardImpl::name() 101QString KeyboardImpl::name()
102{ 102{
103 return qApp->translate( "InputMethods", "Dvorak" ); 103 return qApp->translate( "InputMethods", "Dvorak" );
104} 104}
105 105
106void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 106void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
107{ 107{
108 if ( input ) 108 if ( input )
109 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 109 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
110} 110}
111 111
112#ifndef QT_NO_COMPONENT 112#ifndef QT_NO_COMPONENT
113QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 113QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
114{ 114{
115 *iface = 0; 115 *iface = 0;
116 if ( uuid == IID_QUnknown ) 116 if ( uuid == IID_QUnknown )
117 *iface = this; 117 *iface = this;
118 else if ( uuid == IID_InputMethod ) 118 else if ( uuid == IID_InputMethod )
119 *iface = this; 119 *iface = this;
120 else
121 return QS_FALSE;
120 122
121 if ( *iface ) 123 if ( *iface )
122 (*iface)->addRef(); 124 (*iface)->addRef();
123 return QS_OK; 125 return QS_OK;
124} 126}
125 127
126Q_EXPORT_INTERFACE() 128Q_EXPORT_INTERFACE()
127{ 129{
128 Q_CREATE_INSTANCE( KeyboardImpl ) 130 Q_CREATE_INSTANCE( KeyboardImpl )
129} 131}
130#endif 132#endif
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index c39e1aa..22e2058 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -79,35 +79,37 @@ QPixmap *HandwritingImpl::icon()
79 if ( !icn ) 79 if ( !icn )
80 icn = new QPixmap( (const char **)pen_xpm ); 80 icn = new QPixmap( (const char **)pen_xpm );
81 return icn; 81 return icn;
82} 82}
83 83
84QString HandwritingImpl::name() 84QString HandwritingImpl::name()
85{ 85{
86 return qApp->translate( "InputMethods", "Handwriting" ); 86 return qApp->translate( "InputMethods", "Handwriting" );
87} 87}
88 88
89void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot ) 89void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
90{ 90{
91 if ( input ) 91 if ( input )
92 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 92 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
93} 93}
94 94
95#ifndef QT_NO_COMPONENT 95#ifndef QT_NO_COMPONENT
96QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 96QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
97{ 97{
98 *iface = 0; 98 *iface = 0;
99 if ( uuid == IID_QUnknown ) 99 if ( uuid == IID_QUnknown )
100 *iface = this; 100 *iface = this;
101 else if ( uuid == IID_InputMethod ) 101 else if ( uuid == IID_InputMethod )
102 *iface = this; 102 *iface = this;
103 else
104 return QS_FALSE;
103 105
104 if ( *iface ) 106 if ( *iface )
105 (*iface)->addRef(); 107 (*iface)->addRef();
106 return QS_OK; 108 return QS_OK;
107} 109}
108 110
109Q_EXPORT_INTERFACE() 111Q_EXPORT_INTERFACE()
110{ 112{
111 Q_CREATE_INSTANCE( HandwritingImpl ) 113 Q_CREATE_INSTANCE( HandwritingImpl )
112} 114}
113#endif 115#endif
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 34c227f..e75dd5f 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -63,35 +63,37 @@ QPixmap *KeyboardImpl::icon()
63 if ( !icn ) 63 if ( !icn )
64 icn = new QPixmap( (const char **)icon_xpm ); 64 icn = new QPixmap( (const char **)icon_xpm );
65 return icn; 65 return icn;
66} 66}
67 67
68QString KeyboardImpl::name() 68QString KeyboardImpl::name()
69{ 69{
70 return qApp->translate( "InputMethods", "JumpX" ); 70 return qApp->translate( "InputMethods", "JumpX" );
71} 71}
72 72
73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
74{ 74{
75 if ( input ) 75 if ( input )
76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
77} 77}
78 78
79#ifndef QT_NO_COMPONENT 79#ifndef QT_NO_COMPONENT
80QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 80QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
81{ 81{
82 *iface = 0; 82 *iface = 0;
83 if ( uuid == IID_QUnknown ) 83 if ( uuid == IID_QUnknown )
84 *iface = this; 84 *iface = this;
85 else if ( uuid == IID_InputMethod ) 85 else if ( uuid == IID_InputMethod )
86 *iface = this; 86 *iface = this;
87 else
88 return QS_FALSE;
87 89
88 if ( *iface ) 90 if ( *iface )
89 (*iface)->addRef(); 91 (*iface)->addRef();
90 return QS_OK; 92 return QS_OK;
91} 93}
92 94
93Q_EXPORT_INTERFACE() 95Q_EXPORT_INTERFACE()
94{ 96{
95 Q_CREATE_INSTANCE( KeyboardImpl ) 97 Q_CREATE_INSTANCE( KeyboardImpl )
96} 98}
97#endif 99#endif
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index 3c77fe6..701d35f 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -94,35 +94,37 @@ QPixmap *KeyboardImpl::icon()
94 if ( !icn ) 94 if ( !icn )
95 icn = new QPixmap( (const char **)kb_xpm ); 95 icn = new QPixmap( (const char **)kb_xpm );
96 return icn; 96 return icn;
97} 97}
98 98
99QString KeyboardImpl::name() 99QString KeyboardImpl::name()
100{ 100{
101 return qApp->translate( "InputMethods", "Keyboard" ); 101 return qApp->translate( "InputMethods", "Keyboard" );
102} 102}
103 103
104void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 104void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
105{ 105{
106 if ( input ) 106 if ( input )
107 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 107 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
108} 108}
109 109
110#ifndef QT_NO_COMPONENT 110#ifndef QT_NO_COMPONENT
111QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 111QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
112{ 112{
113 *iface = 0; 113 *iface = 0;
114 if ( uuid == IID_QUnknown ) 114 if ( uuid == IID_QUnknown )
115 *iface = this; 115 *iface = this;
116 else if ( uuid == IID_InputMethod ) 116 else if ( uuid == IID_InputMethod )
117 *iface = this; 117 *iface = this;
118 else
119 return QS_FALSE;
118 120
119 if ( *iface ) 121 if ( *iface )
120 (*iface)->addRef(); 122 (*iface)->addRef();
121 return QS_OK; 123 return QS_OK;
122} 124}
123 125
124Q_EXPORT_INTERFACE() 126Q_EXPORT_INTERFACE()
125{ 127{
126 Q_CREATE_INSTANCE( KeyboardImpl ) 128 Q_CREATE_INSTANCE( KeyboardImpl )
127} 129}
128#endif 130#endif
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 976d816..54fe36e 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -63,35 +63,37 @@ QPixmap *KeyboardImpl::icon()
63 if ( !icn ) 63 if ( !icn )
64 icn = new QPixmap( (const char **)icon_xpm ); 64 icn = new QPixmap( (const char **)icon_xpm );
65 return icn; 65 return icn;
66} 66}
67 67
68QString KeyboardImpl::name() 68QString KeyboardImpl::name()
69{ 69{
70 return qApp->translate( "InputMethods", "KJumpX" ); 70 return qApp->translate( "InputMethods", "KJumpX" );
71} 71}
72 72
73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
74{ 74{
75 if ( input ) 75 if ( input )
76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
77} 77}
78 78
79#ifndef QT_NO_COMPONENT 79#ifndef QT_NO_COMPONENT
80QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 80QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
81{ 81{
82 *iface = 0; 82 *iface = 0;
83 if ( uuid == IID_QUnknown ) 83 if ( uuid == IID_QUnknown )
84 *iface = this; 84 *iface = this;
85 else if ( uuid == IID_InputMethod ) 85 else if ( uuid == IID_InputMethod )
86 *iface = this; 86 *iface = this;
87 else
88 return QS_FALSE;
87 89
88 if ( *iface ) 90 if ( *iface )
89 (*iface)->addRef(); 91 (*iface)->addRef();
90 return QS_OK; 92 return QS_OK;
91} 93}
92 94
93Q_EXPORT_INTERFACE() 95Q_EXPORT_INTERFACE()
94{ 96{
95 Q_CREATE_INSTANCE( KeyboardImpl ) 97 Q_CREATE_INSTANCE( KeyboardImpl )
96} 98}
97#endif 99#endif
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp
index 4cfbcd5..b7908d9 100644
--- a/inputmethods/multikey/keyboardimpl.cpp
+++ b/inputmethods/multikey/keyboardimpl.cpp
@@ -73,35 +73,37 @@ QPixmap *KeyboardImpl::icon()
73 if ( !icn ) 73 if ( !icn )
74 icn = new QPixmap( (const char **)kb_xpm ); 74 icn = new QPixmap( (const char **)kb_xpm );
75 return icn; 75 return icn;
76} 76}
77 77
78QString KeyboardImpl::name() 78QString KeyboardImpl::name()
79{ 79{
80 return qApp->translate( "InputMethods", "Multikey" ); 80 return qApp->translate( "InputMethods", "Multikey" );
81} 81}
82 82
83void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 83void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
84{ 84{
85 if ( input ) 85 if ( input )
86 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 86 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
87} 87}
88 88
89#ifndef QT_NO_COMPONENT 89#ifndef QT_NO_COMPONENT
90QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 90QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
91{ 91{
92 *iface = 0; 92 *iface = 0;
93 if ( uuid == IID_QUnknown ) 93 if ( uuid == IID_QUnknown )
94 *iface = this; 94 *iface = this;
95 else if ( uuid == IID_InputMethod ) 95 else if ( uuid == IID_InputMethod )
96 *iface = this; 96 *iface = this;
97 else
98 return QS_FALSE;
97 99
98 if ( *iface ) 100 if ( *iface )
99 (*iface)->addRef(); 101 (*iface)->addRef();
100 return QS_OK; 102 return QS_OK;
101} 103}
102 104
103Q_EXPORT_INTERFACE() 105Q_EXPORT_INTERFACE()
104{ 106{
105 Q_CREATE_INSTANCE( KeyboardImpl ) 107 Q_CREATE_INSTANCE( KeyboardImpl )
106} 108}
107#endif 109#endif
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index a4e8f02..8f449cd 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -66,36 +66,38 @@ QPixmap *PickboardImpl::icon()
66 if ( !icn ) 66 if ( !icn )
67 icn = new QPixmap( (const char **)pb_xpm ); 67 icn = new QPixmap( (const char **)pb_xpm );
68 return icn; 68 return icn;
69} 69}
70 70
71QString PickboardImpl::name() 71QString PickboardImpl::name()
72{ 72{
73 return qApp->translate( "InputMethods", "Pickboard" ); 73 return qApp->translate( "InputMethods", "Pickboard" );
74} 74}
75 75
76void PickboardImpl::onKeyPress( QObject *receiver, const char *slot ) 76void PickboardImpl::onKeyPress( QObject *receiver, const char *slot )
77{ 77{
78 if ( pickboard ) 78 if ( pickboard )
79 QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 79 QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
80} 80}
81 81
82#ifndef QT_NO_COMPONENT 82#ifndef QT_NO_COMPONENT
83QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 83QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
84{ 84{
85 *iface = 0; 85 *iface = 0;
86 if ( uuid == IID_QUnknown ) 86 if ( uuid == IID_QUnknown )
87 *iface = this; 87 *iface = this;
88 else if ( uuid == IID_InputMethod ) 88 else if ( uuid == IID_InputMethod )
89 *iface = this; 89 *iface = this;
90 else
91 return QS_FALSE;
90 92
91 if ( *iface ) 93 if ( *iface )
92 (*iface)->addRef(); 94 (*iface)->addRef();
93 return QS_OK; 95 return QS_OK;
94} 96}
95 97
96Q_EXPORT_INTERFACE() 98Q_EXPORT_INTERFACE()
97{ 99{
98 Q_CREATE_INSTANCE( PickboardImpl ) 100 Q_CREATE_INSTANCE( PickboardImpl )
99} 101}
100#endif 102#endif
101 103
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp
index fe601e0..e7fc00e 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.cpp
+++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp
@@ -70,36 +70,38 @@ QPixmap *UniKeyboardImpl::icon()
70{ 70{
71 if ( !icn ) 71 if ( !icn )
72 icn = new QPixmap( (const char **)uni_xpm ); 72 icn = new QPixmap( (const char **)uni_xpm );
73 return icn; 73 return icn;
74} 74}
75 75
76QString UniKeyboardImpl::name() 76QString UniKeyboardImpl::name()
77{ 77{
78 return qApp->translate( "InputMethods", "Unicode" ); 78 return qApp->translate( "InputMethods", "Unicode" );
79} 79}
80 80
81void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 81void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
82{ 82{
83 if ( input ) 83 if ( input )
84 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 84 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
85} 85}
86 86
87QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 87QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
88{ 88{
89 *iface = 0; 89 *iface = 0;
90 if ( uuid == IID_QUnknown ) 90 if ( uuid == IID_QUnknown )
91 *iface = this; 91 *iface = this;
92 else if ( uuid == IID_InputMethod ) 92 else if ( uuid == IID_InputMethod )
93 *iface = this; 93 *iface = this;
94 else
95 return QS_FALSE;
94 96
95 if ( *iface ) 97 if ( *iface )
96 (*iface)->addRef(); 98 (*iface)->addRef();
97 return QS_OK; 99 return QS_OK;
98} 100}
99 101
100Q_EXPORT_INTERFACE() 102Q_EXPORT_INTERFACE()
101{ 103{
102 Q_CREATE_INSTANCE( UniKeyboardImpl ) 104 Q_CREATE_INSTANCE( UniKeyboardImpl )
103} 105}
104 106
105 107