X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFloating.h;h=5d4c260ca55f63f4d1db19c088fd5e22c2dd35a1;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=d47cb7d38a295dbab5e377d9d331664ba7918f6c;hpb=74b224fcba406f4ea4d1f1fa91a63aea39ca2712;p=lyx.git

diff --git a/src/Floating.h b/src/Floating.h
index d47cb7d38a..5d4c260ca5 100644
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -1,10 +1,10 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
  *
- *           Copyright 1998-2000 The LyX Team.
+ *           Copyright 1998-2001 The LyX Team.
  *
  * ======================================================
  */
@@ -12,9 +12,7 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include "LString.h"
 
 /** 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.
@@ -30,14 +28,22 @@ public:
 	Floating(string const & type, string const & placement,
 		 string const & ext, string const & within,
 		 string const & style, string const & name,
-		 bool builtin = false);
+		 string const & listName, bool builtin = false);
 	///
 	string const & type() const;
 	///
 	string const & placement() const;
 	///
+	string const & ext() const;
+	///
+	string const & within() const;
+	///
+	string const & style() const;
+	///
 	string const & name() const;
 	///
+	string const & listName() const;
+	///
 	bool builtin() const;
 private:
 	///
@@ -53,50 +59,9 @@ private:
 	///
 	string name_;
 	///
+	string listName_;
+	///
 	bool builtin_;
 };
 
-
-inline
-Floating::Floating() 
-{}
-
-
-inline
-Floating::Floating(string const & type, string const & placement,
-		   string const & ext, string const & within,
-		   string const & style, string const & name,
-		   bool builtin)
-	: type_(type), placement_(placement), ext_(ext), within_(within),
-	  style_(style), name_(name), builtin_(builtin)
-{}
-
-
-inline
-string const & Floating::type() const
-{
-	return type_;
-}
-
-
-inline
-string const & Floating::placement() const
-{
-	return placement_;
-}
-
-
-inline
-string const & Floating::name() const
-{
-	return name_;
-}
-
-
-inline
-bool Floating::builtin() const
-{
-	return builtin_;
-}
-
 #endif