Fixing Marble's label colors.

svn path=/trunk/KDE/kdeedu/marble/; revision=680849

src/lib/MarbleModel.cpp

@@ -208,6 +208,8 @@ void MarbleModel::setMapTheme( const QString& selectedmap )
     if ( d->m_placeMarkContainer == 0)
         d->m_placeMarkContainer = new PlaceMarkContainer("placecontainer");
 
+    d->m_placeMarkContainer ->clearTextPixmaps();
+
     if ( d->m_placemarkpainter == 0)
         d->m_placemarkpainter = new PlaceMarkPainter( this );
 

src/lib/MarbleWidget.cpp

@@ -353,6 +353,7 @@ void MarbleWidget::centerOn(const QModelIndex& index)
     else 
 	d->m_crosshair.setEnabled( false );
 
+    d->m_model->placeMarkContainer()->clearTextPixmaps();
     d->m_model->placeMarkContainer()->sort();
 
     repaint();

src/lib/PlaceMarkContainer.h

@@ -53,6 +53,12 @@ class PlaceMarkContainer : public QVector<PlaceMark*>
         }
     }
 
+    inline void clearTextPixmaps()
+    {
+        foreach ( PlaceMark* mark, *this )
+            mark->clearTextPixmap();
+    }
+
     inline void clearSelected()
     {
         foreach ( PlaceMark* mark, *this ) {