From ebd4f002affec676b0d113d01cecc0fa95dbcee1 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sun, 24 Feb 2008 15:12:41 +0000 Subject: [PATCH] Andre's s/getBaseClass/baseClass/ cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23191 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 4 ++-- src/BufferParams.h | 2 +- src/LyXFunc.cpp | 4 ++-- src/frontends/qt4/GuiDocument.cpp | 4 ++-- src/insets/InsetInclude.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 6355dbcc67..0c2d1b4bb6 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1401,7 +1401,7 @@ bool BufferParams::setBaseClass(textclass_type tc) } -textclass_type BufferParams::getBaseClass() const +textclass_type BufferParams::baseClass() const { return baseClass_; } @@ -1409,7 +1409,7 @@ textclass_type BufferParams::getBaseClass() const void BufferParams::makeTextClass() { - textClass_.reset(new TextClass(textclasslist[getBaseClass()])); + textClass_.reset(new TextClass(textclasslist[baseClass()])); //FIXME It might be worth loading the children's modules here, //just as we load their bibliographies and such, instead of just diff --git a/src/BufferParams.h b/src/BufferParams.h index 0862dc3564..2a57dff066 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -107,7 +107,7 @@ public: /// std::string fontsize; ///Get the LyX TextClass (that is, the layout file) this document is using. - textclass_type getBaseClass() const; + textclass_type baseClass() const; /// Set the LyX TextClass (that is, the layout file) this document is using. /// NOTE: This does not call makeTextClass() to update the local TextClass. /// That needs to be done manually. diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index 1ab3ab368c..24a0b3c6cc 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -1613,7 +1613,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd) if (!tc_pair.first) break; - textclass_type const old_class = buffer->params().getBaseClass(); + textclass_type const old_class = buffer->params().baseClass(); textclass_type const new_class = tc_pair.second; if (old_class == new_class) @@ -1634,7 +1634,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd) BOOST_ASSERT(lyx_view_); Buffer * buffer = lyx_view_->buffer(); TextClassPtr oldClass = buffer->params().textClassPtr(); - textclass_type const tc = buffer->params().getBaseClass(); + textclass_type const tc = buffer->params().baseClass(); textclasslist.reset(tc); buffer->params().setBaseClass(tc); buffer->params().makeTextClass(); diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index d49ad159e6..6adc1f52e9 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1793,7 +1793,7 @@ void GuiDocument::updateParams(BufferParams const & params) } // text layout - latexModule->classCO->setCurrentIndex(params.getBaseClass()); + latexModule->classCO->setCurrentIndex(params.baseClass()); updatePagestyle(textClass().opt_pagestyle(), params.pagestyle); @@ -2113,7 +2113,7 @@ vector const GuiDocument::getSelectedModules() TextClass const & GuiDocument::textClass() const { - return textclasslist[bp_.getBaseClass()]; + return textclasslist[bp_.baseClass()]; } diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 137c5a17fb..686d445f53 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -441,7 +441,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os, Buffer * tmp = theBufferList().getBuffer(included_file.absFilename()); - if (tmp->params().getBaseClass() != masterBuffer->params().getBaseClass()) { + if (tmp->params().baseClass() != masterBuffer->params().baseClass()) { // FIXME UNICODE docstring text = bformat(_("Included file `%1$s'\n" "has textclass `%2$s'\n" -- 2.39.2