Merge branch 'master' into biblatex2

[lyx.git] / src / insets / InsetListings.h

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index 0782d68ec7c2f6f5b42d6f7d547b32accf88ec28..902fa0437e64009770293859e2540322c3b53fd9 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -18,6 +18,7 @@
 namespace lyx {
 
 class LaTeXFeatures;
+struct TexString;
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -25,8 +26,8 @@ class LaTeXFeatures;
 //
 /////////////////////////////////////////////////////////////////////////
 
-/// A collapsable text inset for program listings.
-class InsetListings : public InsetCollapsable
+/// A captionable and collapsable text inset for program listings.
+class InsetListings : public InsetCaptionable
 {
 public:
        ///
@@ -48,8 +49,6 @@ private:
        DisplayType display() const;
        ///
        docstring layoutName() const { return from_ascii("Listings"); }
-       // Update the counters of this inset and of its contents
-       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void write(std::ostream & os) const;
        ///
@@ -77,9 +76,9 @@ private:
        ///
        docstring const buttonLabel(BufferView const & bv) const;
        ///
-       docstring getCaption(OutputParams const &) const;
+       TexString getCaption(OutputParams const &) const;
        ///
-       bool insetAllowed(InsetCode c) const { return c == CAPTION_CODE; } 
+       bool insetAllowed(InsetCode c) const { return c == CAPTION_CODE || c == QUOTE_CODE; }
 
        ///
        InsetListingsParams params_;