Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index c18e9b9e7db0a7694898e5a92f3e20e8dddbe362..2577abd1f823d63c01452f33c411dac08275068d 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1215,29 +1215,30 @@ TextClass const & BufferParams::getTextClass() const
 }
 
 
-TextClass_ptr BufferParams::getTextClass_ptr() const {
+TextClassPtr BufferParams::getTextClassPtr() const {
        return textClass_;
 }
 
 
-void BufferParams::setTextClass(TextClass_ptr tc) {
+void BufferParams::setTextClass(TextClassPtr tc) {
        textClass_ = tc;
 }
 
 
 bool BufferParams::setBaseClass(textclass_type tc)
 {
-       if (!textclasslist[tc].load()) {
-               docstring s = bformat(_("The document class %1$s."
-                                       "could not be loaded."),
+       bool retVal = true;
+       if (textclasslist[tc].load())
+               baseClass_ = tc;
+       else {
+               docstring s = 
+                       bformat(_("The document class %1$s could not be loaded."),
                 from_utf8(textclasslist[tc].name()));
                frontend::Alert::error(_("Could not load class"), s);
-               return false;
+               retVal = false;
        }
-       
-       baseClass_ = tc;
        makeTextClass();
-       return true;
+       return retVal;
 }
 
 
@@ -1257,19 +1258,20 @@ void BufferParams::makeTextClass()
 {
        textClass_.reset(new TextClass(textclasslist[getBaseClass()]));
        //FIXME It might be worth loading the children's modules here,
-       //instead of just doing a check in InsetInclude.
+       //just as we load their bibliographies and such, instead of just 
+       //doing a check in InsetInclude.
        LayoutModuleList::const_iterator it = layoutModules_.begin();
        for (; it != layoutModules_.end(); it++) {
                string const modName = *it;
                LyXModule * lm = moduleList[modName];
                if (!lm) {
                        docstring const msg =
-                                               bformat(_("The module %1$s has been requested by\n"
-                                               "this document but has not been found in the list of\n"
-                                               "available modules. If you recently installed it, you\n"
-                                               "probalby need to reconfigure LyX.\n"), from_utf8(modName));
+                               bformat(_("The module %1$s has been requested by\n"
+                                       "this document but has not been found in the list of\n"
+                                       "available modules. If you recently installed it, you\n"
+                                       "probalby need to reconfigure LyX.\n"), from_utf8(modName));
                        frontend::Alert::warning(_("Module not available"),
-                                                                                                                        msg + _("Some layouts may not be available."));
+                                       msg + _("Some layouts may not be available."));
                        lyxerr << "BufferParams::makeTextClass(): Module " <<
                                        modName << " requested but not found in module list." <<
                                        endl;