anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 13:20:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Andre's s/getBaseClass/baseClass/ cleanup.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23191 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-02-24 15:12:41 +00:00
parent 0362c6aae7
commit ebd4f002af
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferParams.cpp
View File

@ -1401,7 +1401,7 @@ bool BufferParams::setBaseClass(textclass_type tc)
} }
textclass_type BufferParams::getBaseClass() const textclass_type BufferParams::baseClass() const
{ {
return baseClass_; return baseClass_;
} }
@ -1409,7 +1409,7 @@ textclass_type BufferParams::getBaseClass() const
void BufferParams::makeTextClass() 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, //FIXME It might be worth loading the children's modules here,
//just as we load their bibliographies and such, instead of just //just as we load their bibliographies and such, instead of just

2
src/BufferParams.h
View File

@ -107,7 +107,7 @@ public:
/// ///
std::string fontsize; std::string fontsize;
///Get the LyX TextClass (that is, the layout file) this document is using. ///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. /// Set the LyX TextClass (that is, the layout file) this document is using.
/// NOTE: This does not call makeTextClass() to update the local TextClass. /// NOTE: This does not call makeTextClass() to update the local TextClass.
/// That needs to be done manually. /// That needs to be done manually.

4
src/LyXFunc.cpp
View File

@ -1613,7 +1613,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
if (!tc_pair.first) if (!tc_pair.first)
break; 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; textclass_type const new_class = tc_pair.second;
if (old_class == new_class) if (old_class == new_class)
@ -1634,7 +1634,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
BOOST_ASSERT(lyx_view_); BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer(); Buffer * buffer = lyx_view_->buffer();
TextClassPtr oldClass = buffer->params().textClassPtr(); TextClassPtr oldClass = buffer->params().textClassPtr();
textclass_type const tc = buffer->params().getBaseClass(); textclass_type const tc = buffer->params().baseClass();
textclasslist.reset(tc); textclasslist.reset(tc);
buffer->params().setBaseClass(tc); buffer->params().setBaseClass(tc);
buffer->params().makeTextClass(); buffer->params().makeTextClass();

4
src/frontends/qt4/GuiDocument.cpp
View File

@ -1793,7 +1793,7 @@ void GuiDocument::updateParams(BufferParams const & params)
} }
// text layout // text layout
latexModule->classCO->setCurrentIndex(params.getBaseClass()); latexModule->classCO->setCurrentIndex(params.baseClass());
updatePagestyle(textClass().opt_pagestyle(), updatePagestyle(textClass().opt_pagestyle(),
params.pagestyle); params.pagestyle);
@ -2113,7 +2113,7 @@ vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
TextClass const & GuiDocument::textClass() const TextClass const & GuiDocument::textClass() const
{ {
return textclasslist[bp_.getBaseClass()]; return textclasslist[bp_.baseClass()];
} }

2
src/insets/InsetInclude.cpp
View File

@ -441,7 +441,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
Buffer * tmp = theBufferList().getBuffer(included_file.absFilename()); Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
if (tmp->params().getBaseClass() != masterBuffer->params().getBaseClass()) { if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
// FIXME UNICODE // FIXME UNICODE
docstring text = bformat(_("Included file `%1$s'\n" docstring text = bformat(_("Included file `%1$s'\n"
"has textclass `%2$s'\n" "has textclass `%2$s'\n"