---
src/conformancesimapplication.cpp | 17 ++++++-----------
src/simapplication.cpp | 3 +--
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/conformancesimapplication.cpp
b/src/conformancesimapplication.cpp
index ae2f1a9..8b3c466 100644
--- a/src/conformancesimapplication.cpp
+++ b/src/conformancesimapplication.cpp
@@ -434,8 +434,7 @@ void ConformanceSimApplication::DisplayTextMenu( const
QSimTerminalResponse& res
cmd.setType( QSimCommand::DisplayText );
cmd.setDestinationDevice( QSimCommand::Display );
cmd.setClearAfterDelay( false );
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+ cmd.setText( QStringLiteral("ЗДРАВСТВУЙТЕ") );
command( cmd, this, SLOT(sendDisplayTextMenu()),
QSimCommand::UCS2Strings );
}
@@ -875,8 +874,7 @@ void ConformanceSimApplication::GetInkeyMenu( const
QSimTerminalResponse& resp )
cmd.setType( QSimCommand::GetInkey );
cmd.setDestinationDevice( QSimCommand::ME );
cmd.setWantDigits(true);
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+ cmd.setText( QStringLiteral("ЗДРАВСТВУЙТЕ" ));
command( cmd, this, SLOT(sendGetInkeyMenu()),
QSimCommand::UCS2Strings );
}
@@ -887,8 +885,7 @@ void ConformanceSimApplication::GetInkeyMenu( const
QSimTerminalResponse& resp )
cmd.setType( QSimCommand::GetInkey );
cmd.setDestinationDevice( QSimCommand::ME );
cmd.setWantDigits(true);
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+ cmd.setText( QStringLiteral("ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
"ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
"ЗДРАВСТВУЙТЕЗДРАВСТВУЙ" ) );
command( cmd, this, SLOT(sendGetInkeyMenu()),
@@ -1364,8 +1361,7 @@ void ConformanceSimApplication::GetInputMenu( const
QSimTerminalResponse& resp )
cmd.setDestinationDevice( QSimCommand::ME );
cmd.setEcho( true );
cmd.setWantDigits( false );
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+ cmd.setText( QStringLiteral("ЗДРАВСТВУЙТЕ") );
cmd.setMinimumLength( 5 );
cmd.setMaximumLength( 5 );
command( cmd, this, SLOT(sendGetInputMenu()),
@@ -1379,10 +1375,9 @@ void ConformanceSimApplication::GetInputMenu( const
QSimTerminalResponse& resp )
cmd.setDestinationDevice( QSimCommand::ME );
cmd.setEcho( true );
cmd.setWantDigits( false );
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setText( codec->toUnicode( "ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
+ cmd.setText( QStringLiteral("ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
"ЗДРАВСТВУЙТЕЗДРАВСТВУЙТЕ"
- "ЗДРАВСТВУЙТЕЗДРАВСТВУЙ" ) );
+ "ЗДРАВСТВУЙТЕЗДРАВСТВУЙ") );
cmd.setMinimumLength( 5 );
cmd.setMaximumLength( 5 );
command( cmd, this, SLOT(sendGetInputMenu()),
diff --git a/src/simapplication.cpp b/src/simapplication.cpp
index da0385d..f21fa4e 100644
--- a/src/simapplication.cpp
+++ b/src/simapplication.cpp
@@ -1916,8 +1916,7 @@ void DemoSimApplication::USSDMenu( const
QSimTerminalResponse& resp )
cmd.setType( QSimCommand::SendUSSD );
cmd.setDestinationDevice( QSimCommand::Network );
cmd.setText( "UCS2 USSD" );
- QTextCodec *codec = QTextCodec::codecForName( "utf8" );
- cmd.setNumber( codec->toUnicode( "ЗДРАВСТВУЙТЕ" ) );
+ cmd.setNumber( QStringLiteral("ЗДРАВСТВУЙТЕ") );
command( cmd, this, SLOT(sendUSSDMenu()),
QSimCommand::UCS2Strings );
}
--
2.29.2
_______________________________________________
ofono mailing list -- [email protected]
To unsubscribe send an email to [email protected]
