add missing 'else'

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 3d1f8691fd07d8ef48102060e5852fb3f964703a..caedbaf9faac92a879ba5d93d329934878d624d4 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -9,10 +9,6 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxlayout_ptr_fwd.h"
 #include "lyxfont.h" // Just for LyXFont::FONT_SIZE
 #include "InsetList.h"
@@ -27,7 +23,7 @@
 class BufferParams;
 class BufferView;
 class Counters;
-class InsetBibKey;
+class InsetBibitem;
 class Language;
 class LaTeXFeatures;
 class ParagraphParameters;
@@ -94,11 +90,6 @@ public:
        ///
        void read();
 
-       ///
-       Paragraph * TeXOnePar(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow,
-                                bool moving_arg);
-
        ///
        int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
 
@@ -111,9 +102,6 @@ public:
                             std::ostream &, TexRow & texrow, bool moving_arg);
 
        ///
-       Paragraph * TeXEnvironment(Buffer const *, BufferParams const &,
-                                     std::ostream &, TexRow & texrow);
-       ///
        bool hasSameLayout(Paragraph const * par) const;
 
        ///
@@ -155,7 +143,7 @@ public:
        char itemdepth;
 
        ///
-       InsetBibKey * bibkey;  // ale970302
+       InsetBibitem * bibitem();  // ale970302
 
 #ifndef NO_NEXT
        ///
@@ -168,34 +156,34 @@ public:
 
        /// initialise tracking for this par
        void trackChanges(Change::Type = Change::UNCHANGED);
- 
+
        /// stop tracking
        void untrackChanges();
- 
+
        /// set entire paragraph to new text for change tracking
        void cleanChanges();
- 
+
        /// look up change type at given pos
        Change::Type lookupChange(lyx::pos_type pos) const;
- 
+
        /// look up change at given pos
        Change const lookupChangeFull(lyx::pos_type pos) const;
- 
+
        /// is there a change within the given range ?
        bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
 
        /// is there a non-addition in this range ?
        bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
- 
+
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
 
        /// reject change
        void rejectChange(lyx::pos_type start, lyx::pos_type end);
- 
+
        /// mark whole par as erased
        void markErased();
- 
+
        ///
        void previous(Paragraph *);
        ///
@@ -228,12 +216,12 @@ public:
        depth_type getMaxDepthAfter() const;
        ///
        void applyLayout(LyXLayout_ptr const & new_layout);
- 
+
        /// erase the char at the given position
        void erase(lyx::pos_type pos);
        /// erase the given range. Returns true if actually erased.
        bool erase(lyx::pos_type start, lyx::pos_type end);
- 
+
        /** Get uninstantiated font setting. Returns the difference
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
@@ -311,9 +299,6 @@ public:
        /// returns -1 if inset not found
        int getPositionOfInset(Inset const * inset) const;
 
-       /// some good comment here John?
-       Paragraph * getParFromID(int id) const;
-
        ///
        int stripLeadingSpaces();
 
@@ -330,8 +315,8 @@ public:
        //Counters & counters();
 
        friend void breakParagraph(BufferParams const & bparams,
-                    Paragraph * par, lyx::pos_type pos, int flag);
- 
+                   Paragraph * par, lyx::pos_type pos, int flag);
+
 private:
        ///
        LyXLayout_ptr layout_;
@@ -350,16 +335,16 @@ private:
        Pimpl * pimpl_;
 };
 
- 
-inline bool isInsertedText(Paragraph const * par, lyx::pos_type pos)
+
+inline bool isInsertedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par->lookupChange(pos) == Change::INSERTED;
+       return par.lookupChange(pos) == Change::INSERTED;
 }
- 
- 
-inline bool isDeletedText(Paragraph const * par, lyx::pos_type pos)
+
+
+inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
 {
-       return par->lookupChange(pos) == Change::DELETED;
+       return par.lookupChange(pos) == Change::DELETED;
 }
- 
+
 #endif // PARAGRAPH_H