From: Abdelrazak Younes Date: Sat, 24 May 2008 10:15:52 +0000 (+0000) Subject: Introduce docstring_list X-Git-Tag: 1.6.10~4689 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8a7c802ab0e74db92a78f1096139e4654adb9c6a;p=features.git Introduce docstring_list git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24924 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 2051c1f919..20183e3491 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -297,6 +297,7 @@ src_support_header_files = Split(''' debug.h docstream.h docstring.h + docstring_list.h environment.h filetools.h foreach.h diff --git a/src/frontends/Application.h b/src/frontends/Application.h index 4b2299bbbe..896ae71c2b 100644 --- a/src/frontends/Application.h +++ b/src/frontends/Application.h @@ -14,7 +14,6 @@ #include "ColorCode.h" #include "support/strfwd.h" -#include "support/docstring.h" #include @@ -25,6 +24,7 @@ namespace lyx { class BufferView; class Buffer; +class docstring_list; class FuncRequest; class FuncStatus; class Inset; @@ -223,7 +223,7 @@ public: virtual void unregisterSocketCallback(int fd) = 0; virtual bool searchMenu(FuncRequest const & func, - std::vector & names) const = 0; + docstring_list & names) const = 0; }; } // namespace frontend diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index a4e4cc5895..e1ade12d33 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -1036,7 +1036,7 @@ Buffer const * GuiApplication::updateInset(Inset const * inset) const bool GuiApplication::searchMenu(FuncRequest const & func, - vector & names) const + docstring_list & names) const { return d->menus_.searchMenu(func, names); } diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h index d02dbfe1e2..e0e3517a42 100644 --- a/src/frontends/qt4/GuiApplication.h +++ b/src/frontends/qt4/GuiApplication.h @@ -66,7 +66,7 @@ public: std::string const hexName(ColorCode col); void registerSocketCallback(int fd, SocketCallback func); void unregisterSocketCallback(int fd); - bool searchMenu(FuncRequest const & func, std::vector & names) const; + bool searchMenu(FuncRequest const & func, docstring_list & names) const; void hideDialogs(std::string const & name, Inset * inset) const; Buffer const * updateInset(Inset const * inset) const; //@} diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp index f415c9af09..1ece8b7dea 100644 --- a/src/frontends/qt4/GuiLog.cpp +++ b/src/frontends/qt4/GuiLog.cpp @@ -15,9 +15,11 @@ #include "GuiApplication.h" #include "qt_helpers.h" -#include "support/gettext.h" #include "Lexer.h" +#include "support/docstring.h" +#include "support/gettext.h" + #include #include #include diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 4e7a807d9b..cebd8975eb 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -55,6 +55,7 @@ #include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" +#include "support/docstring_list.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -269,7 +270,7 @@ public: // search for func in this menu iteratively, and put menu // names in a stack. - bool searchMenu(FuncRequest const & func, std::vector & names) + bool searchMenu(FuncRequest const & func, docstring_list & names) const; /// bool hasFunc(FuncRequest const &) const; @@ -591,7 +592,7 @@ void MenuDefinition::checkShortcuts() const } -bool MenuDefinition::searchMenu(FuncRequest const & func, vector & names) const +bool MenuDefinition::searchMenu(FuncRequest const & func, docstring_list & names) const { const_iterator m = begin(); const_iterator m_end = end(); @@ -995,10 +996,10 @@ void MenuDefinition::expandToc(Buffer const * buf) void MenuDefinition::expandPasteRecent() { - vector const sel = cap::availableSelections(); + docstring_list const sel = cap::availableSelections(); - vector::const_iterator cit = sel.begin(); - vector::const_iterator end = sel.end(); + docstring_list::const_iterator cit = sel.begin(); + docstring_list::const_iterator end = sel.end(); for (unsigned int index = 0; cit != end; ++cit, ++index) { add(MenuItem(MenuItem::Command, toqstr(*cit), @@ -1091,11 +1092,11 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv) key = qstring_to_ucs4(toqstr(key).split(',')[0]); vector citeStyleList = citeStyles(buf->params().citeEngine()); - vector citeStrings = + docstring_list citeStrings = buf->masterBibInfo().getCiteStrings(key, bv->buffer()); - vector::const_iterator cit = citeStrings.begin(); - vector::const_iterator end = citeStrings.end(); + docstring_list::const_iterator cit = citeStrings.begin(); + docstring_list::const_iterator end = citeStrings.end(); for (int ii = 1; cit != end; ++cit, ++ii) { docstring label = *cit; @@ -1520,7 +1521,7 @@ void Menus::read(Lexer & lex) bool Menus::searchMenu(FuncRequest const & func, - vector & names) const + docstring_list & names) const { MenuDefinition menu; d->expand(d->menubar_, menu, 0); diff --git a/src/frontends/qt4/Menus.h b/src/frontends/qt4/Menus.h index ee57daf7de..5e438670fa 100644 --- a/src/frontends/qt4/Menus.h +++ b/src/frontends/qt4/Menus.h @@ -13,8 +13,6 @@ #ifndef MENUS_H #define MENUS_H -#include "support/docstring.h" - #include #include @@ -24,6 +22,7 @@ class QMenuBar; namespace lyx { +class docstring_list; class Lexer; class FuncRequest; @@ -63,7 +62,7 @@ public: /// bool searchMenu(FuncRequest const & func, - std::vector & names) const; + docstring_list & names) const; /// void fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial = false); diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 9a86168862..11fd583b31 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -29,6 +29,7 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/docstring_list.h" #include "support/FileName.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -205,7 +206,7 @@ void InsetInfo::updateInfo() break; } case MENU_INFO: { - vector names; + docstring_list names; FuncRequest func = lyxaction.lookupFunc(name_); if (func.action == LFUN_UNKNOWN_ACTION) { setText(bformat(_("Unknown action %1$s"), from_utf8(name_)), bp.getFont(), false); diff --git a/src/support/Makefile.am b/src/support/Makefile.am index b37899f998..1c1f8a038d 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -46,6 +46,7 @@ liblyxsupport_la_SOURCES = \ docstream.h \ docstring.cpp \ docstring.h \ + docstring_list.h \ environment.h \ environment.cpp \ ExceptionMessage.h \ diff --git a/src/support/docstring_list.h b/src/support/docstring_list.h new file mode 100644 index 0000000000..33846c1421 --- /dev/null +++ b/src/support/docstring_list.h @@ -0,0 +1,37 @@ +// -*- C++ -*- +/** + * \file docstring_list.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Abdelrazak Younes + * + * Full author contact details are available in file CREDITS. + */ + +#ifndef DOCSTRINGLIST_H +#define DOCSTRINGLIST_H + +#include "support/docstring.h" + +#include + +namespace lyx { + +/** + * Class for storing docstring list. + * std::vector can not be forward declared in a simple way. Creating a class solves + * this problem. + */ +class docstring_list : public std::vector +{ +public: + docstring_list(): std::vector() {} + + docstring_list(std::vector const & v) : std::vector(v) + {} +}; + +} // namespace lyx + +#endif // DOCSTRINGLIST_H