-rw-r--r-- | library/global.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/library/global.cpp b/library/global.cpp index f7a0767..7bdd0b1 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -221,56 +221,55 @@ const QDawg& Global::fixedDawg() | |||
221 | 221 | ||
222 | fixed_dawg = new QDawg; | 222 | fixed_dawg = new QDawg; |
223 | QString dawgfilename = dictDir() + "/dawg"; | 223 | QString dawgfilename = dictDir() + "/dawg"; |
224 | QString words_lang; | 224 | QString words_lang; |
225 | QStringList langs = Global::languageList(); | 225 | QStringList langs = Global::languageList(); |
226 | for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { | 226 | for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { |
227 | QString lang = *it; | 227 | QString lang = *it; |
228 | words_lang = dictDir() + "/words." + lang; | 228 | words_lang = dictDir() + "/words." + lang; |
229 | QString dawgfilename_lang = dawgfilename + "." + lang; | 229 | QString dawgfilename_lang = dawgfilename + "." + lang; |
230 | if ( QFile::exists(dawgfilename_lang) || | 230 | if ( QFile::exists(dawgfilename_lang) || |
231 | QFile::exists(words_lang) ) { | 231 | QFile::exists(words_lang) ) { |
232 | dawgfilename = dawgfilename_lang; | 232 | dawgfilename = dawgfilename_lang; |
233 | break; | 233 | break; |
234 | } | 234 | } |
235 | } | 235 | } |
236 | QFile dawgfile(dawgfilename); | 236 | QFile dawgfile(dawgfilename); |
237 | 237 | ||
238 | if ( !dawgfile.exists() ) { | 238 | if ( !dawgfile.exists() ) { |
239 | QString fn = dictDir() + "/words"; | 239 | QString fn = dictDir() + "/words"; |
240 | if ( QFile::exists(words_lang) ) | 240 | if ( QFile::exists(words_lang) ) |
241 | fn = words_lang; | 241 | fn = words_lang; |
242 | QFile in(fn); | 242 | QFile in(fn); |
243 | if ( in.open(IO_ReadOnly) ) { | 243 | if ( in.open(IO_ReadOnly) ) { |
244 | fixed_dawg->createFromWords(&in); | 244 | fixed_dawg->createFromWords(&in); |
245 | dawgfile.open(IO_WriteOnly); | 245 | if (dawgfile.open(IO_WriteOnly)) |
246 | fixed_dawg->write(&dawgfile); | 246 | fixed_dawg->write(&dawgfile); |
247 | dawgfile.close(); | 247 | dawgfile.close(); |
248 | } | 248 | } |
249 | } else { | 249 | } else |
250 | fixed_dawg->readFile(dawgfilename); | 250 | fixed_dawg->readFile(dawgfilename); |
251 | } | 251 | } |
252 | } | ||
253 | 252 | ||
254 | return *fixed_dawg; | 253 | return *fixed_dawg; |
255 | } | 254 | } |
256 | 255 | ||
257 | /*! | 256 | /*! |
258 | Returns the changeable QDawg that contains general | 257 | Returns the changeable QDawg that contains general |
259 | words for the current locale. | 258 | words for the current locale. |
260 | 259 | ||
261 | \sa fixedDawg() | 260 | \sa fixedDawg() |
262 | */ | 261 | */ |
263 | const QDawg& Global::addedDawg() | 262 | const QDawg& Global::addedDawg() |
264 | { | 263 | { |
265 | return dawg("local"); | 264 | return dawg("local"); |
266 | } | 265 | } |
267 | 266 | ||
268 | /*! | 267 | /*! |
269 | Returns the QDawg with the given \a name. | 268 | Returns the QDawg with the given \a name. |
270 | This is an application-specific word list. | 269 | This is an application-specific word list. |
271 | 270 | ||
272 | \a name should not contain "/". | 271 | \a name should not contain "/". |
273 | */ | 272 | */ |
274 | const QDawg& Global::dawg(const QString& name) | 273 | const QDawg& Global::dawg(const QString& name) |
275 | { | 274 | { |
276 | createDocDir(); | 275 | createDocDir(); |