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 2051c1f919e87a1eaf7f002b6774e4fce352b7c7..20183e349148cc605adb13ade8754472d9daa750 100644 (file)
--- 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 4b2299bbbec96187fae7261548a3d615afa8e6b1..896ae71c2bd775b5f96b229fc5812110ee0c915e 100644 (file)
--- 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 <boost/function.hpp>
 
@@ -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<docstring> & 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 a4e4cc5895c5d11eafb9986e143c1560f71a118e..e1ade12d33cbd496398b56e17006d0d852fc19ca 100644 (file)
--- 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<docstring> & 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 d02dbfe1e27475a871af80d9b5ba89a7c8d2080e..e0e3517a4233d9ee0ee2b764c02b1c4c8c5c65f3 100644 (file)
--- 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<docstring> & 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 f415c9af09694112778f7cbd59f3195f3b987426..1ece8b7deaa6fc9276d3fc38e5f48d0584b31d5b 100644 (file)
--- 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 <QTextBrowser>
 #include <QSyntaxHighlighter>
 #include <QClipboard>

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 4e7a807d9b7601d39b2582a79b5ee382b308c075..cebd8975eb35400f5be78ddee30fbd26d6546cbb 100644 (file)
--- 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<docstring> & 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<docstring> & 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<docstring> const sel = cap::availableSelections();
+       docstring_list const sel = cap::availableSelections();
 
-       vector<docstring>::const_iterator cit = sel.begin();
-       vector<docstring>::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<CiteStyle> citeStyleList = citeStyles(buf->params().citeEngine());
-       vector<docstring> citeStrings =
+       docstring_list citeStrings =
                buf->masterBibInfo().getCiteStrings(key, bv->buffer());
 
-       vector<docstring>::const_iterator cit = citeStrings.begin();
-       vector<docstring>::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<docstring> & 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 ee57daf7dee37b79b75cbd3ac792976ba35a39db..5e438670fa5567d47c83bec84b537c367d43716b 100644 (file)
--- 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 <QMenu>
 
 #include <vector>
@@ -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<docstring> & 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 9a86168862a433e03ee9ca35383f6b92bcbdf145..11fd583b31a04c310ccd403ae910c00aff8941f8 100644 (file)
--- 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<docstring> 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 b37899f9989b11aac594bf8194a324d4f000c3fd..1c1f8a038d2216d6395cb2e6fea9a16588fad053 100644 (file)
--- 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 (file)
index 0000000..33846c1
--- /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 <vector>
+
+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<docstring>
+{
+public:
+       docstring_list(): std::vector<docstring>() {}
+
+       docstring_list(std::vector<docstring> const & v) : std::vector<docstring>(v)
+       {}
+};
+
+} // namespace lyx
+
+#endif // DOCSTRINGLIST_H