From df46e40ccba2f3bed67291a088f7d3cf654e6981 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Fri, 12 Oct 2001 14:05:47 +0000
Subject: [PATCH] =?utf8?q?Andr=EF=BF=BD's=20cosmetic=20changes=20to=20sp?=
 =?utf8?q?=5Fspell.C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2873 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/sp_spell.C | 56 +++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/sp_spell.C b/src/sp_spell.C
index 40d54da873..ce6323cfaa 100644
--- a/src/sp_spell.C
+++ b/src/sp_spell.C
@@ -78,12 +78,14 @@ PSpell::PSpell()
 {
 }
 
+
 PSpell::PSpell(BufferParams const & params, string const & lang)
 	: sc(0), els(0), spell_error_object(0), flag(ISP_UNKNOWN)
 {
 	initialize(params, lang);
 }
 
+
 PSpell::~PSpell() 
 {
 	cleanUp();
@@ -176,11 +178,13 @@ char const * PSpell::nextMiss()
 	return "";
 }
 
+
 char const * PSpell::error()
 {
 	return error_;
 }
 
+
 void PSpell::sigchldhandler(pid_t pid, int * status)
 {
 	sigchldchecker(pid, status);
@@ -193,16 +197,13 @@ void PSpell::sigchldhandler(pid_t pid, int * status)
 ///
 
 ISpell::ISpell()
-{
-	str = 0;
-	flag = ISP_UNKNOWN;
-}
+	: str(0), flag(ISP_UNKNOWN)
+{}
 
 
 ISpell::ISpell(BufferParams const & params, string const & lang)
+	: str(0), flag(ISP_UNKNOWN)
 {
-	str = 0;
-	flag = ISP_UNKNOWN;
 	initialize(params, lang);
 }
 
@@ -226,7 +227,8 @@ char const * ISpell::nextMiss()
 void ISpell::initialize(BufferParams const & params, string const & lang)
 {
 	static char o_buf[BUFSIZ];  // jc: it could be smaller
-	int pipein[2], pipeout[2];
+	int pipein[2];
+	int pipeout[2];
 	char * argv[14];
 	int argc;
 
@@ -330,7 +332,8 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
 				: params.inputenc;
 			string::size_type n = enc.length();
 			tmp = new char[3];
-			string("-T").copy(tmp, 2); tmp[2] = '\0';
+			string("-T").copy(tmp, 2);
+			tmp[2] = '\0';
 			argv[argc++] = tmp; // Input encoding
 			tmp = new char[n + 1];
 			enc.copy(tmp, n);
@@ -344,7 +347,7 @@ void ISpell::initialize(BufferParams const & params, string const & lang)
 
 		// free the memory used by string::copy in the
 		// setup of argv
-		for (int i= 0; i < argc -1; ++i)
+		for (int i = 0; i < argc - 1; ++i)
 			delete[] argv[i];
 		
 		lyxerr << "LyX: Failed to start ispell!" << endl;
@@ -439,8 +442,8 @@ enum ISpell::spellStatus ISpell::check(string const & word)
 	char buf[1024];
 	::fgets(buf, 1024, in); 
   
-	/* I think we have to check if ispell is still alive here because
-	   the signal-handler could have disabled blocking on the fd */
+	// I think we have to check if ispell is still alive here because
+	// the signal-handler could have disabled blocking on the fd 
 	if (!alive()) return ISP_UNKNOWN;
 
 	switch (*buf) {
@@ -483,10 +486,10 @@ enum ISpell::spellStatus ISpell::check(string const & word)
 
 void ISpell::close()
 {
-        // Note: If you decide to optimize this out when it is not 
-        // needed please note that when Aspell is used this command 
-        // is also needed to save the replacement dictionary.
-        // -- Kevin Atkinson (kevinatk@home.com)
+	// Note: If you decide to optimize this out when it is not 
+	// needed please note that when Aspell is used this command 
+	// is also needed to save the replacement dictionary.
+	// -- Kevin Atkinson (kevinatk@home.com)
 
 	fputs("#\n", out); // Save personal dictionary
 
@@ -513,13 +516,13 @@ void ISpell::accept(string const & word)
 
 void ISpell::store(string const & mis, string const & cor)
 {
-        if (actual_spell_checker == ASC_ASPELL) {
-                ::fputs("$$ra ", out);
-                ::fputs(mis.c_str(), out);
-                ::fputc(',', out);
-                ::fputs(cor.c_str(), out);
-                ::fputc('\n', out);
-        }
+	if (actual_spell_checker == ASC_ASPELL) {
+		::fputs("$$ra ", out);
+		::fputs(mis.c_str(), out);
+		::fputc(',', out);
+		::fputs(cor.c_str(), out);
+		::fputc('\n', out);
+	}
 }
 
 
@@ -527,15 +530,16 @@ void ISpell::sigchldhandler(pid_t pid, int * status)
 {
 	if (isp_pid > 0) {
 		if (pid == isp_pid) {
-			isp_pid= -1;
-			fcntl(isp_fd, F_SETFL, O_NONBLOCK); /* set the file descriptor
-							       to nonblocking so we can 
-							       continue */
+			isp_pid = -1;
+			// set the file descriptor to nonblocking so we can
+			// continue 
+			fcntl(isp_fd, F_SETFL, O_NONBLOCK);
 		}
 	}
 	sigchldchecker(pid, status);
 }
 
+
 char const * ISpell::error()
 {
 	return error_;
-- 
2.39.2