anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some old commented out code removed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@236 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 1999-10-24 00:57:04 +00:00
parent d90e046851
commit 5362b33b0f
4 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
1999-10-24 Lars Gullik Bjønnes <larsbj@lyx.org> 1999-10-24 Lars Gullik Bjønnes <larsbj@lyx.org>
* 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 * src/support/lyxstring.h: comment out the three private
operators, when compiling with string ansi conforming compilers operators, when compiling with string ansi conforming compilers
they make problems. they make problems.

6
src/lyxfunc.C
View File

@ -303,12 +303,6 @@ int LyXFunc::processKeyEvent(XEvent *ev)
Dispatch(action, argument.c_str()); Dispatch(action, argument.c_str());
show_sc = tmp_sc; 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; return 0;
} }

22
src/minibuffer.C
View File

@ -51,8 +51,6 @@ void MiniBuffer::ExecutingCB(FL_OBJECT *ob, long)
obj->addHistory(obj->cur_cmd); obj->addHistory(obj->cur_cmd);
// Split command into function and argument // Split command into function and argument
// This is done wrong Asger. Instead of <function argument>
// it ends up as <argument function> Queer solution:
string arg = obj->cur_cmd; string arg = obj->cur_cmd;
string function; string function;
if (contains(arg, " ")) { if (contains(arg, " ")) {
@ -64,30 +62,12 @@ void MiniBuffer::ExecutingCB(FL_OBJECT *ob, long)
} }
lyxerr.debug() << "Function: " << function lyxerr.debug() << "Function: " << function
<< "\nArg : " << arg << endl; << "\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(), string res=obj->owner->getLyXFunc()->Dispatch(function.c_str(),
arg.c_str()); arg.c_str());
lyxerr.debug() << "Minibuffer Res: " << res << endl; 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; obj->shows_no_match = false;
//}
return ; return ;
} }

7
src/spellchecker.C
View File

@ -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 // Actually I used it to tell if it's truly Ispell or if it's
// aspell -- (kevinatk@home.com) // aspell -- (kevinatk@home.com)
char buf[2048]; char buf[2048];
#ifdef WITH_WARNINGS
#warning verify that this works.
#endif
fd_set infds; fd_set infds;
struct timeval tv; struct timeval tv;
int retval = 0; int retval = 0;
@ -387,9 +384,7 @@ void create_ispell_pipe(string const & lang)
} else if (retval == 0) { } else if (retval == 0) {
// timeout. Give nice message to user. // timeout. Give nice message to user.
lyxerr << "Ispell read timed out, what now?" << endl; lyxerr << "Ispell read timed out, what now?" << endl;
#ifdef WITH_WARNINGS // This probably works but could need some thought
#warning Is this the correct thing to do?
#endif
isp_pid = -1; isp_pid = -1;
close(pipeout[0]); close(pipeout[1]); close(pipeout[0]); close(pipeout[1]);
close(pipein[0]); close(pipein[1]); close(pipein[0]); close(pipein[1]);