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

[codesite-noreply]

Revision: 6194
Author: nogu.dev
Date: Sun Feb 28 14:57:51 2010
Log: * qt4/immodule/candidatewindow.cpp
* qt4/immodule/candidatewindow.h
  - Replace Q3VBox with QFrame.
http://code.google.com/p/uim/source/detail?r=6194

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

=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Sun Feb 28 14:57:17 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Sun Feb 28 14:57:51 2010
@@ -39,6 +39,7 @@
 #include <Q3Header>
 #include <qfontmetrics.h>
 #include <qevent.h>
+#include <QtGui/QVBoxLayout>

 #include "uim/uim.h"

@@ -62,8 +63,8 @@
 #endif
                                  );

-CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
-        : Q3VBox( parent, name, candidateFlag )
+CandidateWindow::CandidateWindow( QWidget *parent )
+        : QFrame( parent, candidateFlag )
 {
     setFrameStyle( Raised | NoFrame );

@@ -102,6 +103,13 @@
     isAlwaysLeft = false;

     subWin = NULL;
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin( 0 );
+    layout->setSpacing( 0 );
+    layout->addWidget( cList );
+    layout->addWidget( numLabel );
+    setLayout( layout );
 }

 CandidateWindow::~CandidateWindow()
=======================================
--- /trunk/qt4/immodule/candidatewindow.h       Sun Feb 28 14:57:17 2010
+++ /trunk/qt4/immodule/candidatewindow.h       Sun Feb 28 14:57:51 2010
@@ -35,7 +35,6 @@

 #include <uim/uim.h>

-#include <Q3VBox>
 #include <Q3ListView>
 #include <qevent.h>
 #include <qfontmetrics.h>
@@ -47,12 +46,12 @@
 class CandidateListView;
 class SubWindow;

-class CandidateWindow : public Q3VBox
+class CandidateWindow : public QFrame
 {
     Q_OBJECT

 public:
-    CandidateWindow( QWidget *parent, const char * name = 0 );
+    CandidateWindow( QWidget *parent );
     ~CandidateWindow();

     void activateCandwin( int dLimit );