tex2lyx/text.cpp: fix typos

[lyx.git] / src / insets / Inset.h

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 3b3e4306d32c5fe5eb8b982c7cf82f3999aace46..fbe664d5f6c3a43759b132d91d884b6ea7ced297 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -408,20 +408,14 @@ 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;
 
 
-       // FIXME This should really disappear in favor of 
-       //      docstring name() const { return from_ascii(insetName(lyxCode()))); }
-       // There's no reason to be using different names in different places.
-       // But to do this we would need to change the file format, since the names
-       // used there don't correspond to what is used here. 
-       ///
-       virtual docstring name() const;
+       virtual docstring layoutName() const;
        ///
        virtual InsetLayout const & getLayout() const;
        /// Is this inset's layout defined in the document's textclass?