From ec348c574ad1a3fb9a37a5bce502acf1ea54cfb8 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Mon, 2 Jun 2008 11:31:03 +0000 Subject: [PATCH] Unify LFUN naming. (LFUN_FLOAT_LIST -> LFUN_FLOAT_LIST_INSERT) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25065 a592a061-630c-0410-9148-cb99ea01b6c8 --- RELEASE-NOTES | 2 ++ src/FuncCode.h | 2 +- src/LyXAction.cpp | 2 +- src/Text3.cpp | 4 ++-- src/frontends/qt4/Menus.cpp | 2 +- src/insets/InsetCollapsable.cpp | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 46960bfeca..261578a10e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -63,6 +63,8 @@ Some of the LyX functions have changed names: - The functions LFUN_HTML_INSERT, "html-insert", LFUN_URL_INSERT, "url-insert" was superseded by LFUN_HYPERLINK_INSERT, "href-insert". +- The functions LFUN_FLOAT_LIST has been renamed to LFUN_FLOAT_LIST_INSERT. + The following new LyX functions have been introduced: - LFUN_SPECIALCHAR_INSERT, "specialchar-insert" (see above). diff --git a/src/FuncCode.h b/src/FuncCode.h index 21fb52f6d0..09a1afb880 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -214,7 +214,7 @@ enum FuncCode LFUN_CELL_SPLIT, LFUN_BUFFER_CHILD_OPEN, // Ale 970528 LFUN_TOC_INSERT, // Lgb 97-05-27 - LFUN_FLOAT_LIST, // Lgb 20010503 + LFUN_FLOAT_LIST_INSERT, // Lgb 20010503 // 155 LFUN_BUFFER_TOGGLE_READ_ONLY, // Lgb 97-05-27 LFUN_VC_REGISTER, // Lgb 97-07-01 diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index a6574e259e..c3b31f653a 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -1753,7 +1753,7 @@ void LyXAction::init() { LFUN_KEYMAP_SECONDARY, "keymap-secondary", ReadOnly, Edit }, { LFUN_KEYMAP_TOGGLE, "keymap-toggle", ReadOnly, Edit }, - { LFUN_FLOAT_LIST, "float-list", Noop, Edit }, + { LFUN_FLOAT_LIST_INSERT, "float-list-insert", Noop, Edit }, { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly, System }, { LFUN_SERVER_GET_LAYOUT, "server-get-layout", ReadOnly, System }, diff --git a/src/Text3.cpp b/src/Text3.cpp index 5e91672f0a..707cc7d3e8 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -1721,7 +1721,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) bv->translateAndInsert(cmd.argument()[0], this, cur); break; - case LFUN_FLOAT_LIST: { + case LFUN_FLOAT_LIST_INSERT: { DocumentClass const & tclass = bv->buffer().params().documentClass(); if (tclass.floats().typeExist(to_utf8(cmd.argument()))) { cur.recordUndo(); @@ -1981,7 +1981,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_WRAP_INSERT: code = WRAP_CODE; break; - case LFUN_FLOAT_LIST: + case LFUN_FLOAT_LIST_INSERT: code = FLOAT_LIST_CODE; break; #if 0 diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 6f8aba311a..55c36c494a 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -807,7 +807,7 @@ void MenuDefinition::expandFloatListInsert(Buffer const * buf) for (; cit != end; ++cit) { addWithStatusCheck(MenuItem(MenuItem::Command, qt_(cit->second.listName()), - FuncRequest(LFUN_FLOAT_LIST, + FuncRequest(LFUN_FLOAT_LIST_INSERT, cit->second.type()))); } } diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index 54530751e0..27bdd01690 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -659,7 +659,7 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FILE_INSERT: case LFUN_FLEX_INSERT: case LFUN_FLOAT_INSERT: - case LFUN_FLOAT_LIST: + case LFUN_FLOAT_LIST_INSERT: case LFUN_FLOAT_WIDE_INSERT: case LFUN_FONT_BOLD: case LFUN_FONT_TYPEWRITER: