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

Compile fixes following this weekends commits.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3371 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-01-14 12:56:05 +00:00
parent 9be41f4c84
commit 3b7dd942e6
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ChangeLog
View File

@ -1,3 +1,14 @@
2002-01-14 Angus Leeming <a.leeming@ic.ac.uk>
* ToolbarDefaults.C: remove trailing comma closing namespace.
* WorkArea.h: remove WorkArea:: from declaration of event_cb.
* lyxfunc.[Ch]: clean-up declaration of verboseDispatch functions
as in WorkArea.
* trans.C (Load): comment out unused variable, allowed.
2002-01-11 Angus Leeming <a.leeming@ic.ac.uk>
* minibuffer.[Ch] (append_char): new method to recieve input from the

2
src/ToolbarDefaults.C
View File

@ -47,7 +47,7 @@ struct keyword_item toolTags[TO_LAST - 1] = {
{ "separator", TO_SEPARATOR }
};
}; // end of anon namespace
} // end of anon namespace
ToolbarDefaults::ToolbarDefaults()

2
src/WorkArea.h
View File

@ -130,7 +130,7 @@ public:
SigC::Signal0<void> selectionRequested;
/// handles SelectionRequest X Event, to fill the clipboard
void WorkArea::event_cb(XEvent * xev);
void event_cb(XEvent * xev);
private:
///
void createPixmap(int, int);

8
src/lyxfunc.C
View File

@ -754,7 +754,7 @@ void LyXFunc::miniDispatch(string const & s)
}
void const LyXFunc::verboseDispatch(string const & s, bool show_sc)
void LyXFunc::verboseDispatch(string const & s, bool show_sc)
{
int action = lyxaction.LookupFunc(frontStrip(s));
@ -768,7 +768,7 @@ void const LyXFunc::verboseDispatch(string const & s, bool show_sc)
}
void const LyXFunc::verboseDispatch(int ac, bool show_sc)
void LyXFunc::verboseDispatch(int ac, bool show_sc)
{
string argument;
kb_action action;
@ -781,8 +781,8 @@ void const LyXFunc::verboseDispatch(int ac, bool show_sc)
void const LyXFunc::verboseDispatch(kb_action action,
string const & argument, bool show_sc)
void LyXFunc::verboseDispatch(kb_action action,
string const & argument, bool show_sc)
{
string res = dispatch(action, argument);

12
src/lyxfunc.h
View File

@ -35,18 +35,18 @@ public:
/// The same as dispatch, but also shows shortcuts and command
/// name in minibuffer if show_sc is true (more to come?)
void const LyXFunc::verboseDispatch(kb_action action,
string const & argument,
bool show_sc);
void verboseDispatch(kb_action action,
string const & argument,
bool show_sc);
/// Same as above, using a pseudoaction as argument
void const LyXFunc::verboseDispatch(int ac, bool show_sc);
void verboseDispatch(int ac, bool show_sc);
/// Same as above, when the command is provided as a string
void const LyXFunc::verboseDispatch(string const & s, bool show_sc);
void verboseDispatch(string const & s, bool show_sc);
///
void LyXFunc::miniDispatch(string const & s);
void miniDispatch(string const & s);
///
void initMiniBuffer();

2
src/trans.C
View File

@ -152,7 +152,7 @@ int Trans::Load(LyXLex & lex)
} else
return -1;
string const allowed = lex.getString();
/* string const allowed = lex.getString(); */
AddDeadkey(accent, keys /*, allowed*/);
#else
AddDeadkey(accent, keys);