Revision: 6282
Author: nogu.dev
Date: Wed Mar 24 15:05:26 2010
Log: * qt4/immodule/candidatewindow.cpp
- (CandidateWindow::CandidateWindow): Reorder member variables.
* qt4/immodule/candidatewindow.h
- Ditto.
http://code.google.com/p/uim/source/detail?r=6282
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/candidatewindow.h
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Wed Mar 24 15:05:16 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Wed Mar 24 15:05:26 2010
@@ -60,10 +60,10 @@
);
CandidateWindow::CandidateWindow( QWidget *parent )
-: QFrame( parent, candidateFlag ), nrCandidates( 0 ), displayLimit( 0 ),
- candidateIndex( -1 ), pageIndex( -1 ), ic( 0 ), isAlwaysLeft( false ),
- subWin( 0 ), hasAnnotation( uim_scm_symbol_value_bool(
- "eb-enable-for-annotation?" ) ), window( 0 )
+: QFrame( parent, candidateFlag ), ic( 0 ), subWin( 0 ), window( 0 ),
+ nrCandidates( 0 ), displayLimit( 0 ), candidateIndex( -1 ), pageIndex(
-1 ),
+ isAlwaysLeft( false ), hasAnnotation( uim_scm_symbol_value_bool(
+ "eb-enable-for-annotation?" ) )
{
setFrameStyle( Raised | NoFrame );
=======================================
--- /trunk/qt4/immodule/candidatewindow.h Wed Mar 24 15:05:16 2010
+++ /trunk/qt4/immodule/candidatewindow.h Wed Mar 24 15:05:26 2010
@@ -97,31 +97,28 @@
bool eventFilter( QObject *obj, QEvent *event );
- int nrCandidates;
- int displayLimit;
- int candidateIndex;
- int pageIndex;
-
QUimInputContext *ic;
+ // widgets
CandidateListView *cList;
QLabel *numLabel;
-
- QList<uim_candidate> stores;
-
-
- bool isAlwaysLeft;
-
SubWindow *subWin;
-
- const bool hasAnnotation;
-
QWidget *window;
+ // candidate data
+ QList<uim_candidate> stores;
+ int nrCandidates;
+ int displayLimit;
+ int candidateIndex;
+ int pageIndex;
#ifdef UIM_QT_USE_NEW_PAGE_HANDLING
QList<bool> pageFilled;
int nrPages;
#endif
+
+ // config
+ bool isAlwaysLeft;
+ const bool hasAnnotation;
};
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
