[uim] r6192 committed - * qt4/immodule/subwindow.cpp...

[codesite-noreply]

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

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

=======================================
--- /trunk/qt4/immodule/subwindow.cpp   Sun Feb 28 14:56:17 2010
+++ /trunk/qt4/immodule/subwindow.cpp   Sun Feb 28 14:57:29 2010
@@ -40,6 +40,7 @@
 #include <QDesktopWidget>
 #include <qrect.h>
 #include <qpoint.h>
+#include <QtGui/QVBoxLayout>

 #include "subwindow.h"

@@ -54,8 +55,8 @@

 static const int TIMER_INTERVAL = 1000; // 1000ms = 1second

-SubWindow::SubWindow( QWidget *parent, const char *name )
-        : Q3VBox( parent, name, subwindowFlag )
+SubWindow::SubWindow( QWidget *parent )
+        : QFrame( parent, subwindowFlag )
 {
     m_titleLabel = new QLabel( this );
     m_titleLabel->setAlignment( Qt::AlignHCenter );
@@ -68,6 +69,11 @@
     connect( m_hookTimer, SIGNAL( timeout() ), this, SLOT( timerDone() ) );

     hide();
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget( m_titleLabel );
+    layout->addWidget( m_contentsEdit );
+    setLayout( layout );
 }

 SubWindow::~SubWindow()
=======================================
--- /trunk/qt4/immodule/subwindow.h     Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/subwindow.h     Sun Feb 28 14:57:29 2010
@@ -33,18 +33,18 @@
 #ifndef UIM_QT4_IMMODULE_SUBWINDOW_H
 #define UIM_QT4_IMMODULE_SUBWINDOW_H

-#include <Q3VBox>
 #include <QTimer>
+#include <QtGui/QFrame>

 class QLabel;
 class QTextBrowser;

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

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

     void layoutWindow( int x, int y );