Every file in this commit has a change to check the return value of a call.

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
@@ -211,49 +211,48 @@ 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.