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

compilation fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1936 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-04-18 10:20:17 +00:00
parent 66411ab51c
commit 4a704b1700
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2001-04-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxfunc.C (Dispatch):
* minibuffer.C:
* minibuffer.h: add a few std:: qualifiers
2001-04-17 Lars Gullik Bjønnes <larsbj@birdstep.com> 2001-04-17 Lars Gullik Bjønnes <larsbj@birdstep.com>
* minibuffer.[Ch]: reimplement so that commands is initiated and * minibuffer.[Ch]: reimplement so that commands is initiated and

8
src/lyxfunc.C
View File

@ -809,10 +809,10 @@ string const LyXFunc::Dispatch(int ac,
// --- Misc ------------------------------------------- // --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND: case LFUN_EXEC_COMMAND:
{ {
vector<string> allCmds; std::vector<string> allCmds;
transform(lyxaction.func_begin(), lyxaction.func_end(), std::transform(lyxaction.func_begin(), lyxaction.func_end(),
back_inserter(allCmds), lyx::firster()); std::back_inserter(allCmds), lyx::firster());
static vector<string> hist; static std::vector<string> hist;
owner->getMiniBuffer()->getString(MiniBuffer::nospaces, owner->getMiniBuffer()->getString(MiniBuffer::nospaces,
allCmds, hist); allCmds, hist);
} }

7
src/minibuffer.C
View File

@ -28,6 +28,7 @@
using std::endl; using std::endl;
using SigC::slot; using SigC::slot;
using std::vector;
extern LyXAction lyxaction; extern LyXAction lyxaction;
@ -121,7 +122,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
vector<string> comp; vector<string> comp;
lyx::copy_if(completion_.begin(), lyx::copy_if(completion_.begin(),
completion_.end(), completion_.end(),
back_inserter(comp), prefix(input)); std::back_inserter(comp), prefix(input));
if (comp.empty()) { if (comp.empty()) {
// No matches // No matches
@ -144,7 +145,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
vector<string> vtmp; vector<string> vtmp;
lyx::copy_if(comp.begin(), lyx::copy_if(comp.begin(),
comp.end(), comp.end(),
back_inserter(vtmp), std::back_inserter(vtmp),
prefix(test)); prefix(test));
if (vtmp.size() != comp.size()) { if (vtmp.size() != comp.size()) {
test.erase(test.length() - 1); test.erase(test.length() - 1);
@ -157,7 +158,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
// How should the possible matches // How should the possible matches
// be visualized? // be visualized?
std::copy(comp.begin(), comp.end(), std::copy(comp.begin(), comp.end(),
ostream_iterator<string>(cerr, "\n")); std::ostream_iterator<string>(std::cerr, "\n"));
} }
return 1; return 1;
} }

10
src/minibuffer.h
View File

@ -44,8 +44,8 @@ public:
emitted. emitted.
*/ */
void getString(State space, void getString(State space,
vector<string> const & completion, std::vector<string> const & completion,
vector<string> & history); std::vector<string> & history);
/// ///
void redraw(); void redraw();
/// ///
@ -88,11 +88,11 @@ private:
/// ///
FL_OBJECT * the_buffer; FL_OBJECT * the_buffer;
/// ///
vector<string> completion_; std::vector<string> completion_;
/// ///
vector<string> * history_; std::vector<string> * history_;
/// ///
vector<string>::iterator hist_iter; std::vector<string>::iterator hist_iter;
/// ///
State state_; State state_;
}; };