Merge branch 'master' into feature/bug_550158

1 files changed, 4 insertions, 7 deletions

diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 20cb6ca..066e6f7 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -93,7 +93,7 @@ HtmlHelpIndex::~HtmlHelpIndex()
 }
 
 /*! Stores an item in the index if it is not already present. 
- *  Items are stored in alphetical order, by sorting on the
+ *  Items are stored in alphabetical order, by sorting on the
  *  concatenation of \a level1 and \a level2 (if present).
  *
  *  \param level1 the string at level 1 in the index.
@@ -308,8 +308,7 @@ void HtmlHelp::initialize()
   m_fromUtf8 = portable_iconv_open(str,"UTF-8"); 
   if (m_fromUtf8==(void *)(-1))
   {
-    err("unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
-    exit(1);
+    term("unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
   }
 
   /* open the contents file */
@@ -317,8 +316,7 @@ void HtmlHelp::initialize()
   cf = new QFile(fName);
   if (!cf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fName.data());
-    exit(1);
+    term("Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   cts.setDevice(cf);
@@ -334,8 +332,7 @@ void HtmlHelp::initialize()
   kf = new QFile(fName);
   if (!kf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fName.data());
-    exit(1);
+    term("Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   kts.setDevice(kf);