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

[codesite-noreply]

Revision: 6186
Author: nogu.dev
Date: Sun Feb 28 14:56:17 2010
Log: * qt4/immodule/subwindow.cpp
  - (SubWindow::forceInside): Don't use obsolete QMIN/QMAX macros.
http://code.google.com/p/uim/source/detail?r=6186
Modified:
 /trunk/qt4/immodule/subwindow.cpp

=======================================
--- /trunk/qt4/immodule/subwindow.cpp   Sun Feb 28 14:55:51 2010
+++ /trunk/qt4/immodule/subwindow.cpp   Sun Feb 28 14:56:17 2010
@@ -117,10 +117,10 @@
 {
     int new_x, new_y;

-    new_x = QMIN( enclosure.right(), prisoner.right() ) - prisoner.width()  
+ 1;
-    new_x = QMAX( enclosure.left(), new_x );
-    new_y = QMIN( enclosure.bottom(), prisoner.bottom() ) -  
prisoner.height() + 1;
-    new_y = QMAX( enclosure.top(), new_y );
+    new_x = qMin( enclosure.right(), prisoner.right() ) - prisoner.width()  
+ 1;
+    new_x = qMax( enclosure.left(), new_x );
+    new_y = qMin( enclosure.bottom(), prisoner.bottom() ) -  
prisoner.height() + 1;
+    new_y = qMax( enclosure.top(), new_y );

     return QPoint( new_x, new_y );
 }