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

[codesite-noreply]

Revision: 6221
Author: nogu.dev
Date: Wed Mar  3 05:57:08 2010
Log: * qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::setPage, CandidateWindow::slotHookSubwindow):
    Don't use magic numbers
http://code.google.com/p/uim/source/detail?r=6221
Modified:
 /trunk/qt4/candwin/qt4.cpp
 /trunk/qt4/immodule/candidatewindow.cpp

=======================================
--- /trunk/qt4/candwin/qt4.cpp  Wed Mar  3 05:56:34 2010
+++ /trunk/qt4/candwin/qt4.cpp  Wed Mar  3 05:57:08 2010
@@ -58,6 +58,9 @@
 static const int NR_CANDIDATES = 10;
 static const int MIN_CAND_WIDTH = 80;

+static const int HEADING_COLUMN = 0;
+static const int CANDIDATE_COLUMN = 1;
+
 const Qt::WFlags candidateFlag = ( Qt::Window
                                    | Qt::WindowStaysOnTopHint
                                    | Qt::FramelessWindowHint
@@ -535,8 +538,8 @@
         QTableWidgetItem *candItem = new QTableWidgetItem;
         candItem->setText( candString );
         candItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-        cList->setItem( i, 0, headItem );
-        cList->setItem( i, 1, candItem );
+        cList->setItem( i, HEADING_COLUMN, headItem );
+        cList->setItem( i, CANDIDATE_COLUMN, candItem );
         cList->setRowHeight( i, QFontMetrics( cList->font() ).height() + 2  
);
     }

=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Wed Mar  3 05:56:57 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Wed Mar  3 05:57:08 2010
@@ -318,9 +318,9 @@
         annotationItem->setText( annotationString );
         annotationItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled  
);

-        cList->setItem( i, 0, headItem );
-        cList->setItem( i, 1, candItem );
-        cList->setItem( i, 2, annotationItem );
+        cList->setItem( i, HEADING_COLUMN, headItem );
+        cList->setItem( i, CANDIDATE_COLUMN, candItem );
+        cList->setItem( i, ANNOTATION_COLUMN, annotationItem );
         cList->setRowHeight( i, QFontMetrics( cList->font() ).height() + 2  
);
     }

@@ -470,7 +470,8 @@
     subWin->cancelHook();

     // hook annotation
-    QString annotationString = cList->item( list[0]->row(), 2 )->text();
+    QString annotationString
+        = cList->item( list[0]->row(), ANNOTATION_COLUMN )->text();
     if ( !annotationString.isEmpty() )
     {
         subWin->hookPopup( "Annotation", annotationString );