remove duplicate of toqstr

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16137 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C
index 47337d9f1794c98b9b751aa8ba91d448e0c4c451..5c326e06d76bec8cdb23a644b878df7b8fa7d358 100644 (file)
--- 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 317f1a991e235a1658b07d46ffdcca8a4479b017..d71a6da8e5e6ad96d7f099ef5c619e52d89ed94f 100644 (file)
--- 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 bd5459b852d0a4a6e351c09a27c408c2565d2e25..f6e26b745ea9b082eb80d79d61e96893aebd5bb7 100644 (file)
--- 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<char_type> & ucs4);