[Marble-commits] KDE/kdeedu/marble/src/lib/geodata/scene

[Jens-Michael Hoffmann]

SVN commit 994367 by jmhoffmann:

Simplify operator== and use canonical parameter name (rhs).


 M  +2 -4      GeoScenePalette.cpp  
 M  +1 -1      GeoScenePalette.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoScenePalette.cpp #994366:994367
@@ -55,11 +55,9 @@
     m_file = file;
 }
 
-bool GeoScenePalette::operator==( const GeoScenePalette& other )
+bool GeoScenePalette::operator==( const GeoScenePalette& rhs )
 {
-    if( m_file == other.file() && m_type == other.type() ) {
-        return true;
-    } else { return false; }
+    return m_file == rhs.m_file && m_type == rhs.m_type;
 }
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoScenePalette.h #994366:994367
@@ -45,7 +45,7 @@
     QString file() const;
     void    setFile( const QString& file );
 
-    bool operator==( const GeoScenePalette& other );
+    bool operator==( const GeoScenePalette& rhs );
 
  private:
     QString m_type;