Move #includes out of header files.

[lyx.git] / src / LColor.h

diff --git a/src/LColor.h b/src/LColor.h
index 43405264c94b5ed4924062c21450a77516fbb34b..99e8c90efd3aa8012fbd2565e50f738a40c8b237 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -1,17 +1,26 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
+/**
+ * \file LColor.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *         Copyright 1998-2001 The LyX Team
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Martin Vermeer
  *
- *======================================================*/
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LCOLOR_H
 #define LCOLOR_H
 
 #include "LString.h"
+#include <boost/scoped_ptr.hpp>
 
 /**
   This is a stateless class.
@@ -78,6 +87,14 @@ public:
                note,
                /// Background color of notes
                notebg,
+               /// Text color for comments
+               comment,
+               /// Background color of comments
+               commentbg,
+               /// Text color for greyedout inset
+               greyedout,
+               /// Background color of greyedout inset
+               greyedoutbg,
 
 
                /// Color for the depth bars in the margin
@@ -166,6 +183,7 @@ public:
                ignore
        };
 
+       
        ///
        LColor();
        ///
@@ -174,6 +192,14 @@ public:
        ~LColor();
        ///
        void operator=(LColor const &);
+
+       ///
+       void LColor::fill(LColor::color c, 
+                       string const & lyxname,
+                       string const & x11name = string(),
+                       string const & latexname = string(), 
+                       string const & guiname = string()); 
+
        /// set the given LyX color to the color defined by the X11 name given
        void setColor(LColor::color col, string const & x11name);
        /// set the given LyX color to the color defined by the X11 name given
@@ -181,15 +207,25 @@ public:
 
        /// Get GUI name of color
        string const getGUIName(LColor::color c) const;
+       ///
+       string const getGUIName(string const & s) const;
 
        /// Get X11 name of color
        string const getX11Name(LColor::color c) const;
+       ///
+       string const getX11Name(string const & s) const;
 
        /// Get LaTeX name of color
        string const getLaTeXName(LColor::color c) const;
+       ///
+       string const getLaTeXName(string const & s) const;
 
        /// Get LyX name of color
        string const getLyXName(LColor::color c) const;
+       /// (string-to-string version not needed as it is identity)
+
+       ///
+       size_t size() const;
 
        /// get the color from the GUI name
        LColor::color getFromGUIName(string const & guiname) const;
@@ -199,7 +235,7 @@ private:
        ///
        struct Pimpl;
        ///
-       Pimpl * pimpl_;
+       boost::scoped_ptr<Pimpl> pimpl_;
 };
 
 /// the current color definitions