Commit 1d2eb888 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: use constData and provide expansion safety for qtu() and qta()

parent cf4fcdfe
......@@ -434,7 +434,7 @@ void StringListConfigControl::actionRequested( int i_action )
if(!p_module_config) return;
vlc_value_t val;
val.psz_string =
val.psz_string = const_cast<char *>
qtu( (combo->itemData( combo->currentIndex() ).toString() ) );
p_module_config->ppf_action[i_action]( p_this, getName(), val, val, 0 );
......
......@@ -152,8 +152,8 @@ void BookmarksDialog::add()
if( !input_Control( p_input, INPUT_GET_BOOKMARK, &bookmark ) )
{
bookmark.psz_name = qtu( THEMIM->getIM()->getName() +
QString("_%1" ).arg( bookmarksList->topLevelItemCount() ) );
bookmark.psz_name = const_cast<char *>qtu( THEMIM->getIM()->getName() +
QString("_%1" ).arg( bookmarksList->topLevelItemCount() ) );
input_Control( p_input, INPUT_ADD_BOOKMARK, &bookmark );
}
......
......@@ -84,8 +84,8 @@ struct intf_sys_t
#define qfu( i ) QString::fromUtf8( i )
#define qtr( i ) QString::fromUtf8( _(i) )
#define qtu( i ) (i).toUtf8().data()
#define qta( i ) (i).toAscii().data()
#define qtu( i ) ((i).toUtf8().constData())
#define qta( i ) ((i).toAscii().constData())
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
#define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment