Revision: 6185
Author: nogu.dev
Date: Sun Feb 28 14:56:05 2010
Log: * qt4/immodule/candidatewindow.cpp
- (CandidateWindow::layoutWindow): Don't Assign QString::null to QString.
* qt4/immodule/plugin.cpp
- (UimInputContextPlugin::keys): Don't Assign QString::null to QString.
* qt4/immodule/qhelpermanager.cpp
- (QUimHelperManager::parseHelperStr): Ditto.
http://code.google.com/p/uim/source/detail?r=6185
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/plugin.cpp
/trunk/qt4/immodule/qhelpermanager.cpp
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 14:55:40 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 14:56:05 2010
@@ -428,7 +428,7 @@
void CandidateWindow::updateLabel()
{
- QString indexString = QString::null;
+ QString indexString;
if ( candidateIndex >= 0 )
indexString = QString::number( candidateIndex + 1 ) + " / " +
QString::number( nrCandidates );
else
=======================================
--- /trunk/qt4/immodule/plugin.cpp Sun Feb 28 14:55:40 2010
+++ /trunk/qt4/immodule/plugin.cpp Sun Feb 28 14:56:05 2010
@@ -72,7 +72,7 @@
QInputContext *UimInputContextPlugin::create( const QString & key )
{
- QString imname = QString::null;
+ QString imname;
#if UIM_QT_LIST_SUBIM_AS_QTIM
if ( key.startsWith( "uim-" ) )
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 14:55:40 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 14:56:05 2010
@@ -116,7 +116,7 @@
{
QStringList lines = str.split( "\n" );
if ( !lines.isEmpty() && !lines[ 1 ].isEmpty() ) {
- QString commit_str = QString::null;
+ QString commit_str;
if ( lines[ 1 ].startsWith( "charset" ) ) {
/* get charset */
