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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata/scene
From:       Jens-Michael Hoffmann <jensmh () gmx ! de>
Date:       2009-07-21 20:34:16
Message-ID: 1248208456.094227.8555.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000710 by jmhoffmann:

Remove unnecessary assertions.


 M  +0 -5      GeoSceneLayer.cpp  
 M  +0 -1      GeoSceneLegend.cpp  
 M  +0 -2      GeoSceneMap.cpp  
 M  +0 -1      GeoSceneSection.cpp  
 M  +0 -10     GeoSceneSettings.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneLayer.cpp #1000709:1000710
@@ -109,11 +109,6 @@
         }
     }
 
-    if ( dataset ) {
-        Q_ASSERT(dataset->name() == name);
-        return dataset;
-    }
-
 //    dataset = new GeoSceneAbstractDataset( name );
 //    addDataset( dataset );
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneLegend.cpp #1000709:1000710
@@ -86,7 +86,6 @@
     }
 
     if ( section ) {
-        Q_ASSERT(section->name() == name);
         return section;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneMap.cpp #1000709:1000710
@@ -102,7 +102,6 @@
     }
 
     if ( layer ) {
-        Q_ASSERT(layer->name() == name);
         return layer;
     }
 
@@ -152,7 +151,6 @@
     }
 
     if ( filter ) {
-        Q_ASSERT(filter->name() == name);
         return filter;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneSection.cpp #1000709:1000710
@@ -77,7 +77,6 @@
     }
 
     if ( item ) {
-        Q_ASSERT(item->name() == name);
         return item;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneSettings.cpp #1000709:1000710
@@ -182,11 +182,6 @@
         }
     }
 
-    if ( group ) {
-        Q_ASSERT(group->name() == name);
-        return group;
-    }
-
     return group;
 }
 
@@ -229,11 +224,6 @@
         }
     }
 
-    if ( property ) {
-        Q_ASSERT(property->name() == name);
-        return property;
-    }
-
     return property;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]