[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-22 12:14:35
Message-ID: 1129983275.610875.26754.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473020 by mlaurent:

Launch script


 M  +4 -4      kalzium/src/nuclideboard.cpp  
 M  +2 -2      kig/misc/object_hierarchy.cc  


--- trunk/KDE/kdeedu/kalzium/src/nuclideboard.cpp #473019:473020
@@ -160,10 +160,10 @@
 	QRect r = getNewCoords( selectedRect );
 	// I know it's strange, but somehow sometimes the bottom and the
 	// top are swapped...
-	m_firstElem = kMin( r.bottom(), r.top() );
-	m_lastElem = kMax( r.bottom(), r.top() );
-	m_firstElemNucleon = kMin( r.left(), r.right() );
-	m_lastElemNucleon = kMax( r.left(), r.right() );
+	m_firstElem = qMin( r.bottom(), r.top() );
+	m_lastElem = qMax( r.bottom(), r.top() );
+	m_firstElemNucleon = qMin( r.left(), r.right() );
+	m_lastElemNucleon = qMax( r.left(), r.right() );
 
 	// tell to the updateIsoptopeRectList() to recalc the size of every
 	// element rect
--- trunk/KDE/kdeedu/kig/misc/object_hierarchy.cc #473019:473020
@@ -495,7 +495,7 @@
     uint id = tmp.toInt( &ok );
     if ( !ok ) KIG_GENERIC_PARSE_ERROR;
 
-    obhi->mnumberofargs = kMax( id, obhi->mnumberofargs );
+    obhi->mnumberofargs = qMax( id, obhi->mnumberofargs );
 
     tmp = e.attribute( "requirement" );
     const ObjectImpType* req = ObjectImpType::typeFromInternalName( tmp.latin1() );
@@ -579,7 +579,7 @@
       if ( ( ! imp ) && !error.isEmpty() ) return 0;
       newnode = new PushStackNode( imp );
     };
-    obhi->mnodes.resize( kMax( size_t(id - obhi->mnumberofargs), obhi->mnodes.size() ) );
+    obhi->mnodes.resize( qMax( size_t(id - obhi->mnumberofargs), obhi->mnodes.size() ) );
     obhi->mnodes[id - obhi->mnumberofargs - 1] = newnode;
   };
 
[prev in list] [next in list] [prev in thread] [next in thread]