From 33f6d5a1cf733299c6fc3f21e17963263bef7e2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Thu, 5 Apr 2001 08:03:26 +0000 Subject: [PATCH] add some std:: git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1898 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 4 ++++ src/insets/insetcollapsable.C | 2 +- src/insets/insetcollapsable.h | 2 +- src/insets/insettext.C | 6 +++--- src/insets/insettext.h | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 1ed65d8262..33d29e9869 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,9 @@ 2001-04-05 Lars Gullik Bjønnes + * insetcollapsable.[Ch] (getLabelList): add std:: on vector + + * insettext.[Ch] (getLabelList): add std:: on vector + * insetcollapsable.[Ch] (getLabelList): implement * insettext.[Ch] (getLabelList): implement diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index e64bac5f26..6a3643c4f3 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -468,7 +468,7 @@ void InsetCollapsable::resizeLyXText(BufferView * bv) const } -vector const InsetCollapsable::getLabelList() const +std::vector const InsetCollapsable::getLabelList() const { return inset.getLabelList(); } diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h index 35bd5562ca..3632e6b091 100644 --- a/src/insets/insetcollapsable.h +++ b/src/insets/insetcollapsable.h @@ -130,7 +130,7 @@ public: /// void resizeLyXText(BufferView *) const; /// - vector const getLabelList() const; + std::vector const getLabelList() const; protected: /// int ascent_collapsed(Painter &, LyXFont const &) const; diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 49c932b1cd..3bbcdf9bbf 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -1447,16 +1447,16 @@ bool InsetText::ShowInsetDialog(BufferView * bv) const } -vector const InsetText::getLabelList() const +std::vector const InsetText::getLabelList() const { - vector label_list; + std::vector label_list; LyXParagraph * tpar = par; while (tpar) { LyXParagraph::inset_iterator beg = tpar->inset_iterator_begin(); LyXParagraph::inset_iterator end = tpar->inset_iterator_end(); for (; beg != end; ++beg) { - vector const l = (*beg)->getLabelList(); + std::vector const l = (*beg)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } tpar = tpar->next(); diff --git a/src/insets/insettext.h b/src/insets/insettext.h index ce80a94b35..a473e81628 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -178,7 +178,7 @@ public: /// bool ShowInsetDialog(BufferView *) const; /// - vector const getLabelList() const; + std::vector const getLabelList() const; /// LyXParagraph * par; /// -- 2.39.2