anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 16:37:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

from_utf8(fromqstr -> qstring_to_ucs4 .

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24619 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2008-05-05 17:04:02 +00:00
parent 3a62e23018
commit e8b84b9cfb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/GuiCompleter.cpp
View File

@ -386,7 +386,7 @@ void GuiCompleter::updateInline(Cursor & cur, QString const & completion)
// compute postfix // compute postfix
docstring prefix = cur.inset().completionPrefix(cur); docstring prefix = cur.inset().completionPrefix(cur);
docstring postfix = from_utf8(fromqstr(completion.mid(prefix.length()))); docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));
// shorten it if necessary // shorten it if necessary
if (lyxrc.completion_inline_dots != -1 if (lyxrc.completion_inline_dots != -1
@ -687,7 +687,7 @@ void GuiCompleter::tab()
// If completion is active, at least complete by one character // If completion is active, at least complete by one character
docstring prefix = cur.inset().completionPrefix(cur); docstring prefix = cur.inset().completionPrefix(cur);
docstring completion = from_utf8(fromqstr(currentCompletion())); docstring completion = qstring_to_ucs4(currentCompletion());
if (completion.size() <= prefix.size()) { if (completion.size() <= prefix.size()) {
// finalize completion // finalize completion
cur.inset().insertCompletion(cur, docstring(), true); cur.inset().insertCompletion(cur, docstring(), true);
@ -867,7 +867,7 @@ docstring GuiCompleter::longestUniqueCompletion() const
} }
} }
return from_utf8(fromqstr(s)); return qstring_to_ucs4(s);
} }
@ -877,7 +877,7 @@ void GuiCompleter::popupActivated(const QString & completion)
cur.updateFlags(Update::None); cur.updateFlags(Update::None);
docstring prefix = cur.inset().completionPrefix(cur); docstring prefix = cur.inset().completionPrefix(cur);
docstring postfix = from_utf8(fromqstr(completion.mid(prefix.length()))); docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));
cur.inset().insertCompletion(cur, postfix, true); cur.inset().insertCompletion(cur, postfix, true);
hidePopup(cur); hidePopup(cur);
hideInline(cur); hideInline(cur);