new file Floating.C

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1292 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 5944dc1b80b8ea178c55e7ef90492794a6120027..a67b40fed68e006037ebd7a7c888caab62dcbfd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-31  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/Makefile.am (lyx_SOURCES): added Floating.C
+
+       * src/Floating.h: moved all the inlines to Floating.C
+
+       * src/Floating.C: new file
+
 2000-12-29  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/frontends/xforms/FormPreferences.C (feedback): fix

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 59c622c5603bf49229119b68e9af317e5922d8d6..6bbe76c9238b543b588a1d074c3a5eb31ac3312f 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,35 +53,35 @@ src/frontends/kde/refdlg.C
 src/frontends/kde/tocdlg.C
 src/frontends/kde/urldlg.C
 src/frontends/xforms/FormBase.h
-src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_citation.C
-src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_copyright.C
-src/frontends/xforms/FormDocument.C
+src/frontends/xforms/FormCopyright.C
 src/frontends/xforms/form_document.C
-src/frontends/xforms/FormError.C
+src/frontends/xforms/FormDocument.C
 src/frontends/xforms/form_error.C
-src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/form_graphics.C
-src/frontends/xforms/FormIndex.C
+src/frontends/xforms/FormGraphics.C
 src/frontends/xforms/form_index.C
+src/frontends/xforms/FormIndex.C
 src/frontends/xforms/FormInset.h
-src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_preferences.C
-src/frontends/xforms/FormPrint.C
+src/frontends/xforms/FormPreferences.C
 src/frontends/xforms/form_print.C
-src/frontends/xforms/FormRef.C
+src/frontends/xforms/FormPrint.C
 src/frontends/xforms/form_ref.C
-src/frontends/xforms/FormTabular.C
+src/frontends/xforms/FormRef.C
 src/frontends/xforms/form_tabular.C
-src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/FormToc.C
+src/frontends/xforms/FormTabularCreate.C
 src/frontends/xforms/form_toc.C
-src/frontends/xforms/FormUrl.C
+src/frontends/xforms/FormToc.C
 src/frontends/xforms/form_url.C
+src/frontends/xforms/FormUrl.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C
 src/frontends/xforms/xform_helpers.C

diff --git a/src/Floating.C b/src/Floating.C
new file mode 100644 (file)
index 0000000..f908f83
--- /dev/null
+++ b/src/Floating.C
@@ -0,0 +1,54 @@
+/* This file is part of
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *
+ *           Copyright 1998-2000 The LyX Team.
+ *
+ * ======================================================
+ */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "Floating.h"
+
+
+Floating::Floating() 
+{}
+
+
+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)
+{}
+
+
+string const & Floating::type() const
+{
+       return type_;
+}
+
+
+string const & Floating::placement() const
+{
+       return placement_;
+}
+
+
+string const & Floating::name() const
+{
+       return name_;
+}
+
+
+bool Floating::builtin() const
+{
+       return builtin_;
+}

diff --git a/src/Floating.h b/src/Floating.h
index d47cb7d38a295dbab5e377d9d331664ba7918f6c..6390adf48f4e9d89a2105c904c0cd0d9cd368731 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -16,6 +16,8 @@
 #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.
     Objects of this class is stored in a container in FloatList. The different
@@ -56,47 +58,4 @@ private:
        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

diff --git a/src/Makefile.am b/src/Makefile.am
index 98747463ddef22e044a346cd76160f33737a2807..ec959332d2d3848ed620fd7822d71907032f3ccf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,6 +40,7 @@ lyx_SOURCES = \
        DepTable.h \
        FloatList.C \
        FloatList.h \
+       Floating.C \
        Floating.h \
        FontInfo.C \
        FontInfo.h \