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

prepare for 1.1.6pre2

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1232 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-11-21 23:05:19 +00:00
parent 04867f7099
commit f448e22d48
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2000-11-22 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/version.h: set to 1.1.6pre2
2000-11-20 Marko Vendelin <markov@ioc.ee> 2000-11-20 Marko Vendelin <markov@ioc.ee>
* src/frontends/gnome/Dialogs.C: added signal Dialogs::redrawGUI * src/frontends/gnome/Dialogs.C: added signal Dialogs::redrawGUI

9
src/LyXAction.C
View File

@ -453,8 +453,7 @@ LyXAction::LyXAction()
// if it doesn't exist. // if it doesn't exist.
int LyXAction::searchActionArg(kb_action action, string const & arg) const int LyXAction::searchActionArg(kb_action action, string const & arg) const
{ {
// BUG we really want to use const_iterator (Lgb) arg_map::const_iterator pit = lyx_arg_map.find(action);
arg_map::iterator pit = lyx_arg_map.find(action);
if (pit == lyx_arg_map.end()) { if (pit == lyx_arg_map.end()) {
// the action does not have any pseudoactions // the action does not have any pseudoactions
@ -464,8 +463,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
return LFUN_UNKNOWN_ACTION; return LFUN_UNKNOWN_ACTION;
} }
// BUG we really want to use const_iterator (Lgb) arg_item::const_iterator aci = (*pit).second.find(arg);
arg_item::iterator aci = (*pit).second.find(arg);
if (aci == (*pit).second.end()) { if (aci == (*pit).second.end()) {
// the action does not have any pseudoactions with this arg // the action does not have any pseudoactions with this arg
@ -521,8 +519,7 @@ kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
{ {
arg.erase(); // clear it to be sure. arg.erase(); // clear it to be sure.
// BUG we really want to use const_iterator (Lgb) pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
pseudo_map::iterator pit = lyx_pseudo_map.find(pseudo);
if (pit != lyx_pseudo_map.end()) { if (pit != lyx_pseudo_map.end()) {
lyxerr[Debug::ACTION] << "Found the pseudoaction: [" lyxerr[Debug::ACTION] << "Found the pseudoaction: ["

6
src/filedlg.C
View File

@ -81,8 +81,7 @@ class UserCache {
public: public:
/// seeks user name from group ID /// seeks user name from group ID
string const & find(uid_t ID) const { string const & find(uid_t ID) const {
// We really want to use const_iterator. (Lgb) Users::const_iterator cit = users.find(ID);
Users::iterator cit = users.find(ID);
if (cit == users.end()) { if (cit == users.end()) {
add(ID); add(ID);
return users[ID]; return users[ID];
@ -133,8 +132,7 @@ private:
string const & GroupCache::find(gid_t ID) const string const & GroupCache::find(gid_t ID) const
{ {
// We really want to use const_iterator. (Lgb) Groups::const_iterator cit = groups.find(ID);
Groups::iterator cit = groups.find(ID);
if (cit == groups.end()) { if (cit == groups.end()) {
add(ID); add(ID);
return groups[ID]; return groups[ID];

4
src/version.h
View File

@ -1,8 +1,8 @@
/* Version and release date definition */ /* Version and release date definition */
/// ///
#define LYX_VERSION "1.1.6cvs" #define LYX_VERSION "1.1.6pre2"
/// ///
#define LYX_RELEASE "Thu, Oct 26, 2000" #define LYX_RELEASE "Wed, Nov 22, 2000"
/* This version string is intended to be used in files created by LyX */ /* This version string is intended to be used in files created by LyX */
/// ///
#define LYX_DOCVERSION "LyX 1.1" #define LYX_DOCVERSION "LyX 1.1"