From d4db9fc979638a058154653e5e17b1c85e7c2c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Thu, 30 Aug 2007 11:50:10 +0000
Subject: [PATCH] Uses qfu() instead of QString::fromUtf8()
---
modules/gui/qt4/dialogs/help.cpp | 6 ++----
modules/gui/qt4/playlist_model.cpp | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 60fb2290f923..b7cd75714181 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -85,14 +85,12 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
/* GPL License */
QTextEdit *licenseEdit = new QTextEdit( this );
- QString psz_qlicence = QString::fromUtf8( psz_licence );
- licenseEdit->setText( psz_qlicence );
+ licenseEdit->setText( qfu( psz_licence ) );
licenseEdit->setReadOnly( true );
/* People who helped */
QTextEdit *thanksEdit = new QTextEdit( this );
- QString psz_qthanks = QString::fromUtf8( psz_thanks );
- thanksEdit->setText( psz_qthanks );
+ thanksEdit->setText( qfu( psz_thanks ) );
thanksEdit->setReadOnly( true );
/* add the tabs to the Tabwidget */
diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp
index ddd4eb707eea..13da20fa2506 100644
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/playlist_model.cpp
@@ -194,8 +194,7 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent )
if( model->i_depth == 1 ) //left window for playlist etc.
{
- const QString psz_name = QString::fromUtf8( p_item->p_input->psz_name );
- strings.append( psz_name );
+ strings.append( qfu( p_item->p_input->psz_name ) );
return;
}
--
GitLab