adjust for boost 1.30.0

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index a0a209b7667c8f6ca3aea5c6f950b8cba36b0706..3acbdaa3499179b52241bcb22b7357bd289d0a27 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,5 +1,9 @@
 2003-03-03  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+       * insetbutton.C (view): adjust for boost 1.30.0
+       * insetcollapsable.C (view): ditto
+       * insetgraphics.C (statusChanged): ditto
+
        * insettext.h: move paragraphs to be public.
 
 2003-03-02  Lars Gullik Bjønnes  <larsbj@gullik.net>

diff --git a/src/insets/insetbutton.C b/src/insets/insetbutton.C
index 13c399043f05a74adf2fee33dd81e65a34556b51..aa1830d714d9353baf5bb6ccce49b0d3ad462ecd 100644 (file)
--- a/src/insets/insetbutton.C
+++ b/src/insets/insetbutton.C
@@ -122,7 +122,8 @@ void InsetButton::cache(BufferView * bv) const
 }
 
 
+#warning Shouldnt this really return a shared_ptr<BufferView>? (Lgb)
 BufferView * InsetButton::view() const
 {
-       return view_.get();
+       return view_.lock().get();
 }

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index b01fd7082b941329551845748d137a866209ba0c..8ad264f22bc7c96dffef7e736b242264767774c2 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -665,11 +665,11 @@ void InsetCollapsable::markErased()
        inset.markErased();
 }
 
- 
+
 bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
 {
        bool found = inset.nextChange(bv, length);
- 
+
        if (first_after_edit && !found)
                close(bv);
        else if (!found)
@@ -677,7 +677,7 @@ bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
        return found;
 }
 
- 
+
 bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
                                     bool cs, bool mw)
 {
@@ -727,7 +727,5 @@ void InsetCollapsable::cache(BufferView * bv) const
 
 BufferView * InsetCollapsable::view() const
 {
-       return view_.get();
+       return view_.lock().get();
 }
-
-

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index bf44b496d9e90d54bf3d5e692b7adcb73541bc32..fede136172db1409ffd0e093e219d194d6562f98 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -589,7 +589,7 @@ string const InsetGraphics::prepareFile(Buffer const * buf) const
                if (formats.getFormat(to)->extension() == GetExtension(orig_file))
                        return RemoveExtension(orig_file_with_path);
                return orig_file_with_path;
-       } 
+       }
 
        // We're going to be running the exported buffer through the LaTeX
        // compiler, so must ensure that LaTeX can cope with the graphics
@@ -635,12 +635,12 @@ string const InsetGraphics::prepareFile(Buffer const * buf) const
                if (from == to) {
                        // No conversion is needed. LaTeX can handle the
                        // graphic file as is.
-                       if (formats.getFormat(to)->extension() == GetExtension(orig_file)) 
+                       if (formats.getFormat(to)->extension() == GetExtension(orig_file))
                                return RemoveExtension(temp_file);
                        return temp_file;
                }
        }
-       
+
        string const outfile_base = RemoveExtension(temp_file);
        lyxerr[Debug::GRAPHICS]
                << "\tThe original file is " << orig_file << "\n"
@@ -806,8 +806,8 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
 
 void InsetGraphics::statusChanged()
 {
-       if (cache_->view.get())
-               cache_->view.get()->updateInset(this, false);
+       if (!cache_->view.expired())
+               cache_->view.lock()->updateInset(this, false);
 }
 
 

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 22428eac0d81e45c8ecfacc4fac0b46470e978e2..6ac9de5d4e3898cf789d8ba38c30be6a9950037d 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-03  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * formulabase.h: adjust for boost 1.30.0
+
 2003-02-27  Angus Leeming  <leeming@lyx.org>
 
        * formulabase.C (localDispatch): collapse LFUN_REF_APPLY to
@@ -16,7 +20,7 @@
 
 2003-02-26  Alfredo Braunstein <abraunst@libero.it>
 
-       * formula.C (draw): strip also the other argument (the owner inset) in 
+       * formula.C (draw): strip also the other argument (the owner inset) in
        the call to PreviewImage::image
 
 2003-02-26  Angus Leeming  <leeming@lyx.org>
@@ -30,7 +34,7 @@
 
 2003-02-25  Alfredo Braunstein <abraunst@libero.it>
 
-       * formula.C (draw): eliminate BufferView argument in call to 
+       * formula.C (draw): eliminate BufferView argument in call to
        PreviewImage::image
 
 2003-02-25  Angus Leeming  <leeming@lyx.org>
@@ -55,11 +59,11 @@
        * math_parser.C (parse1): Do not remove braces for {<expr>}^
 
 2003-02-13  Bo Peng <bpeng@rice.edu>
- 
+
        * math_cursor.h:
        * math_cursor.C (backspace, erase): return false for empty mathboxes.
 
-       * formulabase.C: When LFUN_DELETE, LFUN_BACKSPACE return false, delete 
+       * formulabase.C: When LFUN_DELETE, LFUN_BACKSPACE return false, delete
                the empty mathbox. Fix Bug 686.
 
 2003-01-12  Michael Schmitt <michael.schmitt@teststep.org>

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index b2c3fa4034cdebe9f2b5d71431e7f96350d95fab..cd4ea1dc903a3c89a734794f7091251ffab05f7a 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -675,7 +675,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
-       case LFUN_MATH_SIZE: 
+       case LFUN_MATH_SIZE:
 #if 0
                if (!arg.empty()) {
                        bv->lockedInsetStoreUndo(Undo::EDIT);

diff --git a/src/mathed/formulabase.h b/src/mathed/formulabase.h
index 9c53c47c57bb8aabd727eee9afadb9c512a620e3..0f8cd2e52237e2d5080ebfa123d7c706855b584d 100644 (file)
--- a/src/mathed/formulabase.h
+++ b/src/mathed/formulabase.h
@@ -89,7 +89,11 @@ public:
        ///
        virtual void updateLocal(BufferView * bv, bool mark_dirty);
        ///
-       BufferView * view() const { return view_.get(); }
+#warning move this to formulabase.C (Lgb)
+       // And shouldn't this really return a shared_ptr<BufferView> instead?
+       BufferView * view() const {
+               return view_.lock().get();
+       }
 
        ///
        virtual bool searchForward(BufferView *, string const &,