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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2007-09-24 9:07:35
Message-ID: 1190624855.288990.13876.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 716226 by tokoe:

A new QSize is invalid, not null, my fault :}


 M  +4 -9      PlaceMarkPainter.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/PlaceMarkPainter.cpp #716225:716226
@@ -56,13 +56,9 @@
     }
     const QSize& symbolSize() const
     {
-//        FIXME: tokoe: In some cases we do get an uninitialized m_symbolSize. Why? 
-//        if ( m_symbolSize.isNull() )
-//        {
-            m_symbolSize = m_modelIndex.data( PlaceMarkModel::SymbolSizeRole ).toSize();
-            return m_symbolSize;
-//        }
-
+        if ( !m_symbolSize.isValid() )
+          m_symbolSize = m_modelIndex.data( PlaceMarkModel::SymbolSizeRole ).toSize();
+        return m_symbolSize;
     }
     const int symbolIndex() const
     {
@@ -97,8 +93,7 @@
 };
 
 VisiblePlaceMark::VisiblePlaceMark()
-  : m_symbolIndex( 0 ), 
-    m_symbolSize( QSize( 0, 0 ) )
+  : m_symbolIndex( 0 ) 
 {
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]