Revision: 6358
Author: nogu.dev
Date: Sun May 2 07:29:31 2010
Log: * qt4/candwin/qt4.cpp
* qt4/chardict/kseparator.cpp
* qt4/chardict/kseparator.h
* qt4/immodule/candidatewindow.cpp
* qt4/immodule/subwindow.cpp
* qt4/pref/kseparator.cpp
* qt4/pref/kseparator.h
- Replace WFlags with WindowFlags. WindowFlags was introduced in Qt4.
http://code.google.com/p/uim/source/detail?r=6358
Modified:
/trunk/qt4/candwin/qt4.cpp
/trunk/qt4/chardict/kseparator.cpp
/trunk/qt4/chardict/kseparator.h
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/subwindow.cpp
/trunk/qt4/pref/kseparator.cpp
/trunk/qt4/pref/kseparator.h
=======================================
--- /trunk/qt4/candwin/qt4.cpp Sun Apr 25 19:21:52 2010
+++ /trunk/qt4/candwin/qt4.cpp Sun May 2 07:29:31 2010
@@ -61,12 +61,12 @@
static const int HEADING_COLUMN = 0;
static const int CANDIDATE_COLUMN = 1;
-const Qt::WFlags candidateFlag = ( Qt::Window
- | Qt::WindowStaysOnTopHint
- | Qt::FramelessWindowHint
- | Qt::Tool
+const Qt::WindowFlags candidateFlag = ( Qt::Window
+ | Qt::WindowStaysOnTopHint
+ | Qt::FramelessWindowHint
+ | Qt::Tool
#if defined(Q_WS_X11)
- | Qt::X11BypassWindowManagerHint
+ | Qt::X11BypassWindowManagerHint
#endif
);
static QSocketNotifier *notifier = 0;
=======================================
--- /trunk/qt4/chardict/kseparator.cpp Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/chardict/kseparator.cpp Sun May 2 07:29:31 2010
@@ -21,7 +21,7 @@
#include <QtGui/QStyle>
#include <QtGui/QStyleOption>
-KSeparator::KSeparator( QWidget* parent, Qt::WFlags f )
+KSeparator::KSeparator( QWidget* parent, Qt::WindowFlags f )
: QFrame( parent, f )
{
setLineWidth( 1 );
@@ -31,7 +31,7 @@
-KSeparator::KSeparator( int orientation, QWidget* parent, Qt::WFlags f )
+KSeparator::KSeparator( int orientation, QWidget* parent, Qt::WindowFlags
f )
: QFrame( parent, f )
{
setLineWidth( 1 );
=======================================
--- /trunk/qt4/chardict/kseparator.h Thu Feb 25 06:23:53 2010
+++ /trunk/qt4/chardict/kseparator.h Sun May 2 07:29:31 2010
@@ -38,7 +38,7 @@
* @param parent parent object.
* @param f extra QWidget flags.
**/
- explicit KSeparator( QWidget* parent = 0, Qt::WFlags f = 0 );
+ explicit KSeparator( QWidget* parent = 0, Qt::WindowFlags f = 0 );
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param f extra QWidget flags.
**/
explicit KSeparator( int orientation, QWidget* parent = 0,
- Qt::WFlags f = 0 );
+ Qt::WindowFlags f = 0 );
/**
* Returns the orientation of the separator.
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun May 2 03:40:04 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun May 2 07:29:31 2010
@@ -50,12 +50,12 @@
static const int CANDIDATE_COLUMN = 1;
static const int ANNOTATION_COLUMN = 2;
-const Qt::WFlags candidateFlag = ( Qt::Window
- | Qt::WindowStaysOnTopHint
- | Qt::FramelessWindowHint
- | Qt::Tool
+const Qt::WindowFlags candidateFlag = ( Qt::Window
+ | Qt::WindowStaysOnTopHint
+ | Qt::FramelessWindowHint
+ | Qt::Tool
#if defined(Q_WS_X11)
- | Qt::X11BypassWindowManagerHint
+ | Qt::X11BypassWindowManagerHint
#endif
);
=======================================
--- /trunk/qt4/immodule/subwindow.cpp Sun May 2 03:40:15 2010
+++ /trunk/qt4/immodule/subwindow.cpp Sun May 2 07:29:31 2010
@@ -40,12 +40,12 @@
#include <QtGui/QVBoxLayout>
-const Qt::WFlags subwindowFlag = ( Qt::Window
- | Qt::WindowStaysOnTopHint
- | Qt::FramelessWindowHint
- | Qt::Tool
+const Qt::WindowFlags subwindowFlag = ( Qt::Window
+ | Qt::WindowStaysOnTopHint
+ | Qt::FramelessWindowHint
+ | Qt::Tool
#if defined(Q_WS_X11)
- | Qt::X11BypassWindowManagerHint
+ | Qt::X11BypassWindowManagerHint
#endif
);
=======================================
--- /trunk/qt4/pref/kseparator.cpp Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/kseparator.cpp Sun May 2 07:29:31 2010
@@ -21,7 +21,7 @@
#include <QtGui/QStyle>
#include <QtGui/QStyleOption>
-KSeparator::KSeparator( QWidget* parent, Qt::WFlags f )
+KSeparator::KSeparator( QWidget* parent, Qt::WindowFlags f )
: QFrame( parent, f )
{
setLineWidth( 1 );
@@ -31,7 +31,7 @@
-KSeparator::KSeparator( int orientation, QWidget* parent, Qt::WFlags f )
+KSeparator::KSeparator( int orientation, QWidget* parent, Qt::WindowFlags
f )
: QFrame( parent, f )
{
setLineWidth( 1 );
=======================================
--- /trunk/qt4/pref/kseparator.h Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/kseparator.h Sun May 2 07:29:31 2010
@@ -38,7 +38,7 @@
* @param parent parent object.
* @param f extra QWidget flags.
**/
- explicit KSeparator( QWidget* parent = 0, Qt::WFlags f = 0 );
+ explicit KSeparator( QWidget* parent = 0, Qt::WindowFlags f = 0 );
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param f extra QWidget flags.
**/
explicit KSeparator( int orientation, QWidget* parent = 0,
- Qt::WFlags f = 0 );
+ Qt::WindowFlags f = 0 );
/**
* Returns the orientation of the separator.
