Fix bug 2115 ("blueline bug")

[lyx.git] / src / Floating.h

diff --git a/src/Floating.h b/src/Floating.h
index 5d4c260ca55f63f4d1db19c088fd5e22c2dd35a1..3daaeec15b16c6fc52c9360c558238071f01c47e 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -1,65 +1,65 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file Floating.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
  *
- *           Copyright 1998-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "LString.h"
+#include <string>
 
 /** This is a "float layout" object. It contains the parameters for how to
-    handle the different kinds of floats, default ones and user created ones.
-    Objects of this class is stored in a container in FloatList. The different
-    InsetFloat(s) have a pointer/reference through the name of the Floating
-    so that it knows how the different floats should be handled.
-*/
+ *  handle the different kinds of floats, default ones and user created ones.
+ *  Objects of this class is stored in a container in FloatList. The different
+ *  InsetFloat(s) have a pointer/reference through the name of the Floating
+ *  so that it knows how the different floats should be handled.
+ */
 class Floating {
 public:
        ///
        Floating();
        ///
-       Floating(string const & type, string const & placement,
-                string const & ext, string const & within,
-                string const & style, string const & name,
-                string const & listName, bool builtin = false);
+       Floating(std::string const & type, std::string const & placement,
+                std::string const & ext, std::string const & within,
+                std::string const & style, std::string const & name,
+                std::string const & listName, bool builtin = false);
        ///
-       string const & type() const;
+       std::string const & type() const;
        ///
-       string const & placement() const;
+       std::string const & placement() const;
        ///
-       string const & ext() const;
+       std::string const & ext() const;
        ///
-       string const & within() const;
+       std::string const & within() const;
        ///
-       string const & style() const;
+       std::string const & style() const;
        ///
-       string const & name() const;
+       std::string const & name() const;
        ///
-       string const & listName() const;
+       std::string const & listName() const;
        ///
        bool builtin() const;
 private:
        ///
-       string type_;
+       std::string type_;
        ///
-       string placement_;
+       std::string placement_;
        ///
-       string ext_;
+       std::string ext_;
        ///
-       string within_;
+       std::string within_;
        ///
-       string style_;
+       std::string style_;
        ///
-       string name_;
+       std::string name_;
        ///
-       string listName_;
+       std::string listName_;
        ///
        bool builtin_;
 };