Add some constness where we can.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24883 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index da5098a1c44dc42bad293979028322347a6ddfd2..b276c95a6034a78a05cb861b437a64b060eb56be 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1398,7 +1398,7 @@ DocumentClass const & BufferParams::documentClass() const
 }
 
 
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
        return doc_class_;
 }
 

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 46c02433408bd064f34123f4615c8ab7e5967937..dae8c4e3b2a086149e513f1cdef6bfd13685d69b 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -118,7 +118,7 @@ public:
        DocumentClass const & documentClass() const;
        /// \return A pointer to the DocumentClass currently in use: the BaseClass 
        /// as modified by modules. 
-       DocumentClass * documentClassPtr() const;
+       DocumentClass const * documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 88cd8c4a15bfc28000da8f803b1c41efc9a8d230..9003d95723c639bf8e7b3983c64292b7bbc7ae3a 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1532,7 +1532,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        LASSERT(lyx_view_, /**/);
                        
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        Cursor & cur = view()->cursor();
                        cur.recordUndoFullDocument();
                        
@@ -1561,7 +1561,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_MODULES_CLEAR: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().clearLayoutModules();
                        buffer->params().makeDocumentClass();
@@ -1573,7 +1573,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_MODULE_ADD: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().addLayoutModule(argument);
                        buffer->params().makeDocumentClass();
@@ -1598,7 +1598,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
 
                        //Save the old, possibly modular, layout for use in conversion.
-                       DocumentClass * oldDocClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldDocClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().setBaseClass(argument);
                        buffer->params().makeDocumentClass();
@@ -1610,7 +1610,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_RELOAD: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        LayoutFileIndex bc = buffer->params().baseClassID();
                        LayoutFileList::get().reset(bc);
                        buffer->params().setBaseClass(bc);
@@ -1859,7 +1859,7 @@ bool LyXFunc::wasMetaKey() const
 }
 
 
-void LyXFunc::updateLayout(DocumentClass * oldlayout,Buffer * buffer)
+void LyXFunc::updateLayout(DocumentClass const * const oldlayout, Buffer * buffer)
 {
        lyx_view_->message(_("Converting document to new document class..."));
        

diff --git a/src/LyXFunc.h b/src/LyXFunc.h
index 85e74533d3f874864f8b3be69032226c7792d15a..2a76ce78e5866503e10bc884532040ae61921633 100644 (file)
--- a/src/LyXFunc.h
+++ b/src/LyXFunc.h
@@ -130,7 +130,7 @@ private:
        ///
        bool ensureBufferClean(BufferView * bv);
        ///
-       void updateLayout(DocumentClass * oldlayout, Buffer * buffer);
+       void updateLayout(DocumentClass const * const oldlayout, Buffer * buffer);
 };
 
 /// Implementation is in LyX.cpp