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

[codesite-noreply]

Revision: 6227
Author: nogu.dev
Date: Fri Mar  5 06:02:25 2010
Log: * qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::CandidateWindow): Use initialization list.
* qt4/candwin/qt4.cpp
  - (CandidateWindow::CandidateWindow): Ditto.
http://code.google.com/p/uim/source/detail?r=6227

Modified:
 /trunk/qt4/candwin/qt4.cpp
 /trunk/qt4/immodule/candidatewindow.cpp

=======================================
--- /trunk/qt4/candwin/qt4.cpp  Fri Mar  5 06:01:59 2010
+++ /trunk/qt4/candwin/qt4.cpp  Fri Mar  5 06:02:25 2010
@@ -72,7 +72,8 @@
 static QSocketNotifier *notifier = 0;

 CandidateWindow::CandidateWindow( QWidget *parent )
-        : QFrame( parent, candidateFlag )
+: QFrame( parent, candidateFlag ), nrCandidates( 0 ), candidateIndex( 0 ),
+    displayLimit( NR_CANDIDATES ), pageIndex( -1 ), isActive( false )
 {
     setFrameStyle( Raised | NoFrame );
     setFocusPolicy( Qt::NoFocus );
@@ -98,13 +99,6 @@
     numLabel = new QLabel;
     numLabel->setFocusPolicy( Qt::NoFocus );

-    nrCandidates = 0;
-    candidateIndex = 0;
-    displayLimit = NR_CANDIDATES;
-    pageIndex = -1;
-
-    isActive = false;
-
     notifier = new QSocketNotifier( 0, QSocketNotifier::Read );
     connect( notifier, SIGNAL( activated( int ) ),
                       this, SLOT( slotStdinActivated( int ) ) );
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Fri Mar  5 06:02:14 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Fri Mar  5 06:02:25 2010
@@ -59,12 +59,12 @@
                                  );

 CandidateWindow::CandidateWindow( QWidget *parent )
-        : QFrame( parent, candidateFlag )
+: QFrame( parent, candidateFlag ), nrCandidates( 0 ), displayLimit( 0 ),
+    candidateIndex( -1 ), pageIndex( -1 ), ic( 0 ), isAlwaysLeft( false ),
+    subWin( 0 )
 {
     setFrameStyle( Raised | NoFrame );

-    ic = 0;
-
     //setup CandidateList
     cList = new CandidateListView;
     cList->setSelectionMode( QAbstractItemView::SingleSelection );
@@ -88,15 +88,6 @@
     numLabel = new QLabel;
     numLabel->adjustSize();

-    nrCandidates = 0;
-    candidateIndex = -1;
-    displayLimit = 0;
-    pageIndex = -1;
-
-    isAlwaysLeft = false;
-
-    subWin = 0;
-
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setMargin( 0 );
     layout->setSpacing( 0 );