[uim] r6191 committed - * qt4/immodule/candidatewindow.cpp...

[codesite-noreply]

Revision: 6191
Author: nogu.dev
Date: Sun Feb 28 14:57:17 2010
Log: * qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::setCandidates, CandidateWindow::setPageCandidates):
    Replace Q3ValueList with QList.
* qt4/immodule/candidatewindow.h
  - Ditto.
* qt4/immodule/qhelpermanager.cpp
  - (QUimHelperManager::sendImList): Ditto.
* qt4/immodule/quiminfomanager.cpp
  - (QUimInfoManager::getUimInfo): Ditto.
* qt4/immodule/quiminfomanager.h
  - Ditto.
http://code.google.com/p/uim/source/detail?r=6191
Modified:
 /trunk/qt4/immodule/candidatewindow.cpp
 /trunk/qt4/immodule/candidatewindow.h
 /trunk/qt4/immodule/qhelpermanager.cpp
 /trunk/qt4/immodule/quiminfomanager.cpp
 /trunk/qt4/immodule/quiminfomanager.h

=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Sun Feb 28 14:57:01 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Sun Feb 28 14:57:17 2010
@@ -160,7 +160,7 @@
 }


-void CandidateWindow::setCandidates( int dl, const  
Q3ValueList<uim_candidate> &candidates )
+void CandidateWindow::setCandidates( int dl, const QList<uim_candidate>  
&candidates )
 {
 #ifdef ENABLE_DEBUG
     qDebug( "setCandidates" );
@@ -212,7 +212,7 @@
         subWin = new SubWindow( this );
 }

-void CandidateWindow::setPageCandidates( int page, const  
Q3ValueList<uim_candidate> &candidates )
+void CandidateWindow::setPageCandidates( int page, const  
QList<uim_candidate> &candidates )
 {
 #ifdef ENABLE_DEBUG
     qDebug( "setPageCandidates" );
=======================================
--- /trunk/qt4/immodule/candidatewindow.h       Sun Feb 28 14:56:29 2010
+++ /trunk/qt4/immodule/candidatewindow.h       Sun Feb 28 14:57:17 2010
@@ -37,9 +37,9 @@

 #include <Q3VBox>
 #include <Q3ListView>
-#include <Q3ValueList>
 #include <qevent.h>
 #include <qfontmetrics.h>
+#include <QtCore/QList>

 class QLabel;

@@ -63,7 +63,7 @@
     void setAlwaysLeftPosition( bool left ) { isAlwaysLeft = left; }
     bool isAlwaysLeftPosition() const { return isAlwaysLeft; }

-    void setCandidates( int displayLimit, const Q3ValueList<uim_candidate>  
&candidates );
+    void setCandidates( int displayLimit, const QList<uim_candidate>  
&candidates );
     void setPage( int page );
     void shiftPage( bool forward );
     void layoutWindow( int x, int y, int w, int h );
@@ -71,7 +71,7 @@
     void setIndexInPage( int index );

     void setNrCandidates( int nrCands, int dLimit );
-    void setPageCandidates( int page, const Q3ValueList<uim_candidate>  
&candidates );
+    void setPageCandidates( int page, const QList<uim_candidate>  
&candidates );

     void setQUimInputContext( QUimInputContext* m_ic ) { ic = m_ic; }

@@ -97,7 +97,7 @@
     CandidateListView *cList;
     QLabel *numLabel;

-    Q3ValueList<uim_candidate> stores;
+    QList<uim_candidate> stores;


     bool isAlwaysLeft;
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp      Sun Feb 28 14:57:01 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp      Sun Feb 28 14:57:17 2010
@@ -229,8 +229,8 @@
     const char* current_im_name = uim_get_current_im_name(  
focusedInputContext->uimContext() );

     QUimInfoManager *infoManager =  
UimInputContextPlugin::getQUimInfoManager();
-    Q3ValueList<uimInfo> info = infoManager->getUimInfo();
-    Q3ValueList<uimInfo>::iterator it;
+    QList<uimInfo> info = infoManager->getUimInfo();
+    QList<uimInfo>::iterator it;

     for ( it = info.begin(); it != info.end(); ++it )
     {
=======================================
--- /trunk/qt4/immodule/quiminfomanager.cpp     Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/quiminfomanager.cpp     Sun Feb 28 14:57:17 2010
@@ -33,7 +33,7 @@

 //#include <config.h>

-#include <Q3ValueList>
+#include <QtCore/QList>

 #include "uim/uim.h"

@@ -49,7 +49,7 @@
 {
 }

-Q3ValueList<uimInfo>
+QList<uimInfo>
 QUimInfoManager::getUimInfo()
 {
     return info;
=======================================
--- /trunk/qt4/immodule/quiminfomanager.h       Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/quiminfomanager.h       Sun Feb 28 14:57:17 2010
@@ -33,7 +33,8 @@
 #ifndef UIM_QT4_IMMODULE_QUIMINFOMANAGER_H
 #define UIM_QT4_IMMODULE_QUIMINFOMANAGER_H

-#include <Q3ValueList>
+#include <QtCore/QList>
+#include <QtCore/QString>

 struct uimInfo
 {
@@ -49,11 +50,11 @@
     ~QUimInfoManager();

     void initUimInfo();
-    Q3ValueList<uimInfo> getUimInfo();
+    QList<uimInfo> getUimInfo();
     QString imLang( const QString &imname );

 private:
-    Q3ValueList<uimInfo> info;
+    QList<uimInfo> info;
 };

 #endif /* UIM_QT4_IMMODULE_QUIMINFOMANAGER_H */