Revision: 6216
Author: nogu.dev
Date: Wed Mar 3 05:56:07 2010
Log: * qt4/candwin/qt4.cpp
- (CandidateWindow::CandidateWindow,
CandidateWindow::slotCandidateSelected):
Use cellClicked instead of itemClicked.
* qt4/candwin/qt4.h
- Ditto.
* qt4/immodule/candidatewindow.cpp
- (CandidateWindow::CandidateWindow, CandidateWindow::setIndex,
CandidateWindow::slotCandidateSelected): Ditto.
* qt4/immodule/candidatewindow.h
- Ditto.
http://code.google.com/p/uim/source/detail?r=6216
Modified:
/trunk/qt4/candwin/qt4.cpp
/trunk/qt4/candwin/qt4.h
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/candidatewindow.h
=======================================
--- /trunk/qt4/candwin/qt4.cpp Wed Mar 3 05:55:46 2010
+++ /trunk/qt4/candwin/qt4.cpp Wed Mar 3 05:56:07 2010
@@ -85,8 +85,8 @@
cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
cList->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
cList->setShowGrid( false );
- connect( cList, SIGNAL( itemClicked( QTableWidgetItem * ) ),
- this , SLOT( slotCandidateSelected( QTableWidgetItem * ) ) );
+ connect( cList, SIGNAL( cellClicked( int, int ) ),
+ this , SLOT( slotCandidateSelected( int ) ) );
//setup NumberLabel
numLabel = new QLabel;
@@ -419,9 +419,9 @@
}
}
-void CandidateWindow::slotCandidateSelected( QTableWidgetItem * item )
-{
- candidateIndex = ( pageIndex * displayLimit ) + cList->row( item );
+void CandidateWindow::slotCandidateSelected( int row )
+{
+ candidateIndex = ( pageIndex * displayLimit ) + row;
// write message
fprintf( stdout, "index\n" );
=======================================
--- /trunk/qt4/candwin/qt4.h Sat Feb 27 15:03:39 2010
+++ /trunk/qt4/candwin/qt4.h Wed Mar 3 05:56:07 2010
@@ -39,7 +39,6 @@
class QLabel;
class QStringList;
class QTableWidget;
-class QTableWidgetItem;
struct CandData
{
@@ -66,7 +65,7 @@
public slots:
void slotStdinActivated( int );
- void slotCandidateSelected( QTableWidgetItem* );
+ void slotCandidateSelected( int row );
protected:
void strParse( const QString& str );
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Wed Mar 3 05:55:46 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Wed Mar 3 05:56:07 2010
@@ -76,8 +76,8 @@
cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
cList->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
cList->setShowGrid( false );
- connect( cList, SIGNAL( itemClicked( QTableWidgetItem * ) ),
- this , SLOT( slotCandidateSelected( QTableWidgetItem * ) ) );
+ connect( cList, SIGNAL( cellClicked( int, int ) ),
+ this , SLOT( slotCandidateSelected( int ) ) );
connect( cList, SIGNAL( itemSelectionChanged() ),
this , SLOT( slotHookSubwindow() ) );
@@ -373,17 +373,16 @@
void CandidateWindow::setIndexInPage( int index )
{
cList->clearSelection();
- QTableWidgetItem *selectedItem = cList->item( index, 0 );
- selectedItem->setSelected( true );
+ cList->item( index, 0 )->setSelected( true );
cList->item( index, 1 )->setSelected( true );
- slotCandidateSelected( selectedItem );
+ slotCandidateSelected( index );
}
-void CandidateWindow::slotCandidateSelected( QTableWidgetItem * item )
-{
- candidateIndex = ( pageIndex * displayLimit ) + cList->row( item );
+void CandidateWindow::slotCandidateSelected( int row )
+{
+ candidateIndex = ( pageIndex * displayLimit ) + row;
if ( ic && ic->uimContext() )
uim_set_candidate_index( ic->uimContext(), candidateIndex );
updateLabel();
=======================================
--- /trunk/qt4/immodule/candidatewindow.h Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/candidatewindow.h Wed Mar 3 05:56:07 2010
@@ -79,7 +79,7 @@
int candidateIndex;
int pageIndex;
protected slots:
- void slotCandidateSelected( QTableWidgetItem* );
+ void slotCandidateSelected( int row );
void slotHookSubwindow();
protected:
