Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[vuplus_dvbapp] / lib / gdi / erect.cpp

diff --git a/lib/gdi/erect.cpp b/lib/gdi/erect.cpp
index b72e5d0..43cefc5 100644 (file)
--- a/lib/gdi/erect.cpp
+++ b/lib/gdi/erect.cpp
@@ -1,5 +1,4 @@
 #include <lib/gdi/erect.h>
-#include <iostream>
 
 /*****************************************************************************
   eRect member functions
@@ -151,8 +150,8 @@ eRect& eRect::operator&=(const eRect &r)
 
 eRect eRect::operator|(const eRect &r) const
 {
-       if ( isValid() ) {
-       if ( r.isValid() ) {
+       if ( valid() ) {
+       if ( r.valid() ) {
                eRect tmp;
                tmp.setLeft(   MIN( x1, r.x1 ) );
                tmp.setRight(  MAX( x2, r.x2 ) );