X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flengthcommon.h;h=7dcf3d91b59b46993d919035e480b6d6d1e1ced5;hb=ce7c45bb437c44dae15f96148cb9b793ab0b895c;hp=57095514ba55c9b0df78c44e7b763f67885e3dbc;hpb=0a8631ad447b47c9488e65295736bb5cce46883b;p=lyx.git diff --git a/src/lengthcommon.h b/src/lengthcommon.h index 57095514ba..7dcf3d91b5 100644 --- a/src/lengthcommon.h +++ b/src/lengthcommon.h @@ -1,11 +1,26 @@ // -*- 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" + +namespace lyx { + + /// the number of units possible extern int const num_units; @@ -14,9 +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 * 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); +LyXLength::UNIT unitFromString(std::string const & data); + + + +} // namespace lyx #endif // LENGTH_COMMON_H