From 12fb894dc5b4b0a07ec355ff8eb959102755b470 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 31 Dec 2000 05:32:33 +0000 Subject: [PATCH] new file Floating.C git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1292 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++++ po/POTFILES.in | 28 ++++++++++++------------- src/Floating.C | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ src/Floating.h | 45 ++--------------------------------------- src/Makefile.am | 1 + 5 files changed, 79 insertions(+), 57 deletions(-) create mode 100644 src/Floating.C diff --git a/ChangeLog b/ChangeLog index 5944dc1b80..a67b40fed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-12-31 Lars Gullik Bjønnes + + * 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 * src/frontends/xforms/FormPreferences.C (feedback): fix diff --git a/po/POTFILES.in b/po/POTFILES.in index 59c622c560..6bbe76c923 100644 --- 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 index 0000000000..f908f83fd8 --- /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 + +#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 d47cb7d38a..6390adf48f 100644 --- 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 98747463dd..ec959332d2 100644 --- 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 \ -- 2.39.2