[Uml-devel] kdesdk/umbrello/umbrello/classparser

[Albert Astals Cid]

CVS commit by aacid: 

change kurl::cmp to kurl::operator ==, it's the same and it's undeprecated.
Aproved by Riddell


  M +4 -4      urlutil.cpp   1.3


--- kdesdk/umbrello/umbrello/classparser/urlutil.cpp  #1.2:1.3
@@ -57,5 +57,5 @@ QString URLUtil::relativePath(const KURL
   bool slashPrefix = slashPolicy & SLASH_PREFIX;
   bool slashSuffix = slashPolicy & SLASH_SUFFIX;
-  if (parent.cmp(child,true))
+  if (parent == child)
     return slashPrefix ? QString("/") : QString("");
 
@@ -85,11 +85,11 @@ KURL URLUtil::mergeURL(const KURL & sour
 
   // if already a child of source, then fine
-  if (source.isParentOf(child) || source.cmp(child,true)) return child;
+  if (source.isParentOf(child) || source == child) return child;
 
   // if not a child of dest, return blank URL (error)
-  if (!dest.isParentOf(child) && !dest.cmp(child,true)) return KURL();
+  if (!dest.isParentOf(child) && dest != child) return KURL();
 
   // if child is same as dest, return source
-  if (dest.cmp(child,true)) return source;
+  if (dest == child) return source;
 
   // calculate