X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.h;h=4d4acc9bb3f14b25aed5d33523afb59fc85c2459;hb=dbd627f5210d025bfc97ef8a94bbe90ff290c611;hp=ac4eec1670bf35f03e273f42fedafafd5aa1b762;hpb=2e385ab589e5ccc90f3a13aa45b2c5fca3b02d60;p=lyx.git diff --git a/src/lengthcommon.h b/src/lengthcommon.h index ac4eec1670..4d4acc9bb3 100644 --- a/src/lengthcommon.h +++ b/src/lengthcommon.h @@ -1,10 +1,25 @@ // -*- C++ -*- +/** + * \file lengthcommon.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Lars Gullik Bjønnes + * \author Matthias Ettrich + * \author Jean-Marc Lasgouttes + * \author John Levon + * + * Full author contact details are available in file CREDITS. + */ #ifndef LENGTH_COMMON_H #define LENGTH_COMMON_H -#include "LString.h" -#include "lyxlength.h" +#include "Length.h" + + +namespace lyx { + /// the number of units possible extern int const num_units; @@ -14,12 +29,14 @@ extern int const num_units; * * FIXME: I am not sure if "mu" should be possible to select (Lgb) */ -extern char const * unit_name[]; -extern char const * unit_name_gui[]; -extern char const * unit_name_ltx[]; +extern char const * const unit_name[]; +extern char const * const unit_name_gui[]; /// return the unit given a string representation such as "cm" -LyXLength::UNIT unitFromString(string const & data); +Length::UNIT unitFromString(std::string const & data); + + +} // namespace lyx #endif // LENGTH_COMMON_H