FindAdv: Amend ec387b6d: Handle search for '{' and '}'

[lyx.git] / src / Session.h

diff --git a/src/Session.h b/src/Session.h
index 65bf19de1342be91495ff0c51c33813d25a191a8..857e0561000395445e11eb1f27d25fd03c80b859 100644 (file)
--- a/src/Session.h
+++ b/src/Session.h
@@ -64,10 +64,10 @@ public:
        explicit LastFilesSection(unsigned int num = 4);
 
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        /// Return lastfiles container (vector)
        LastFiles const lastFiles() const { return lastfiles; }
@@ -119,10 +119,10 @@ public:
 
 public:
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        /// Return lastopened container (vector)
        LastOpened const getfiles() const { return lastopened; }
@@ -161,10 +161,10 @@ public:
        LastFilePosSection() : num_lastfilepos(100) {}
 
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        /** add cursor position to the fname entry in the filepos list
            @param pos file name and position of the cursor when the BufferView is closed.
@@ -229,9 +229,8 @@ public:
        typedef std::vector<Bookmark> BookmarkList;
 
 public:
-       /// constructor, set max_bookmarks
-       /// allow 9 regular bookmarks, bookmark 0 is temporary
-       BookmarksSection() : bookmarks(10), max_bookmarks(9) {}
+       ///
+       BookmarksSection() : bookmarks(max_bookmarks + 1) {}
 
        /// Save the current position as bookmark
        void save(support::FileName const & fname, pit_type bottom_pit, pos_type bottom_pos,
@@ -247,29 +246,36 @@ public:
        bool hasValid() const;
 
        ///
-       unsigned int size() const { return max_bookmarks; }
+       unsigned int size() const { return bookmarks.size(); }
 
        /// clear all bookmarks
        void clear();
 
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        /** return bookmark list. Non-const container is used since
                bookmarks will be cleaned after use.
        */
        BookmarkList & load() { return bookmarks; }
 
+       ///
+       typedef std::vector<std::pair<unsigned int, pos_type>> BookmarkPosList;
+
+       /// return a list of bookmarks and position for this paragraph
+       BookmarkPosList bookmarksInPar(support::FileName const & fn, int par_id) const;
+
 private:
 
+       /// allow 9 regular bookmarks, bookmark 0 is temporary
+       unsigned int const max_bookmarks = 9;
+
        /// a list of bookmarks
        BookmarkList bookmarks;
 
-       ///
-       unsigned int const max_bookmarks;
 };
 
 
@@ -283,10 +289,10 @@ public:
        ///
        LastCommandsSection(unsigned int num);
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        /// Return lastcommands container (vector)
        LastCommands const getcommands() const { return lastcommands; }
@@ -327,10 +333,10 @@ public:
        explicit AuthFilesSection();
 
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        ///
        bool find(std::string const & name) const;
@@ -351,10 +357,10 @@ public:
        explicit ShellEscapeSection() {};
 
        ///
-       void read(std::istream & is);
+       void read(std::istream & is) override;
 
        ///
-       void write(std::ostream & os) const;
+       void write(std::ostream & os) const override;
 
        ///
        bool find(std::string const & name) const;