From 5362b33b0f263cec4218af04b5eebc73218dffe9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 24 Oct 1999 00:57:04 +0000 Subject: [PATCH] some old commented out code removed git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@236 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 11 +++++++++++ src/lyxfunc.C | 6 ------ src/minibuffer.C | 24 ++---------------------- src/spellchecker.C | 7 +------ 4 files changed, 14 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2beac3fe65..ebfb0d9721 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 1999-10-24 Lars Gullik Bjønnes + * src/spellchecker.C (create_ispell_pipe): removed old #warning, + the code has shown itself to work + (create_ispell_pipe): removed another warning, added a comment + instead. + + * src/minibuffer.C (ExecutingCB): removed code that has been + commented out a long time + + * src/lyxfunc.C (processKeyEvent): removed some very old commented + out code + a warning. + * src/support/lyxstring.h: comment out the three private operators, when compiling with string ansi conforming compilers they make problems. diff --git a/src/lyxfunc.C b/src/lyxfunc.C index a3b0734b34..8ac1df0c70 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -303,12 +303,6 @@ int LyXFunc::processKeyEvent(XEvent *ev) Dispatch(action, argument.c_str()); show_sc = tmp_sc; - // Need this for deadkeys (alkis) - //keyseq.length=0; - // ...but that breaks the minibuffer's display of "M-"... -#ifdef WITH_WARNINGS -#warning How does the deadkeys react to this? -#endif return 0; } diff --git a/src/minibuffer.C b/src/minibuffer.C index b23dfe6227..b253786c74 100644 --- a/src/minibuffer.C +++ b/src/minibuffer.C @@ -51,8 +51,6 @@ void MiniBuffer::ExecutingCB(FL_OBJECT *ob, long) obj->addHistory(obj->cur_cmd); // Split command into function and argument - // This is done wrong Asger. Instead of - // it ends up as Queer solution: string arg = obj->cur_cmd; string function; if (contains(arg, " ")) { @@ -64,30 +62,12 @@ void MiniBuffer::ExecutingCB(FL_OBJECT *ob, long) } lyxerr.debug() << "Function: " << function << "\nArg : " << arg << endl; - // Check if the name is valid (ale) - // No, let the dispatch functions handle that. - //int action = lyxaction.LookupFunc(function.c_str()); - //lyxerr.debug(string("minibuffer action: ") + action); - //if (action>=0) { - // Dispatch only returns requested data for a few commands (ale) + + // Dispatch only returns requested data for a few commands (ale) string res=obj->owner->getLyXFunc()->Dispatch(function.c_str(), arg.c_str()); lyxerr.debug() << "Minibuffer Res: " << res << endl; -/* if (!res.empty()) - if(obj->owner->getLyXFunc()->errorStat()) - obj->Set(_("Error:"), _(res.c_str()), string(), 4); - else - obj->Set(_("Result:"), _(res.c_str()), string(), 4); - else - obj->Init(); -*/ - //} else { -#ifdef WITH_WARNINGS -#warning Look at this. -#endif - //obj->Set(_("Cannot find function"), function, "!"); obj->shows_no_match = false; - //} return ; } diff --git a/src/spellchecker.C b/src/spellchecker.C index b45aa8761b..5bedccdd96 100644 --- a/src/spellchecker.C +++ b/src/spellchecker.C @@ -353,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; @@ -387,9 +384,7 @@ void create_ispell_pipe(string const & lang) } else if (retval == 0) { // timeout. Give nice message to user. lyxerr << "Ispell read timed out, what now?" << endl; -#ifdef WITH_WARNINGS -#warning Is this the correct thing to do? -#endif + // This probably works but could need some thought isp_pid = -1; close(pipeout[0]); close(pipeout[1]); close(pipein[0]); close(pipein[1]); -- 2.39.2