Author: vfr
Date: Sat Oct 29 16:48:55 2011
New Revision: 40058
URL: http://www.lyx.org/trac/changeset/40058
Log:
Change the type of the context menu name to string
There is no need for GUI-elements to use docstring.
Modified:
lyx-devel/trunk/src/BufferView.cpp
lyx-devel/trunk/src/BufferView.h
lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp
lyx-devel/trunk/src/frontends/qt4/GuiWorkArea_Private.h
lyx-devel/trunk/src/insets/Inset.cpp
lyx-devel/trunk/src/insets/Inset.h
lyx-devel/trunk/src/insets/InsetBibtex.cpp
lyx-devel/trunk/src/insets/InsetBibtex.h
lyx-devel/trunk/src/insets/InsetBox.cpp
lyx-devel/trunk/src/insets/InsetBox.h
lyx-devel/trunk/src/insets/InsetBranch.cpp
lyx-devel/trunk/src/insets/InsetBranch.h
lyx-devel/trunk/src/insets/InsetCitation.cpp
lyx-devel/trunk/src/insets/InsetCitation.h
lyx-devel/trunk/src/insets/InsetCollapsable.cpp
lyx-devel/trunk/src/insets/InsetCollapsable.h
lyx-devel/trunk/src/insets/InsetCommand.cpp
lyx-devel/trunk/src/insets/InsetCommand.h
lyx-devel/trunk/src/insets/InsetERT.h
lyx-devel/trunk/src/insets/InsetExternal.cpp
lyx-devel/trunk/src/insets/InsetExternal.h
lyx-devel/trunk/src/insets/InsetGraphics.cpp
lyx-devel/trunk/src/insets/InsetGraphics.h
lyx-devel/trunk/src/insets/InsetHyperlink.cpp
lyx-devel/trunk/src/insets/InsetHyperlink.h
lyx-devel/trunk/src/insets/InsetInclude.cpp
lyx-devel/trunk/src/insets/InsetInclude.h
lyx-devel/trunk/src/insets/InsetIndex.cpp
lyx-devel/trunk/src/insets/InsetIndex.h
lyx-devel/trunk/src/insets/InsetInfo.cpp
lyx-devel/trunk/src/insets/InsetInfo.h
lyx-devel/trunk/src/insets/InsetListings.cpp
lyx-devel/trunk/src/insets/InsetListings.h
lyx-devel/trunk/src/insets/InsetNewline.cpp
lyx-devel/trunk/src/insets/InsetNewline.h
lyx-devel/trunk/src/insets/InsetNewpage.cpp
lyx-devel/trunk/src/insets/InsetNewpage.h
lyx-devel/trunk/src/insets/InsetNomencl.cpp
lyx-devel/trunk/src/insets/InsetNomencl.h
lyx-devel/trunk/src/insets/InsetNote.cpp
lyx-devel/trunk/src/insets/InsetNote.h
lyx-devel/trunk/src/insets/InsetPhantom.cpp
lyx-devel/trunk/src/insets/InsetPhantom.h
lyx-devel/trunk/src/insets/InsetPreview.h
lyx-devel/trunk/src/insets/InsetScript.cpp
lyx-devel/trunk/src/insets/InsetScript.h
lyx-devel/trunk/src/insets/InsetSpace.cpp
lyx-devel/trunk/src/insets/InsetSpace.h
lyx-devel/trunk/src/insets/InsetTabular.cpp
lyx-devel/trunk/src/insets/InsetTabular.h
lyx-devel/trunk/src/insets/InsetText.cpp
lyx-devel/trunk/src/insets/InsetText.h
lyx-devel/trunk/src/insets/InsetVSpace.cpp
lyx-devel/trunk/src/insets/InsetVSpace.h
lyx-devel/trunk/src/mathed/InsetMathHull.cpp
lyx-devel/trunk/src/mathed/InsetMathHull.h
lyx-devel/trunk/src/mathed/InsetMathSpace.cpp
lyx-devel/trunk/src/mathed/InsetMathSpace.h
lyx-devel/trunk/src/mathed/MathMacroTemplate.cpp
lyx-devel/trunk/src/mathed/MathMacroTemplate.h
Modified: lyx-devel/trunk/src/BufferView.cpp
==============================================================================
--- lyx-devel/trunk/src/BufferView.cpp Sat Oct 29 13:22:17 2011 (r40057)
+++ lyx-devel/trunk/src/BufferView.cpp Sat Oct 29 16:48:55 2011 (r40058)
@@ -561,7 +561,7 @@
}
-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())
Modified: lyx-devel/trunk/src/BufferView.h
==============================================================================
--- lyx-devel/trunk/src/BufferView.h Sat Oct 29 13:22:17 2011 (r40057)
+++ lyx-devel/trunk/src/BufferView.h Sat Oct 29 16:48:55 2011 (r40058)
@@ -124,7 +124,7 @@
/// \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
Modified: lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/frontends/qt4/GuiWorkArea.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -716,7 +716,7 @@
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_;
Modified: lyx-devel/trunk/src/frontends/qt4/GuiWorkArea_Private.h
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiWorkArea_Private.h Sat Oct 29
13:22:17 2011 (r40057)
+++ lyx-devel/trunk/src/frontends/qt4/GuiWorkArea_Private.h Sat Oct 29
16:48:55 2011 (r40058)
@@ -181,7 +181,7 @@
/// 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
Modified: lyx-devel/trunk/src/insets/Inset.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/Inset.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/Inset.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -258,15 +258,15 @@
}
-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();
}
Modified: lyx-devel/trunk/src/insets/Inset.h
==============================================================================
--- lyx-devel/trunk/src/insets/Inset.h Sat Oct 29 13:22:17 2011 (r40057)
+++ lyx-devel/trunk/src/insets/Inset.h Sat Oct 29 16:48:55 2011 (r40058)
@@ -408,11 +408,11 @@
/// \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;
Modified: lyx-devel/trunk/src/insets/InsetBibtex.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBibtex.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBibtex.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -992,9 +992,9 @@
}
-docstring InsetBibtex::contextMenuName() const
+string InsetBibtex::contextMenuName() const
{
- return from_ascii("context-bibtex");
+ return "context-bibtex";
}
Modified: lyx-devel/trunk/src/insets/InsetBibtex.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBibtex.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBibtex.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -58,7 +58,7 @@
///
docstring xhtml(XHTMLStream &, OutputParams const &) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived
classes
Modified: lyx-devel/trunk/src/insets/InsetBox.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBox.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBox.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -530,9 +530,9 @@
}
-docstring InsetBox::contextMenuName() const
+string InsetBox::contextMenuName() const
{
- return from_ascii("context-box");
+ return "context-box";
}
Modified: lyx-devel/trunk/src/insets/InsetBox.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBox.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBox.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -133,7 +133,7 @@
/// used by the constructors
void init();
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
InsetBoxParams params_;
Modified: lyx-devel/trunk/src/insets/InsetBranch.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBranch.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBranch.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -257,9 +257,9 @@
}
-docstring InsetBranch::contextMenuName() const
+string InsetBranch::contextMenuName() const
{
- return from_ascii("context-branch");
+ return "context-branch";
}
Modified: lyx-devel/trunk/src/insets/InsetBranch.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBranch.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetBranch.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -79,7 +79,7 @@
///
void validate(LaTeXFeatures &) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
void addToToc(DocIterator const &) const;
///
Modified: lyx-devel/trunk/src/insets/InsetCitation.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCitation.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetCitation.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -611,9 +611,9 @@
}
-docstring InsetCitation::contextMenuName() const
+string InsetCitation::contextMenuName() const
{
- return from_ascii("context-citation");
+ return "context-citation";
}
Modified: lyx-devel/trunk/src/insets/InsetCitation.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCitation.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetCitation.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -63,7 +63,7 @@
///
void addToToc(DocIterator const &) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived
classes
Modified: lyx-devel/trunk/src/insets/InsetCollapsable.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCollapsable.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetCollapsable.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -618,15 +618,15 @@
}
-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::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
Modified: lyx-devel/trunk/src/insets/InsetCollapsable.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCollapsable.h Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetCollapsable.h Sat Oct 29 16:48:55
2011 (r40058)
@@ -141,9 +141,9 @@
///
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:
Modified: lyx-devel/trunk/src/insets/InsetCommand.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCommand.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetCommand.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -210,9 +210,9 @@
}
-docstring InsetCommand::contextMenuName() const
+string InsetCommand::contextMenuName() const
{
- return from_ascii("context-") + from_ascii(insetName(p_.code()));
+ return "context-" + insetName(p_.code());
}
Modified: lyx-devel/trunk/src/insets/InsetCommand.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCommand.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetCommand.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -91,7 +91,7 @@
/// \name Methods relaying to the InsetCommandParams p_
//@{
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
bool showInsetDialog(BufferView * bv) const;
///
Modified: lyx-devel/trunk/src/insets/InsetERT.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetERT.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetERT.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -38,8 +38,8 @@
///
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; }
Modified: lyx-devel/trunk/src/insets/InsetExternal.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetExternal.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetExternal.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -802,9 +802,9 @@
}
-docstring InsetExternal::contextMenuName() const
+string InsetExternal::contextMenuName() const
{
- return from_ascii("context-external");
+ return "context-external";
}
Modified: lyx-devel/trunk/src/insets/InsetExternal.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetExternal.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetExternal.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -111,7 +111,7 @@
/// \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);
///
Modified: lyx-devel/trunk/src/insets/InsetGraphics.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetGraphics.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetGraphics.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -1054,9 +1054,9 @@
}
-docstring InsetGraphics::contextMenuName() const
+string InsetGraphics::contextMenuName() const
{
- return from_ascii("context-graphics");
+ return "context-graphics";
}
Modified: lyx-devel/trunk/src/insets/InsetGraphics.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetGraphics.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetGraphics.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -98,7 +98,7 @@
///
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; }
///
Modified: lyx-devel/trunk/src/insets/InsetHyperlink.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetHyperlink.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetHyperlink.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -271,9 +271,9 @@
}
-docstring InsetHyperlink::contextMenuName() const
+string InsetHyperlink::contextMenuName() const
{
- return from_ascii("context-hyperlink");
+ return "context-hyperlink";
}
Modified: lyx-devel/trunk/src/insets/InsetHyperlink.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetHyperlink.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetHyperlink.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -42,7 +42,7 @@
///
docstring toolTip(BufferView const & bv, int x, int y) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
void validate(LaTeXFeatures &) const;
///
Modified: lyx-devel/trunk/src/insets/InsetInclude.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetInclude.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetInclude.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -985,9 +985,9 @@
}
-docstring InsetInclude::contextMenuName() const
+string InsetInclude::contextMenuName() const
{
- return from_ascii("context-include");
+ return "context-include";
}
Modified: lyx-devel/trunk/src/insets/InsetInclude.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetInclude.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetInclude.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -103,7 +103,7 @@
///
void updateBuffer(ParIterator const &, UpdateType);
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived
classes
Modified: lyx-devel/trunk/src/insets/InsetIndex.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetIndex.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetIndex.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -373,9 +373,9 @@
}
-docstring InsetIndex::contextMenuName() const
+string InsetIndex::contextMenuName() const
{
- return from_ascii("context-index");
+ return "context-index";
}
@@ -572,10 +572,10 @@
}
-docstring InsetPrintIndex::contextMenuName() const
+string InsetPrintIndex::contextMenuName() const
{
return buffer().masterBuffer()->params().use_indices ?
- from_ascii("context-indexprint") : docstring();
+ "context-indexprint" : string();
}
Modified: lyx-devel/trunk/src/insets/InsetIndex.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetIndex.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetIndex.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -79,7 +79,7 @@
/// 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 @@
///
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;
///
Modified: lyx-devel/trunk/src/insets/InsetInfo.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetInfo.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetInfo.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -462,7 +462,7 @@
}
-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::contextMenuName() const
+string InsetInfo::contextMenuName() const
{
- return from_ascii("context-info");
+ return "context-info";
}
Modified: lyx-devel/trunk/src/insets/InsetInfo.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetInfo.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetInfo.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -126,9 +126,9 @@
///
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; }
Modified: lyx-devel/trunk/src/insets/InsetListings.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetListings.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/insets/InsetListings.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -300,9 +300,9 @@
}
-docstring InsetListings::contextMenuName() const
+string InsetListings::contextMenuName() const
{
- return from_ascii("context-listings");
+ return "context-listings";
}
Modified: lyx-devel/trunk/src/insets/InsetListings.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetListings.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetListings.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -67,7 +67,7 @@
///
InsetListingsParams & params() { return params_; }
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
void doDispatch(Cursor & cur, FuncRequest & cmd);
///
Modified: lyx-devel/trunk/src/insets/InsetNewline.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNewline.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNewline.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -259,9 +259,9 @@
}
-docstring InsetNewline::contextMenuName() const
+string InsetNewline::contextMenuName() const
{
- return from_ascii("context-newline");
+ return "context-newline";
}
Modified: lyx-devel/trunk/src/insets/InsetNewline.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNewline.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNewline.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -77,7 +77,7 @@
///
ColorCode ColorName() const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
Inset * clone() const { return new InsetNewline(*this); }
///
Modified: lyx-devel/trunk/src/insets/InsetNewpage.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNewpage.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNewpage.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -256,9 +256,9 @@
}
-docstring InsetNewpage::contextMenuName() const
+string InsetNewpage::contextMenuName() const
{
- return from_ascii("context-newpage");
+ return "context-newpage";
}
Modified: lyx-devel/trunk/src/insets/InsetNewpage.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNewpage.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNewpage.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -81,7 +81,7 @@
///
ColorCode ColorName() const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
Inset * clone() const { return new InsetNewpage(*this); }
///
Modified: lyx-devel/trunk/src/insets/InsetNomencl.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNomencl.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNomencl.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -334,9 +334,9 @@
}
-docstring InsetPrintNomencl::contextMenuName() const
+string InsetPrintNomencl::contextMenuName() const
{
- return from_ascii("context-nomenclprint");
+ return "context-nomenclprint";
}
Modified: lyx-devel/trunk/src/insets/InsetNomencl.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNomencl.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNomencl.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -98,7 +98,7 @@
///
void latex(otexstream &, OutputParams const &) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
//@}
/// \name Static public methods obligated for InsetCommand derived
classes
Modified: lyx-devel/trunk/src/insets/InsetNote.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNote.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNote.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -322,9 +322,9 @@
}
-docstring InsetNote::contextMenuName() const
+string InsetNote::contextMenuName() const
{
- return from_ascii("context-note");
+ return "context-note";
}
bool InsetNote::allowSpellCheck() const
Modified: lyx-devel/trunk/src/insets/InsetNote.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetNote.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetNote.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -101,7 +101,7 @@
/// used by the constructors
void init();
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
friend class InsetNoteParams;
Modified: lyx-devel/trunk/src/insets/InsetPhantom.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetPhantom.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetPhantom.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -358,9 +358,9 @@
return docstring();
}
-docstring InsetPhantom::contextMenuName() const
+string InsetPhantom::contextMenuName() const
{
- return from_ascii("context-phantom");
+ return "context-phantom";
}
Modified: lyx-devel/trunk/src/insets/InsetPhantom.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetPhantom.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetPhantom.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -94,7 +94,7 @@
/// used by the constructors
void init();
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
friend class InsetPhantomParams;
Modified: lyx-devel/trunk/src/insets/InsetPreview.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetPreview.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetPreview.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -49,8 +49,8 @@
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;
Modified: lyx-devel/trunk/src/insets/InsetScript.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetScript.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetScript.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -421,9 +421,9 @@
}
-docstring InsetScript::contextMenuName() const
+string InsetScript::contextMenuName() const
{
- return from_ascii("context-script");
+ return "context-script";
}
Modified: lyx-devel/trunk/src/insets/InsetScript.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetScript.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetScript.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -109,7 +109,7 @@
///
Inset * clone() const { return new InsetScript(*this); }
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
//@}
/// \name Public functions inherited from InsetText class
Modified: lyx-devel/trunk/src/insets/InsetSpace.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetSpace.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetSpace.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -837,9 +837,9 @@
}
-docstring InsetSpace::contextMenuName() const
+string InsetSpace::contextMenuName() const
{
- return from_ascii("context-space");
+ return "context-space";
}
Modified: lyx-devel/trunk/src/insets/InsetSpace.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetSpace.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetSpace.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -150,7 +150,7 @@
// 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:
Modified: lyx-devel/trunk/src/insets/InsetTabular.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetTabular.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetTabular.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -3399,7 +3399,7 @@
}
-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::contextMenuName() const
+string InsetTabular::contextMenuName() const
{
- return from_ascii("context-tabular");
+ return "context-tabular";
}
Modified: lyx-devel/trunk/src/insets/InsetTabular.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetTabular.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetTabular.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -824,9 +824,9 @@
///
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;
Modified: lyx-devel/trunk/src/insets/InsetText.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetText.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetText.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -848,18 +848,18 @@
}
-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";
}
Modified: lyx-devel/trunk/src/insets/InsetText.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetText.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetText.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -203,9 +203,9 @@
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:
Modified: lyx-devel/trunk/src/insets/InsetVSpace.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetVSpace.cpp Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetVSpace.cpp Sat Oct 29 16:48:55 2011
(r40058)
@@ -232,9 +232,9 @@
}
-docstring InsetVSpace::contextMenuName() const
+string InsetVSpace::contextMenuName() const
{
- return from_ascii("context-vspace");
+ return "context-vspace";
}
Modified: lyx-devel/trunk/src/insets/InsetVSpace.h
==============================================================================
--- lyx-devel/trunk/src/insets/InsetVSpace.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/insets/InsetVSpace.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -32,7 +32,7 @@
///
bool hasSettings() const { return true; }
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
static void string2params(std::string const &, VSpace &);
///
Modified: lyx-devel/trunk/src/mathed/InsetMathHull.cpp
==============================================================================
--- lyx-devel/trunk/src/mathed/InsetMathHull.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/mathed/InsetMathHull.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -2252,9 +2252,9 @@
}
-docstring InsetMathHull::contextMenuName() const
+string InsetMathHull::contextMenuName() const
{
- return from_ascii("context-math");
+ return "context-math";
}
Modified: lyx-devel/trunk/src/mathed/InsetMathHull.h
==============================================================================
--- lyx-devel/trunk/src/mathed/InsetMathHull.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/mathed/InsetMathHull.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -163,7 +163,7 @@
void recordLocation(DocIterator const & di);
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
InsetCode lyxCode() const { return MATH_HULL_CODE; }
Modified: lyx-devel/trunk/src/mathed/InsetMathSpace.cpp
==============================================================================
--- lyx-devel/trunk/src/mathed/InsetMathSpace.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/mathed/InsetMathSpace.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -288,9 +288,9 @@
}
-docstring InsetMathSpace::contextMenuName() const
+string InsetMathSpace::contextMenuName() const
{
- return from_ascii("context-mathspace");
+ return "context-mathspace";
}
Modified: lyx-devel/trunk/src/mathed/InsetMathSpace.h
==============================================================================
--- lyx-devel/trunk/src/mathed/InsetMathSpace.h Sat Oct 29 13:22:17 2011
(r40057)
+++ lyx-devel/trunk/src/mathed/InsetMathSpace.h Sat Oct 29 16:48:55 2011
(r40058)
@@ -61,7 +61,7 @@
///
bool hasSettings() const { return true; }
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
///
bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
///
Modified: lyx-devel/trunk/src/mathed/MathMacroTemplate.cpp
==============================================================================
--- lyx-devel/trunk/src/mathed/MathMacroTemplate.cpp Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/mathed/MathMacroTemplate.cpp Sat Oct 29 16:48:55
2011 (r40058)
@@ -1367,9 +1367,9 @@
}
-docstring MathMacroTemplate::contextMenuName() const
+string MathMacroTemplate::contextMenuName() const
{
- return from_ascii("context-math-macro-definition");
+ return "context-math-macro-definition";
}
} // namespace lyx
Modified: lyx-devel/trunk/src/mathed/MathMacroTemplate.h
==============================================================================
--- lyx-devel/trunk/src/mathed/MathMacroTemplate.h Sat Oct 29 13:22:17
2011 (r40057)
+++ lyx-devel/trunk/src/mathed/MathMacroTemplate.h Sat Oct 29 16:48:55
2011 (r40058)
@@ -104,7 +104,7 @@
///
void infoize(odocstream & os) const;
///
- docstring contextMenuName() const;
+ std::string contextMenuName() const;
protected:
///
virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
