From 2b4fb2394132acb64e513fcd1a61c1a31f3df4db Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Wed, 16 Nov 2011 00:38:06 +0000 Subject: [PATCH] Clarify by renaming some arguments. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40200 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 6c258f73ff..2409823008 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1549,10 +1549,10 @@ BufferView const * GuiView::currentBufferView() const #if (QT_VERSION >= 0x040400) docstring GuiView::GuiViewPrivate::autosaveAndDestroy( - Buffer const * orig, Buffer * buffer) + Buffer const * orig, Buffer * clone) { - bool const success = buffer->autoSave(); - delete buffer; + bool const success = clone->autoSave(); + delete clone; busyBuffers.remove(orig); return success ? _("Automatic save done.") @@ -3038,37 +3038,37 @@ bool GuiView::goToFileRow(string const & argument) #if (QT_VERSION >= 0x040400) template -Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format) +Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * clone, string const & format) { Buffer::ExportStatus const status = func(format); // the cloning operation will have produced a clone of the entire set of // documents, starting from the master. so we must delete those. - Buffer * mbuf = const_cast(buffer->masterBuffer()); + Buffer * mbuf = const_cast(clone->masterBuffer()); delete mbuf; busyBuffers.remove(orig); return status; } -Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format) +Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * clone, string const & format) { Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport; - return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format); + return runAndDestroy(bind(mem_func, clone, _1, true), orig, clone, format); } -Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format) +Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * clone, string const & format) { Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport; - return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format); + return runAndDestroy(bind(mem_func, clone, _1, false), orig, clone, format); } -Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format) +Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * clone, string const & format) { Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview; - return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format); + return runAndDestroy(bind(mem_func, clone, _1), orig, clone, format); } #else -- 2.39.5