From c5629aab95ad5126d5c6f85586e1ccc996020ae8 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 2 Dec 2006 19:53:21 +0000 Subject: [PATCH] remove duplicate of toqstr git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16137 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QParagraph.C | 2 +- src/frontends/qt4/qt_helpers.C | 8 -------- src/frontends/qt4/qt_helpers.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/frontends/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C index 47337d9f17..5c326e06d7 100644 --- a/src/frontends/qt4/QParagraph.C +++ b/src/frontends/qt4/QParagraph.C @@ -117,7 +117,7 @@ void QParagraph::update_contents() // lyx::to_utf8(_() is correct here (this is stupid though !)) if (labelwidth != _("Senseless with this layout!")) { dialog_->labelwidthGB->setEnabled(true); - dialog_->labelWidth->setText(ucs4_to_qstring(labelwidth)); + dialog_->labelWidth->setText(toqstr(labelwidth)); } else { dialog_->labelwidthGB->setEnabled(false); dialog_->labelWidth->setText(""); diff --git a/src/frontends/qt4/qt_helpers.C b/src/frontends/qt4/qt_helpers.C index 317f1a991e..d71a6da8e5 100644 --- a/src/frontends/qt4/qt_helpers.C +++ b/src/frontends/qt4/qt_helpers.C @@ -120,14 +120,6 @@ void ucs4_to_qstring(lyx::docstring const & str, QString & s) } -QString ucs4_to_qstring(lyx::docstring const & str) -{ - QString tmp; - ucs4_to_qstring(str, tmp); - return tmp; -} - - QString const toqstr(docstring const & ucs4) { QString s; diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index bd5459b852..f6e26b745e 100644 --- a/src/frontends/qt4/qt_helpers.h +++ b/src/frontends/qt4/qt_helpers.h @@ -99,8 +99,6 @@ inline void ucs4_to_qstring(char_type const * str, size_t ls, QString & s) } -QString ucs4_to_qstring(docstring const & str); - docstring const qstring_to_ucs4(QString const & qstr); void qstring_to_ucs4(QString const & qstr, std::vector & ucs4); -- 2.39.5