summaryrefslogtreecommitdiff
authorbrad <brad>2004-04-16 15:32:25 (UTC)
committer brad <brad>2004-04-16 15:32:25 (UTC)
commit96ae95dd09bbe982555d434159cfea95fa24a2ca (patch) (unidiff)
tree13230ca6493a33903bc04ab0f42b7eed3432199e
parent3e60dc2a9bd0860feae3ebebdfd5f25ad3ce3b13 (diff)
downloadopie-96ae95dd09bbe982555d434159cfea95fa24a2ca.zip
opie-96ae95dd09bbe982555d434159cfea95fa24a2ca.tar.gz
opie-96ae95dd09bbe982555d434159cfea95fa24a2ca.tar.bz2
Now the graffiti charset is commited, remove the dirty hack I put in a while back.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/handwriting/qimpenprofile.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/inputmethods/handwriting/qimpenprofile.cpp b/inputmethods/handwriting/qimpenprofile.cpp
index 67343c3..180b0b0 100644
--- a/inputmethods/handwriting/qimpenprofile.cpp
+++ b/inputmethods/handwriting/qimpenprofile.cpp
@@ -115,98 +115,96 @@ void QIMPenProfile::loadData()
115 if ( !s.isEmpty() ) { 115 if ( !s.isEmpty() ) {
116 combining = new QIMPenCombining( baseDir + "qimpen/" + s ); 116 combining = new QIMPenCombining( baseDir + "qimpen/" + s );
117 if ( combining->isEmpty() ) { 117 if ( combining->isEmpty() ) {
118 delete combining; 118 delete combining;
119 combining = 0; 119 combining = 0;
120 } 120 }
121 } 121 }
122 // uppercase latin1 122 // uppercase latin1
123 QIMPenCharSet *cs = 0; 123 QIMPenCharSet *cs = 0;
124 s = config.readEntry( "Uppercase" ); 124 s = config.readEntry( "Uppercase" );
125 if ( !s.isEmpty() && !mono() ) { 125 if ( !s.isEmpty() && !mono() ) {
126 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 126 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
127 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 127 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
128 if ( !cs->isEmpty() ) { 128 if ( !cs->isEmpty() ) {
129 if ( combining ) 129 if ( combining )
130 combining->addCombined( cs ); 130 combining->addCombined( cs );
131 sets.append( cs ); 131 sets.append( cs );
132 } else { 132 } else {
133 delete cs; 133 delete cs;
134 } 134 }
135 } 135 }
136 // lowercase latin1 136 // lowercase latin1
137 s = config.readEntry( "Lowercase" ); 137 s = config.readEntry( "Lowercase" );
138 if ( !s.isEmpty() ) { 138 if ( !s.isEmpty() ) {
139 if ( mono() ) { 139 if ( mono() ) {
140 cs = new QIMPenCharSet ( baseDir + "qimpen/" + s ); 140 cs = new QIMPenCharSet ( baseDir + "qimpen/" + s );
141 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 141 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
142 if ( !cs->isEmpty() ) { 142 if ( !cs->isEmpty() ) {
143 cs->setTitle( cs->title().upper() ); 143 cs->setTitle( cs->title().upper() );
144 cs->setType( QIMPenCharSet::Upper ); 144 cs->setType( QIMPenCharSet::Upper );
145 cs->setDescription( "Hidden uppercase" ); 145 cs->setDescription( "Hidden uppercase" );
146 cs->setHidden ( true ); 146 cs->setHidden ( true );
147 QIMPenCharIterator it( cs->characters() ); 147 QIMPenCharIterator it( cs->characters() );
148 for ( ; it.current(); ++it ) { 148 for ( ; it.current(); ++it ) {
149 uint ch = it.current()->character(); 149 uint ch = it.current()->character();
150 if ( ch >= 'a' && ch <= 'z' ) 150 if ( ch >= 'a' && ch <= 'z' )
151 it.current()->setCharacter( QChar(ch).upper() ); 151 it.current()->setCharacter( QChar(ch).upper() );
152 } 152 }
153 if ( combining ) 153 if ( combining )
154 combining->addCombined( cs ); 154 combining->addCombined( cs );
155 sets.append( cs ); 155 sets.append( cs );
156 } else { 156 } else {
157 delete cs; 157 delete cs;
158 } 158 }
159 } 159 }
160 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 160 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
161 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 161 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
162 if ( !cs->isEmpty() ) { 162 if ( !cs->isEmpty() ) {
163 if ( mono () )
164 cs->setDescription( "Latin Characters" );
165 if ( combining ) 163 if ( combining )
166 combining->addCombined( cs ); 164 combining->addCombined( cs );
167 sets.append( cs ); 165 sets.append( cs );
168 } else { 166 } else {
169 delete cs; 167 delete cs;
170 } 168 }
171 } 169 }
172 // numeric (may comtain punctuation and symbols) 170 // numeric (may comtain punctuation and symbols)
173 s = config.readEntry( "Numeric" ); 171 s = config.readEntry( "Numeric" );
174 if ( !s.isEmpty() ) { 172 if ( !s.isEmpty() ) {
175 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 173 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
176 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 174 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
177 if ( !cs->isEmpty() ) { 175 if ( !cs->isEmpty() ) {
178 sets.append( cs ); 176 sets.append( cs );
179 } else { 177 } else {
180 delete cs; 178 delete cs;
181 } 179 }
182 } 180 }
183 // punctuation 181 // punctuation
184 s = config.readEntry( "Punctuation" ); 182 s = config.readEntry( "Punctuation" );
185 if ( !s.isEmpty() ) { 183 if ( !s.isEmpty() ) {
186 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 184 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
187 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 185 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
188 if ( !cs->isEmpty() ) { 186 if ( !cs->isEmpty() ) {
189 sets.append( cs ); 187 sets.append( cs );
190 } else { 188 } else {
191 delete cs; 189 delete cs;
192 } 190 }
193 } 191 }
194 // symbol 192 // symbol
195 s = config.readEntry( "Symbol" ); 193 s = config.readEntry( "Symbol" );
196 if ( !s.isEmpty() ) { 194 if ( !s.isEmpty() ) {
197 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 195 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
198 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 196 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
199 if ( !cs->isEmpty() ) { 197 if ( !cs->isEmpty() ) {
200 sets.append( cs ); 198 sets.append( cs );
201 } else { 199 } else {
202 delete cs; 200 delete cs;
203 } 201 }
204 } 202 }
205 // shortcut 203 // shortcut
206 s = config.readEntry( "Shortcut" ); 204 s = config.readEntry( "Shortcut" );
207 if ( !s.isEmpty() ) { 205 if ( !s.isEmpty() ) {
208 cs = new QIMPenCharSet( baseDir + "qimpen/" + s ); 206 cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
209 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User ); 207 cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
210 if ( !cs->isEmpty() ) { 208 if ( !cs->isEmpty() ) {
211 sets.append( cs ); 209 sets.append( cs );
212 } else { 210 } else {