From 80c1e18bda3da668a11cc3a0d7b41713d21f18c5 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 29 Nov 2010 23:47:55 +0000 Subject: [PATCH] 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 --- src/insets/InsetInfo.cpp | 2 +- src/insets/InsetInfo.h | 2 +- src/insets/InsetTabular.cpp | 2 +- src/insets/InsetText.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 28bce9e318..b22c69f7b6 100644 --- 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 ee64c016b6..1aee904e4f 100644 --- 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 b68d03a8c5..73344bd7b7 100644 --- 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 c8c8175036..cba292832a 100644 --- 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()) -- 2.39.2