1 files changed, 31 insertions, 32 deletions

diff --git a/library/global.cpp b/library/global.cpp
index f7a0767..7bdd0b1 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -155,161 +155,160 @@ static QString dictDir()
   \section1 User Interface
 
   The statusMessage() function provides short-duration messages to the
   user. The showInputMethod() function shows the current input method,
   and hideInputMethod() hides the input method.
 
   \section1 Document related
 
   The findDocuments() function creates a set of \link doclnk.html
   DocLnk\endlink objects in a particular folder.
 
   \section1 Filesystem related
 
   Global provides an applicationFileName() function that returns the
   full path of an application-specific file.
 
   The execute() function runs an application.
 
   \section1 Word list related
 
   A list of words relevant to the current locale is maintained by the
   system. The list is held in a \link qdawg.html DAWG\endlink
   (implemented by the QDawg class). This list is used, for example, by
   the pickboard input method.
 
   The global QDawg is returned by fixedDawg(); this cannot be updated.
   An updatable copy of the global QDawg is returned by addedDawg().
   Applications may have their own word lists stored in \l{QDawg}s
   which are returned by dawg(). Use addWords() to add words to the
   updateable copy of the global QDawg or to named application
   \l{QDawg}s.
 
   \section1 Quoting
 
   The shellQuote() function quotes a string suitable for passing to a
   shell. The stringQuote() function backslash escapes '\' and '"'
   characters.
 
   \section1 Hardware
 
   The implementation of the writeHWClock() function depends on the AlarmServer
   implementation. If the AlarmServer is using atd the clock will be synced to
   hardware. If opie-alarm is used the hardware clock will be synced before
   suspending the device. opie-alarm is used by iPAQ and Zaurii implementation
 
   \ingroup qtopiaemb
 */
 
 /*!
   \internal
 */
 Global::Global()
 {
 }
 
 /*!
   Returns the unchangeable QDawg that contains general
   words for the current locale.
 
   \sa addedDawg()
 */
 const QDawg& Global::fixedDawg()
 {
     if ( !fixed_dawg ) {
-    if ( !docDirCreated )
-        createDocDir();
-
-    fixed_dawg = new QDawg;
-    QString dawgfilename = dictDir() + "/dawg";
-    QString words_lang;
-    QStringList langs = Global::languageList();
-    for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
-        QString lang = *it;
-        words_lang = dictDir() + "/words." + lang;
-        QString dawgfilename_lang = dawgfilename + "." + lang;
-        if ( QFile::exists(dawgfilename_lang) ||
-         QFile::exists(words_lang) ) {
-        dawgfilename = dawgfilename_lang;
-        break;
-        }
-    }
-    QFile dawgfile(dawgfilename);
-
-    if ( !dawgfile.exists() ) {
-        QString fn = dictDir() + "/words";
-        if ( QFile::exists(words_lang) )
-        fn = words_lang;
-        QFile in(fn);
-        if ( in.open(IO_ReadOnly) ) {
-        fixed_dawg->createFromWords(&in);
-        dawgfile.open(IO_WriteOnly);
-        fixed_dawg->write(&dawgfile);
-        dawgfile.close();
+        if ( !docDirCreated )
+            createDocDir();
+
+        fixed_dawg = new QDawg;
+        QString dawgfilename = dictDir() + "/dawg";
+        QString words_lang;
+        QStringList langs = Global::languageList();
+        for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
+            QString lang = *it;
+            words_lang = dictDir() + "/words." + lang;
+            QString dawgfilename_lang = dawgfilename + "." + lang;
+            if ( QFile::exists(dawgfilename_lang) ||
+                 QFile::exists(words_lang) ) {
+                dawgfilename = dawgfilename_lang;
+                break;
+            }
         }
-    } else {
-        fixed_dawg->readFile(dawgfilename);
-    }
+        QFile dawgfile(dawgfilename);
+
+        if ( !dawgfile.exists() ) {
+            QString fn = dictDir() + "/words";
+            if ( QFile::exists(words_lang) )
+                fn = words_lang;
+            QFile in(fn);
+            if ( in.open(IO_ReadOnly) ) {
+                fixed_dawg->createFromWords(&in);
+                if (dawgfile.open(IO_WriteOnly))
+                    fixed_dawg->write(&dawgfile);
+                dawgfile.close();
+            }
+        } else
+            fixed_dawg->readFile(dawgfilename);
     }
 
     return *fixed_dawg;
 }
 
 /*!
   Returns the changeable QDawg that contains general
   words for the current locale.
 
   \sa fixedDawg()
 */
 const QDawg& Global::addedDawg()
 {
     return dawg("local");
 }
 
 /*!
   Returns the QDawg with the given \a name.
   This is an application-specific word list.
 
   \a name should not contain "/".
 */
 const QDawg& Global::dawg(const QString& name)
 {
     createDocDir();
     if ( !named_dawg )
     named_dawg = new QDict<QDawg>;
     QDawg* r = named_dawg->find(name);
     if ( !r ) {
     r = new QDawg;
     named_dawg->insert(name,r);
     QString dawgfilename = applicationFileName("Dictionary", name ) + ".dawg";
     QFile dawgfile(dawgfilename);
     if ( dawgfile.open(IO_ReadOnly) )
         r->readFile(dawgfilename);
     }
     return *r;
 }
 
 /*!
   \overload
   Adds \a wordlist to the addedDawg().
 
   Note that the addition of words persists between program executions
   (they are saved in the dictionary files), so you should confirm the
   words with the user before adding them.
 */
 void Global::addWords(const QStringList& wordlist)
 {
     addWords("local",wordlist);
 }
 
 /*!
   \overload
   Adds \a wordlist to the addedDawg().
 
   Note that the addition of words persists between program executions
   (they are saved in the dictionary files), so you should confirm the
   words with the user before adding them.
 */
 void Global::addWords(const QString& dictname, const QStringList& wordlist)
 {
     QDawg& d = (QDawg&)dawg(dictname);
     QStringList all = d.allWords() + wordlist;