Compile fix: solve the merge conflicts in the correct way ;)

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

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 28bce9e31874caa7cccb47b09a6a6e68fa0220e1..b22c69f7b60b198d5ed11cc5c97ea77c136f80b2 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -452,7 +452,7 @@ void InsetInfo::updateInfo()
 }
 
 
-docstring InsetInfo::contextMenuName() const
+docstring InsetInfo::contextMenu(BufferView const &, int, int) const
 {
        //FIXME: We override the implementation of InsetCollapsable,
        //because this inset is not a collapsable inset.

diff --git a/src/insets/InsetInfo.h b/src/insets/InsetInfo.h
index ee64c016b68238e850392842a028e176d4affdd0..1aee904e4f5f1068a5ff330edcb220777bc88544 100644 (file)
--- a/src/insets/InsetInfo.h
+++ b/src/insets/InsetInfo.h
@@ -126,7 +126,7 @@ public:
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
-       docstring contextMenuName() const;
+       docstring contextMenu(BufferView const &, int, int) const;
        ///
        docstring contextMenuName() const;
        /// should paragraph indendation be ommitted in any case?

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index b68d03a8c55dd91bb4208954c61af07aa65171fc..73344bd7b7a8f290ba1c6f12c6117d324f7d4343 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3327,7 +3327,7 @@ void InsetTabular::write(ostream & os) const
 }
 
 
-docstring InsetTabular::contextMenuName() const
+docstring InsetTabular::contextMenu(BufferView const &, int, int) const
 {
        // FIXME: depending on the selection state,
        // we could offer a different menu.

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index c8c8175036aa2a5dfb2b20b893568c6643864e27..cba292832a4b0b35e1a06661040c342cf702c5cb 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -813,7 +813,7 @@ void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y,
 }
 
 
-docstring InsetText::contextMenuName() const
+docstring InsetText::contextMenu(BufferView const &, int, int) const
 {
        docstring context_menu = contextMenuName();
        if (context_menu != InsetText::contextMenuName())