Change the type of the context menu name to string

There is no need for GUI-elements to use docstring.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40058 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index fff47d05597d682fd43ddcbe4707e7ff9b598099..178bcfc521ec507a4adce27a287396b941af0815 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -561,7 +561,7 @@ docstring BufferView::toolTip(int x, int y) const
 }
 
 
-docstring BufferView::contextMenu(int x, int y) const
+string BufferView::contextMenu(int x, int y) const
 {
        //If there is a selection, return the containing inset menu
        if (d->cursor_.selection())

diff --git a/src/BufferView.h b/src/BufferView.h
index 901d05522382c1a473b01d30f857b592a393c54d..fa85195b52afb71e707516441a2c2da33d4452ce 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -124,7 +124,7 @@ public:
        /// \return Tool tip for the given position.
        docstring toolTip(int x, int y) const;
        /// \return the context menu for the given position.
-       docstring contextMenu(int x, int y) const;
+       std::string contextMenu(int x, int y) const;
 
        /// Save the current position as bookmark.
        /// if idx == 0, save to temp_bookmark

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index f18dbf5f59570c26b75aa43706785679950b2cd5..563d00b7388da3ab58d253fe1d6ca0fa9a973b12 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -716,7 +716,7 @@ bool GuiWorkArea::event(QEvent * e)
 
 void GuiWorkArea::contextMenuEvent(QContextMenuEvent * e)
 {
-       docstring name;
+       string name;
        if (e->reason() == QContextMenuEvent::Mouse)
                // the menu name is set on mouse press
                name = d->context_menu_name_;

diff --git a/src/frontends/qt4/GuiWorkArea_Private.h b/src/frontends/qt4/GuiWorkArea_Private.h
index ee7f1b3473056e1c3c3c2015ae80f6854578309a..133a6cdbec8fd3ba257472f965c323a86f0e069b 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea_Private.h
+++ b/src/frontends/qt4/GuiWorkArea_Private.h
@@ -181,7 +181,7 @@ struct GuiWorkArea::Private
        /// pressed. This is used to get the correct context menu 
        /// when the menu is actually shown (after releasing on Windows)
        /// and after the DEPM has done its job.
-       docstring context_menu_name_;
+       std::string context_menu_name_;
 }; // GuiWorkArea
 
 } // namespace frontend

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 9a8a084cac3b0e1f4848b984b5071dee2e51559f..21ef625c7f6ae3b54d0088dbf83f1f270a623e12 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -258,15 +258,15 @@ void Inset::forToc(docstring &, size_t) const
 }
 
 
-docstring Inset::contextMenu(BufferView const &, int, int) const
+string Inset::contextMenu(BufferView const &, int, int) const
 {
        return contextMenuName();
 }
 
 
-docstring Inset::contextMenuName() const
+string Inset::contextMenuName() const
 {
-       return docstring();
+       return string();
 }
 
 

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 2d272e34365a7ea44a920119210e79425d4414bd..fbe664d5f6c3a43759b132d91d884b6ea7ced297 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -408,11 +408,11 @@ public:
        
        /// \return Context menu identifier. This function determines
        /// whose Inset's menu should be shown for the given position.
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+       virtual std::string contextMenu(BufferView const & bv, int x, int y) const;
 
        /// \return Context menu identifier for this inset.
        /// This default implementation returns an empty string.
-       virtual docstring contextMenuName() const;
+       virtual std::string contextMenuName() const;
 
 
        virtual docstring layoutName() const;

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 329b32994cf055a7da7528550faadf7c4c8eba99..831613023e8b296c713a377f181046e9c2dd97e1 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -992,9 +992,9 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-docstring InsetBibtex::contextMenuName() const
+string InsetBibtex::contextMenuName() const
 {
-       return from_ascii("context-bibtex");
+       return "context-bibtex";
 }
 
 

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index 6e38fcc407258d9a3b1a7837fb154e9ee1f88d12..79ee82759b4a32dd40710d7ad39e027745cc575a 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -58,7 +58,7 @@ public:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index a9130a7060d71ce058ff0fd0d65b2a835e566b0c..03cdc318a4bd3aef4acf0fa5f897f8879f737e62 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -530,9 +530,9 @@ void InsetBox::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBox::contextMenuName() const
+string InsetBox::contextMenuName() const
 {
-       return from_ascii("context-box");
+       return "context-box";
 }
 
 

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 2fb33bf2098dd9c80f6f507fa5c7612474aac5e0..52cb776416f6cf0d0c365c2ffa65e2b9d4e8bd61 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -133,7 +133,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
 
        ///
        InsetBoxParams params_;

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index f0920956cd3fe4d091188f26129a745d68bb230b..3c917db7f7e2ff1e41917d6c8ff4d370e594f9b9 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -257,9 +257,9 @@ void InsetBranch::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetBranch::contextMenuName() const
+string InsetBranch::contextMenuName() const
 {
-       return from_ascii("context-branch");
+       return "context-branch";
 }
 
 

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index c51c728e4f1610a4ce2a070a2cd11087f6240e78..64029c0193dbb2faca889f7438d46478f8fa462b 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -79,7 +79,7 @@ private:
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        void addToToc(DocIterator const &) const;
        ///

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 6f9035c5b9f4606d07f8323428d7beb0587cbef7..c1a5145f0e70f5e20623fde57d5f07075addf337 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -611,9 +611,9 @@ void InsetCitation::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetCitation::contextMenuName() const
+string InsetCitation::contextMenuName() const
 {
-       return from_ascii("context-citation");
+       return "context-citation";
 }
 
 

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index 6eb0da03fc52c540c7d0fa3d88b15d4d14653bcd..2762bfd9f2c964ed647a5cffe70362aa6d732e36 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -63,7 +63,7 @@ public:
        ///
        void addToToc(DocIterator const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index a8a114f3a6481bab3fed4477fbd643c2c697682d..6c880cd514c53c4eeff51d38c114d34a2640516b 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -618,15 +618,15 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 }
 
 
-docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+string InsetCollapsable::contextMenu(BufferView const & bv, int x,
        int y) const
 {
-       docstring context_menu = contextMenuName();
-       docstring const it_context_menu = InsetText::contextMenuName();
+       string context_menu = contextMenuName();
+       string const it_context_menu = InsetText::contextMenuName();
        if (decoration() == InsetLayout::CONGLOMERATE)
                return context_menu + ";" + it_context_menu;
 
-       docstring const ic_context_menu = InsetCollapsable::contextMenuName();
+       string const ic_context_menu = InsetCollapsable::contextMenuName();
        if (ic_context_menu != context_menu)
                context_menu += ";" + ic_context_menu;
 
@@ -641,12 +641,12 @@ docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
 }
 
 
-docstring InsetCollapsable::contextMenuName() const
+string InsetCollapsable::contextMenuName() const
 {
        if (decoration() == InsetLayout::CONGLOMERATE)
-               return from_ascii("context-conglomerate");
+               return "context-conglomerate";
        else
-               return from_ascii("context-collapsable");
+               return "context-collapsable";
 }
 
 } // namespace lyx

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index fba355a5c6bc352f180b56eb0e3ac8ae4f4d02e2..d7d050e3fea9a44aba29ea8d1b5b28026714f58d 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -141,9 +141,9 @@ public:
        ///
        virtual bool usePlainLayout() const { return true; }
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenu(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        docstring floatName(std::string const & type) const;
 protected:

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 92eb1a84fce8c81733457502364a57468d0a11ff..1c9a170b11214caf6d2387b369ee0205ea1dfeb5 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -210,9 +210,9 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetCommand::contextMenuName() const
+string InsetCommand::contextMenuName() const
 {
-       return from_ascii("context-") + from_ascii(insetName(p_.code()));
+       return "context-" + insetName(p_.code());
 }
 
 

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 3ea57c98dc3ade79ca92ebfad310aaa20ce08a5e..4d5066e33fac5ed34c627d5feaea042a65fce593 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -91,7 +91,7 @@ protected:
        /// \name Methods relaying to the InsetCommandParams p_
        //@{
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        bool showInsetDialog(BufferView * bv) const;
        ///

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 83ac11cf58c97b051a33d58442263f36c99ee5df..7d77bdafa4d43654b55bc4292de3d9716b572f9e 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -38,8 +38,8 @@ public:
        ///
        static std::string params2string(CollapseStatus);
 
-       docstring contextMenuName() const
-               { return from_ascii("context-ert"); }
+       std::string contextMenuName() const
+               { return "context-ert"; }
 private:
        ///
        InsetCode lyxCode() const { return ERT_CODE; }

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index 77d1b2f7bfd4073a94310707fca82312fafd2a40..bd9df03e1cbaa1d04d05d21a28a8a3fe1371ff07 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -802,9 +802,9 @@ void InsetExternal::addPreview(DocIterator const & /*inset_pos*/,
 }
 
 
-docstring InsetExternal::contextMenuName() const
+string InsetExternal::contextMenuName() const
 {
-       return from_ascii("context-external");
+       return "context-external";
 }
 
 

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index 92eb61238fc42117f3b60b4813c7009544938ed8..fba0e7406bc1254746f534a6bdaca50356096462 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -111,7 +111,7 @@ public:
        /// \returns the number of rows (\n's) of generated code.
        void latex(otexstream &, OutputParams const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover);
        ///

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 48155fc109a97366d585e32d26d295408243ed15..f3e3c470791fd7d7339dc199f911891b2fa3e7f4 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -1054,9 +1054,9 @@ void InsetGraphics::addToToc(DocIterator const & cpit) const
 }
 
 
-docstring InsetGraphics::contextMenuName() const
+string InsetGraphics::contextMenuName() const
 {
-       return from_ascii("context-graphics");
+       return "context-graphics";
 }
 
 

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 2a04f0c33cf469d8070c7f0eb50dfc33a8373462..408a3c1f33717890a0e47e611f45a25d46dbb40a 100644 (file)
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -98,7 +98,7 @@ private:
        ///
        void addToToc(DocIterator const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// Force inset into LTR environment if surroundings are RTL
        bool forceLTR() const { return true; }
        ///

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index e87103ac13a757efb1a5d32a5dab69c1d6243350..442b839f0e5bb2a73b1e1fabee82c3bb1a4029b2 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -271,9 +271,9 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetHyperlink::contextMenuName() const
+string InsetHyperlink::contextMenuName() const
 {
-       return from_ascii("context-hyperlink");
+       return "context-hyperlink";
 }
 
 

diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index 4e428c767decca41ad0fab381bc42580bdf03667..fb4c8919790c474d7a2b5f2e5de51ff619d7c4fb 100644 (file)
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -42,7 +42,7 @@ public:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        void validate(LaTeXFeatures &) const;
        ///

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index b3df0d197102a595cdbd1d53a4bb2e8bd533476a..42b4d8f652f424297ebf19d625f8d0d231b5457a 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -985,9 +985,9 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetInclude::contextMenuName() const
+string InsetInclude::contextMenuName() const
 {
-       return from_ascii("context-include");
+       return "context-include";
 }
 
 

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index ad216bcca635597eadcb8e184ce146fe5fe681f2..e3269badc0b502c54494284a4c5d6f68c4f63735 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -103,7 +103,7 @@ public:
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index bec5a90e097d7ac298753d86afa0e13728f943f4..51ba81be84ff9999b7238b6065ff0862241ac122 100644 (file)
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -373,9 +373,9 @@ void InsetIndex::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetIndex::contextMenuName() const
+string InsetIndex::contextMenuName() const
 {
-       return from_ascii("context-index");
+       return "context-index";
 }
 
 
@@ -572,10 +572,10 @@ void InsetPrintIndex::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetPrintIndex::contextMenuName() const
+string InsetPrintIndex::contextMenuName() const
 {
        return buffer().masterBuffer()->params().use_indices ?
-               from_ascii("context-indexprint") : docstring();
+               "context-indexprint" : string();
 }
 
 

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index 0c6a961a49c689174cca5cf6db42df4cecf13201..42d67615b907e2535c254bdf7dd873a188a18694 100644 (file)
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -79,7 +79,7 @@ private:
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetIndex(*this); }
 
@@ -108,7 +108,7 @@ public:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index d78793dd8313f56be328aa26c9886e9f6a81bc32..2b9b231903e00ab5910493aaa20c5578c0062b24 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -462,7 +462,7 @@ void InsetInfo::updateInfo()
 }
 
 
-docstring InsetInfo::contextMenu(BufferView const &, int, int) const
+string InsetInfo::contextMenu(BufferView const &, int, int) const
 {
        //FIXME: We override the implementation of InsetCollapsable,
        //because this inset is not a collapsable inset.
@@ -470,9 +470,9 @@ docstring InsetInfo::contextMenu(BufferView const &, int, int) const
 }
 
 
-docstring InsetInfo::contextMenuName() const
+string InsetInfo::contextMenuName() const
 {
-       return from_ascii("context-info");
+       return "context-info";
 }
 
 

diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index 44bc7b2bf3554b652a6b6f3313b866a203ae7cfc..66f6a8634a7da29a29199d6f9d4b5abaf89a302d 100644 (file)
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -126,9 +126,9 @@ public:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// should paragraph indendation be ommitted in any case?
        bool neverIndent() const { return true; }
 

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 6156f8883fd696f390146d34b821b7c9df9b0240..a8b56d0773d27cdc2c121c4e9ffbfaedb5add992 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -300,9 +300,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 }
 
 
-docstring InsetListings::contextMenuName() const
+string InsetListings::contextMenuName() const
 {
-       return from_ascii("context-listings");
+       return "context-listings";
 }
 
 

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index c9d833a4adf061626b5c9ff00cfd129576245e0f..0782d68ec7c2f6f5b42d6f7d547b32accf88ec28 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -67,7 +67,7 @@ private:
        ///
        InsetListingsParams & params() { return params_; }
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index d22bb369ae8c45565b96e0d780e95f56948bade1..92f94eaaa76e34913118e1e0b667696812b8ffc7 100644 (file)
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -259,9 +259,9 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetNewline::contextMenuName() const
+string InsetNewline::contextMenuName() const
 {
-       return from_ascii("context-newline");
+       return "context-newline";
 }
 
 

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index de9c7343a9c35a1237971ebfdd81ccb793bb8af4..3dbbaa1085fe80357a83ed4be13e3c42a99c1aa1 100644 (file)
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -77,7 +77,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewline(*this); }
        ///

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index b0e290600184852276acd6c51bbeeb15225d9f8c..85e8d14dd394d02539d1963015f389613f141ddf 100644 (file)
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -256,9 +256,9 @@ docstring InsetNewpage::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-docstring InsetNewpage::contextMenuName() const
+string InsetNewpage::contextMenuName() const
 {
-       return from_ascii("context-newpage");
+       return "context-newpage";
 }
 
 

diff --git a/src/insets/InsetNewpage.h b/src/insets/InsetNewpage.h
index 002ae7f77feaa41456e8543efc61bd4de0bd9782..6a1d639b0760ff687c4a654d61c6b80c7a7d1d9e 100644 (file)
--- a/src/insets/InsetNewpage.h
+++ b/src/insets/InsetNewpage.h
@@ -81,7 +81,7 @@ private:
        ///
        ColorCode ColorName() const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        Inset * clone() const { return new InsetNewpage(*this); }
        ///

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index cd0a526ea0222f5fe36702627fa9c72febe18f01..7bdcfc7672cd903c963cd7b8d4737eadaf4c731b 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -334,9 +334,9 @@ InsetCode InsetPrintNomencl::lyxCode() const
 }
 
 
-docstring InsetPrintNomencl::contextMenuName() const
+string InsetPrintNomencl::contextMenuName() const
 {
-       return from_ascii("context-nomenclprint");
+       return "context-nomenclprint";
 }
 
 

diff --git a/src/insets/InsetNomencl.h b/src/insets/InsetNomencl.h
index f445066550ea8f24bd7b86b48bb479c6d4649741..2a0eda957f495d2ad57dc6b2e45f21d3ffd0f4c4 100644 (file)
--- a/src/insets/InsetNomencl.h
+++ b/src/insets/InsetNomencl.h
@@ -98,7 +98,7 @@ public:
        ///
        void latex(otexstream &, OutputParams const &) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index da9dd3366974382eb3c655828bbce06e49d1d393..2351c2584a1b23d0b6ec6decfd3580ad3499c07a 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -322,9 +322,9 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenuName() const
+string InsetNote::contextMenuName() const
 {
-       return from_ascii("context-note");
+       return "context-note";
 }
 
 bool InsetNote::allowSpellCheck() const

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index efb0f278661bc46d1e0f791c84a2763ed889bcad..dc7de0e3f3e2369a4bce6d82e10c9f5d75c7c512 100644 (file)
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -101,7 +101,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        friend class InsetNoteParams;
 

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index 9e3808f0e7ca38d1d9bc4f333fc5411ac3360145..5a63957ef8b49ba58f6b8108ad5b9df16d5cdce2 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -358,9 +358,9 @@ docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const
        return docstring();
 }
 
-docstring InsetPhantom::contextMenuName() const
+string InsetPhantom::contextMenuName() const
 {
-       return from_ascii("context-phantom");
+       return "context-phantom";
 }
 
 

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index 548bdb0b9cde7c7cbecf76d940aa128d82c8b38e..eb36274f6eb717540f646a14bd8f31d3628ed314 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -94,7 +94,7 @@ private:
        /// used by the constructors
        void init();
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        friend class InsetPhantomParams;
 

diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index 039b8e2f45ac06a7b43367853da23136718a7eb5..15380ba543ea75613ee6f3a2e91ff99a48bfb4ef 100644 (file)
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -49,8 +49,8 @@ public:
        
        bool descendable(BufferView const & /*bv*/) const { return true; }
 
-       docstring contextMenuName() const
-               { return from_ascii("context-preview"); }
+       std::string contextMenuName() const
+               { return "context-preview"; }
 
        void metrics(MetricsInfo & mi, Dimension & dim) const;
 

diff --git a/src/insets/InsetScript.cpp b/src/insets/InsetScript.cpp
index 32c83ff161eb2a106ae89eb5760a63ab1eb7531f..1328e3847a593e216a2b1d868f9f3a75102f0f5b 100644 (file)
--- a/src/insets/InsetScript.cpp
+++ b/src/insets/InsetScript.cpp
@@ -421,9 +421,9 @@ docstring InsetScript::xhtml(XHTMLStream & xs, OutputParams const & runparams) c
 }
 
 
-docstring InsetScript::contextMenuName() const
+string InsetScript::contextMenuName() const
 {
-       return from_ascii("context-script");
+       return "context-script";
 }
 
 

diff --git a/src/insets/InsetScript.h b/src/insets/InsetScript.h
index e558a76294a2d69eb8f887a42a1f3e1042b106af..eaec3c97c981a3f74f8e21531ddf112840ffce9b 100644 (file)
--- a/src/insets/InsetScript.h
+++ b/src/insets/InsetScript.h
@@ -109,7 +109,7 @@ public:
        ///
        Inset * clone() const { return new InsetScript(*this); }
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        //@}
 
        /// \name Public functions inherited from InsetText class

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 081b98c44cf35e3ce898b7930cc9cb1cc6264111..90d171e2d40570c6330fd308565d115735d243f0 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -837,9 +837,9 @@ bool InsetSpace::isStretchableSpace() const
 }
 
 
-docstring InsetSpace::contextMenuName() const
+string InsetSpace::contextMenuName() const
 {
-       return from_ascii("context-space");
+       return "context-space";
 }
 
 

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index 753e3bf70830ac2c46ca57d427ad61631612519a..dc74faadcac26832922415216631d38e988e4dba 100644 (file)
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -150,7 +150,7 @@ public:
        // a line separator)?
        bool isSpace() const { return true; }
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        bool clickable(int /* x */, int /* y */) const { return true; }
 protected:

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 55c96d828246e5b9ce69e72b867720e8871c786e..3cd8213b3a130d7d3501213015c488a3e008d432 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3399,7 +3399,7 @@ void InsetTabular::write(ostream & os) const
 }
 
 
-docstring InsetTabular::contextMenu(BufferView const &, int, int) const
+string InsetTabular::contextMenu(BufferView const &, int, int) const
 {
        // FIXME: depending on the selection state,
        // we could offer a different menu.
@@ -3407,9 +3407,9 @@ docstring InsetTabular::contextMenu(BufferView const &, int, int) const
 }
 
 
-docstring InsetTabular::contextMenuName() const
+string InsetTabular::contextMenuName() const
 {
-       return from_ascii("context-tabular");
+       return "context-tabular";
 }
 
 

diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 3a3f63a602bd961471a2b66cd65e676026da78a2..81b6c14e5a2f50dc6ad3e575f4b39fa4470161b8 100644 (file)
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -824,9 +824,9 @@ public:
        ///
        InsetCode lyxCode() const { return TABULAR_CODE; }
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        /// get offset of this cursor slice relative to our upper left corner
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 77131a055b4a2e27c8913ded9c8777acddffdb7b..09a52150509e0ea62dc2ef7a52779f98024f9769 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -848,18 +848,18 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenu(BufferView const &, int, int) const
+string InsetText::contextMenu(BufferView const &, int, int) const
 {
-       docstring context_menu = contextMenuName();
+       string context_menu = contextMenuName();
        if (context_menu != InsetText::contextMenuName())
                context_menu += ";" + InsetText::contextMenuName(); 
        return context_menu;
 }
 
 
-docstring InsetText::contextMenuName() const
+string InsetText::contextMenuName() const
 {
-       return from_ascii("context-edit");
+       return "context-edit";
 }
 
 

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 704194c5d0212dee50e403e438e0ffdfe49eee35..0110adf867a999ea9792f7bd6b0a207d502124ff 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -203,9 +203,9 @@ public:
                        size_t numlines = 5, size_t len = 80) const;
 
        ///
-       docstring contextMenu(BufferView const &, int, int) const;
+       std::string contextMenu(BufferView const &, int, int) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected:

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 057435eedaf437e77395bedf8c182443553b4fbb..1e46425aa65a501506b4a054347b8add6eb8a5ca 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -232,9 +232,9 @@ docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
 }
 
 
-docstring InsetVSpace::contextMenuName() const
+string InsetVSpace::contextMenuName() const
 {
-       return from_ascii("context-vspace");
+       return "context-vspace";
 }
 
 

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 4a8a1049316ab64da5ba2fb852a0a6b69425eb0b..f8df1d3b3f02429afa2b105002ce6ed4f9d4c480 100644 (file)
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -32,7 +32,7 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        static void string2params(std::string const &, VSpace &);
        ///

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 18dd602ae930895210b70822544650b64cf62f41..2d2025cca3a03c8b8e9c79eb7b7ec40515d0d718 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -2252,9 +2252,9 @@ void InsetMathHull::forToc(docstring & os, size_t) const
 }
 
 
-docstring InsetMathHull::contextMenuName() const
+string InsetMathHull::contextMenuName() const
 {
-       return from_ascii("context-math");
+       return "context-math";
 }
 
 

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 4bbb5731743d754c5ee41b84eded7a4012f00028..d37fe3af148a92cab875e7b130fbab889e060859 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -163,7 +163,7 @@ public:
        void recordLocation(DocIterator const & di);
 
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        InsetCode lyxCode() const { return MATH_HULL_CODE; }
 

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index e53c62e6ee6747d9ab644b7e7f595f0e59fd3946..6d873b3460d3d7148b34adefe37e35185a25068c 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -288,9 +288,9 @@ InsetSpaceParams InsetMathSpace::params() const
 }
 
 
-docstring InsetMathSpace::contextMenuName() const
+string InsetMathSpace::contextMenuName() const
 {
-       return from_ascii("context-mathspace");
+       return "context-mathspace";
 }
 
 

diff --git a/src/mathed/InsetMathSpace.h b/src/mathed/InsetMathSpace.h
index 83a9c59f45b1d57f9c538c8fe16b9a6ccf23749e..4f16f1640bf5b38b949c2a6c5c4f3e2d294e4c88 100644 (file)
--- a/src/mathed/InsetMathSpace.h
+++ b/src/mathed/InsetMathSpace.h
@@ -61,7 +61,7 @@ public:
        ///
        bool hasSettings() const { return true; }
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 2989e2be5ce01ba25c5aab5ccabdf091308552d4..2d36e4d2238f520851dfa306bf19d1bf5f1cf239 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -1367,9 +1367,9 @@ void MathMacroTemplate::infoize(odocstream & os) const
 }
 
 
-docstring MathMacroTemplate::contextMenuName() const
+string MathMacroTemplate::contextMenuName() const
 {
-       return from_ascii("context-math-macro-definition");
+       return "context-math-macro-definition";
 }
 
 } // namespace lyx

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 0efbb24a84b1114c6cff4894821c3ced201748fd..4e5fc721748ea131b963c488b384701f1671c6fb 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -104,7 +104,7 @@ public:
        ///
        void infoize(odocstream & os) const;
        ///
-       docstring contextMenuName() const;
+       std::string contextMenuName() const;
 protected:
        ///
        virtual void doDispatch(Cursor & cur, FuncRequest & cmd);