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

[Thibaut Gridel]

SVN commit 1205740 by tgridel:

PlacemarkLayout need not expose its painter

 M  +0 -3      MarbleModel.cpp  
 M  +0 -5      PlacemarkLayout.cpp  
 M  +0 -6      PlacemarkLayout.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1205739:1205740
@@ -339,9 +339,6 @@
     d->notifyModelChanged();
 
 
-    // FIXME: Still needs to get fixed for the DGML2 refactoring
-//    d->m_placemarkLayout->placemarkPainter()->setDefaultLabelColor( d->m_maptheme->labelColor() );
-
     mDebug() << "THEME CHANGED: ***" << mapTheme->head()->mapThemeId();
     emit themeChanged( mapTheme->head()->mapThemeId() );
 
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.cpp #1205739:1205740
@@ -147,11 +147,6 @@
     return ret;
 }
 
-PlacemarkPainter* PlacemarkLayout::placemarkPainter() const
-{ 
-    return m_placemarkPainter; 
-}
-
 int PlacemarkLayout::maxLabelHeight( const QAbstractItemModel* model,
                                      const QItemSelectionModel* selectionModel ) const
 {
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.h #1205739:1205740
@@ -65,10 +65,6 @@
      *
      * @param painter The painter that is used for painting.
      * @param viewParams Parameters that influence the painting.
-     * @param placemarkModel The PlacemarkModel or a proxy model on top of it.
-     * @param selectionModel The selection model for the PlacemarkModel.
-     * @param planetAxis The position of the planet axis.
-     * @param firstTime Whether the map is painted the first time.
      */
     void paintPlaceFolder( QPainter *painter, ViewParams *viewParams );
 
@@ -88,8 +84,6 @@
      */
     QVector<QModelIndex> whichPlacemarkAt( const QPoint &pos );
 
-    PlacemarkPainter* placemarkPainter() const;
-
  public Q_SLOTS:
 
     void requestStyleReset();