X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fspellchecker.C;h=5bedccdd96895695a95babc8c80598dbf4e200ad;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=7e72553e74e5a10ed3826e9da52d154382bccbf7;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/spellchecker.C b/src/spellchecker.C
index 7e72553e74..5bedccdd96 100644
--- a/src/spellchecker.C
+++ b/src/spellchecker.C
@@ -14,7 +14,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <csignal>
@@ -47,6 +46,8 @@
 #include "BufferView.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h"
+#include "debug.h"
+#include "support/lstrings.h"
 
 extern LyXRC *lyxrc;
 extern BufferView *current_view;
@@ -233,17 +234,19 @@ void create_ispell_pipe(string const & lang)
 	isp_pid = -1;
 
 	if(pipe(pipein)==-1 || pipe(pipeout)==-1) {
-		fprintf(stderr,"LyX: Can't create pipe for spellchecker!");
+		lyxerr << "LyX: Can't create pipe for spellchecker!" << endl;
 		return;
 	}
 
 	if ((out = fdopen(pipein[1], "w"))==0) {
-		fprintf(stderr,"LyX: Can't create stream for pipe for spellchecker!");
+		lyxerr << "LyX: Can't create stream for pipe for spellchecker!"
+		       << endl;
 		return;
 	}
 
 	if ((in = fdopen(pipeout[0], "r"))==0) {
-		fprintf(stderr,"LyX: Can't create stream for pipe for spellchecker!");
+		lyxerr <<"LyX: Can't create stream for pipe for spellchecker!"
+		       << endl;
 		return;
 	}
 
@@ -254,7 +257,8 @@ void create_ispell_pipe(string const & lang)
 	isp_pid = fork();
 
 	if(isp_pid==-1) {
-		fprintf(stderr,"LyX: Can't create child process for spellchecker!");
+		lyxerr << "LyX: Can't create child process for spellchecker!"
+		       << endl;
 		return;
 	}
 
@@ -340,7 +344,7 @@ void create_ispell_pipe(string const & lang)
 		for (int i=0; i < argc -1; i++)
 			delete[] argv[i];
 		
-		fprintf(stderr, "LyX: Failed to start ispell!\n");
+		lyxerr << "LyX: Failed to start ispell!" << endl;
 		_exit(0);
 	}
 
@@ -349,9 +353,6 @@ void create_ispell_pipe(string const & lang)
 	// Actually I used it to tell if it's truly Ispell or if it's
 	// aspell -- (kevinatk@home.com)
 	char buf[2048];
-#ifdef WITH_WARNINGS
-#warning verify that this works.
-#endif
 	fd_set infds;
 	struct timeval tv;
 	int retval = 0;
@@ -382,17 +383,15 @@ void create_ispell_pipe(string const & lang)
 		
 	} else if (retval == 0) {
 		// timeout. Give nice message to user.
-		fprintf(stderr, "Ispell read timed out, what now?\n");
-#ifdef WITH_WARNINGS
-#warning Is this the correct thing to do?
-#endif
+		lyxerr << "Ispell read timed out, what now?" << endl;
+		// This probably works but could need some thought
 		isp_pid = -1;
 		close(pipeout[0]); close(pipeout[1]);
 		close(pipein[0]); close(pipein[1]);
 		isp_fd = -1;
 	} else {
 		// Select returned error
-		fprintf(stderr, "Select on ispell returned error, what now?\n");
+		lyxerr << "Select on ispell returned error, what now?" << endl;
 	}
 }
 
@@ -767,7 +766,7 @@ bool RunSpellChecker(string const & lang)
 	if(isp_pid!=-1) {
 		ispell_terminate();
 		string word_msg;
-		word_msg += int(word_count);
+		word_msg += tostr(word_count);
 		if (word_count != 1) {
 			word_msg += _(" words checked.");
 		} else {