anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

We don't generally use "static" this way in the LyX code any more. (Just

Browse Source 
a bit of cleanup while studying other things....)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36354 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-17 22:00:42 +00:00
parent e54afe6367
commit 67a4b590aa
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontends/qt4/GuiFontMetrics.cpp
View File

@ -27,27 +27,28 @@ using namespace std;
namespace lyx {
namespace frontend {
namespace {
/**
* Convert a UCS4 character into a QChar.
* This is a hack (it does only make sense for the common part of the UCS4
* and UTF16 encodings) and should not be used.
* This does only exist because of performance reasons (a real conversion
* using iconv is too slow on windows).
*/
static inline QChar const ucs4_to_qchar(char_type const ucs4)
*
* This is no real conversion but a simple cast in reality. This is the reason
* why this works well for symbol fonts used in mathed too, even though
* these are not real ucs4 characters. These are codepoints in the
* modern fonts used, nothing unicode related.
* See comment in QLPainter::text() for more explanation.
**/
inline QChar const ucs4_to_qchar(char_type const ucs4)
{
LASSERT(is_utf16(ucs4), /**/);
return QChar(static_cast<unsigned short>(ucs4));
}
} // anon namespace
// Caution: When using ucs4_to_qchar() in these methods, this is no
// real conversion but a simple cast in reality. This is the reason
// why this works well for symbol fonts used in mathed too, even though
// these are not real ucs4 characters. These are codepoints in the
// modern fonts used, nothing unicode related.
// See comment in QLPainter::text() for more explanation.
GuiFontMetrics::GuiFontMetrics(QFont const & font)
: metrics_(font), smallcaps_metrics_(font), smallcaps_shape_(false)
{

14
src/support/lstrings.cpp
View File

@ -47,6 +47,7 @@ string const & empty_string()
return s;
}
namespace {
/**
* Convert a QChar into a UCS4 character.
* This is a hack (it does only make sense for the common part of the UCS4
@ -54,13 +55,12 @@ string const & empty_string()
* This does only exist because of performance reasons (a real conversion
* using iconv is too slow on windows).
*/
static inline char_type qchar_to_ucs4(QChar const & qchar)
inline char_type qchar_to_ucs4(QChar const & qchar)
{
LASSERT(is_utf16(static_cast<char_type>(qchar.unicode())), /**/);
return static_cast<char_type>(qchar.unicode());
}
/**
* Convert a UCS4 character into a QChar.
* This is a hack (it does only make sense for the common part of the UCS4
@ -68,17 +68,15 @@ static inline char_type qchar_to_ucs4(QChar const & qchar)
* This does only exist because of performance reasons (a real conversion
* using iconv is too slow on windows).
*/
static inline QChar const ucs4_to_qchar(char_type const ucs4)
inline QChar const ucs4_to_qchar(char_type const ucs4)
{
LASSERT(is_utf16(ucs4), /**/);
return QChar(static_cast<unsigned short>(ucs4));
}
namespace {
/// Maximum valid UCS4 code point
char_type const ucs4_max = 0x10ffff;
}
/// Maximum valid UCS4 code point
char_type const ucs4_max = 0x10ffff;
} // anon namespace
bool isLetterChar(char_type c)