X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=dcb3fd17690188b779051b57dac497db1b0eff36;hb=7c98b3bd37f41ad05e9770d66774f999fbd17ff8;hp=b3af29f343f38c4911de6937e4432d7c5365c5f1;hpb=e5185674dec5f01e155f23bdd31bf8238539bb63;p=lyx.git diff --git a/src/buffer.h b/src/buffer.h index b3af29f343..dcb3fd1769 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -35,9 +35,6 @@ class LaTeXFeatures; class Language; class ParIterator; -// When lyx 1.3.x starts we should enable this -// btw. we should also test this with 1.2 so that we -// do not get any surprises. (Lgb) #define NO_COMPABILITY 1 /// @@ -148,7 +145,7 @@ public: bool save() const; /// Write file. Returns \c false if unsuccesful. - bool writeFile(string const &, bool) const; + bool writeFile(string const &) const; /// void writeFileAscii(string const & , int); @@ -200,15 +197,15 @@ public: Language const * getLanguage() const; /// int runChktex(); - /// - bool isLyxClean() const; + /// return true if the main lyx file does not need saving + bool isClean() const; /// bool isBakClean() const; /// bool isDepClean(string const & name) const; - /// - void markLyxClean() const; + /// mark the main lyx file as not needing saving + void markClean() const; /// void markBakClean(); @@ -280,23 +277,6 @@ public: /// std::vector > const getBibkeyList() const; /// - struct TocItem { - TocItem(Paragraph * p, int d, string const & s) - : par(p), depth(d), str(s) {} - /// - Paragraph * par; - /// - int depth; - /// - string str; - }; - /// - typedef std::vector SingleList; - /// - typedef std::map Lists; - /// - Lists const getLists() const; - /// std::vector const getLabelList(); /** This will clearly have to change later. Later we can have more @@ -411,6 +391,7 @@ public: } return tmp; } + /// Inset * operator*() { return *it; } @@ -480,7 +461,7 @@ Language const * Buffer::getLanguage() const inline -bool Buffer::isLyxClean() const +bool Buffer::isClean() const { return lyx_clean; } @@ -494,7 +475,7 @@ bool Buffer::isBakClean() const inline -void Buffer::markLyxClean() const +void Buffer::markClean() const { if (!lyx_clean) { lyx_clean = true; @@ -578,24 +559,6 @@ void Buffer::setParentName(string const & name) } -/// -inline -bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) -{ - return a.par == b.par && a.str == b.str; - // No need to compare depth. -} - - -/// -inline -bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) -{ - return !(a == b); - // No need to compare depth. -} - - /// inline bool operator==(Buffer::inset_iterator const & iter1,