X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=03c5db72318e79b7c6329a289d35bcc5d12516f8;hb=627f2c70fa6d5c75ef4dfe4e7252adc7c141e6f4;hp=0395b3e0cf53a7d355bd260727b89f71f5cedc83;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/Spacing.h b/src/Spacing.h index 0395b3e0cf..03c5db7231 100644 --- a/src/Spacing.h +++ b/src/Spacing.h @@ -1,24 +1,19 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== +/** + * \file src/Spacing.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 1995 Matthias Ettrich - * Copyright 1995-2001 The LyX Team. - * - * ====================================================== */ + * Full author contact details are available in file CREDITS. + */ #ifndef SPACING_H #define SPACING_H -#ifdef __GNUG__ -#pragma interface -#endif - #include -#include "LString.h" /// class Spacing { @@ -42,7 +37,7 @@ public: Spacing(Spacing::Space sp, float val = 1.0) { set(sp, val); } - Spacing(Spacing::Space sp, string const & val) { + Spacing(Spacing::Space sp, std::string const & val) { set(sp, val); } /// @@ -56,13 +51,13 @@ public: /// void set(Spacing::Space sp, float val = 1.0); /// - void set(Spacing::Space sp, string const & val) ; + void set(Spacing::Space sp, std::string const & val) ; /// void writeFile(std::ostream &, bool para = false) const; /// - string const writeEnvirBegin() const; + std::string const writeEnvirBegin() const; /// - string const writeEnvirEnd() const; + std::string const writeEnvirEnd() const; private: /// @@ -70,7 +65,7 @@ private: /// float value; /// names of line spacing - static string const spacing_string[]; + static std::string const spacing_string[]; };