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

[Bernhard Beschow]

SVN commit 1192038 by beschow:

remove dead code

 M  +1 -33     PlacemarkLayout.cpp  
 M  +1 -33     PlacemarkLayout.h  


--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.cpp #1192037:1192038
@@ -41,8 +41,6 @@
 PlacemarkLayout::PlacemarkLayout( QObject* parent )
     : QObject( parent ),
       m_placemarkPainter( 0 ),
-      m_placemarkModel( 0 ),
-      m_selectionModel( 0 ),
       m_maxLabelHeight( 0 ),
       m_styleResetRequested( true )
 {
@@ -184,19 +182,9 @@
 
 void PlacemarkLayout::paintPlaceFolder( QPainter   *painter,
                                         ViewParams *viewParams,
-                                        bool firstTime )
-{
-    paintPlaceFolder( painter, viewParams, model(), selectionModel(), firstTime );
-}
-
-void PlacemarkLayout::paintPlaceFolder( QPainter   *painter,
-                                        ViewParams *viewParams,
                                         const QAbstractItemModel  *model,
-                                        const QItemSelectionModel *selectionModel,
-                                        bool firstTime )
+                                        const QItemSelectionModel *selectionModel )
 {
-    Q_UNUSED( firstTime );
-
     if( 0 == selectionModel )
         return;
     if( 0 == model )
@@ -577,24 +565,4 @@
     return 100;
 }
 
-void PlacemarkLayout::setModel( QAbstractItemModel *model )
-{
-    m_placemarkModel = model;
-}
-
-QAbstractItemModel * PlacemarkLayout::model() const
-{
-    return m_placemarkModel;
-}
-
-void PlacemarkLayout::setSelectionModel( QItemSelectionModel * selectionModel )
-{
-    m_selectionModel = selectionModel;
-}
-
-QItemSelectionModel * PlacemarkLayout::selectionModel() const
-{
-    return m_selectionModel;
-}
-
 #include "PlacemarkLayout.moc"
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkLayout.h #1192037:1192038
@@ -59,34 +59,6 @@
     ~PlacemarkLayout();
 
     /**
-     * sets the model which is painted
-     *
-     * @param model PlacemarkModel or a proxy model on top of it
-     */
-    virtual void setModel( QAbstractItemModel *model );
-
-    QAbstractItemModel * model() const;
-
-    /**
-     * sets the selectionModel which contains the placemarks that get are selected
-     *
-     * @param selectionModel The selection model for the PlacemarkModel.
-     */
-    virtual void setSelectionModel( QItemSelectionModel * selectionModel );
-    
-    QItemSelectionModel * selectionModel() const;
-
-    /**
-     * Layouts the place marks. This is an overloaded function which takes the current values of the placemarkModel and the selectionModel.
-     *
-     * @param painter The painter that is used for painting.
-     * @param viewParams Parameters that influence the painting.
-     * @param planetAxis The position of the planet axis.
-     * @param firstTime Whether the map is painted the first time.
-     */
-    void paintPlaceFolder( QPainter *painter, ViewParams *viewParams, bool firstTime = true );
-
-    /**
      * Layouts the place marks.
      *
      * @param painter The painter that is used for painting.
@@ -98,8 +70,7 @@
      */
     void paintPlaceFolder( QPainter *painter, ViewParams *viewParams,
                            const QAbstractItemModel  *placemarkModel,
-                           const QItemSelectionModel *selectionModel,
-                           bool firstTime = true );
+                           const QItemSelectionModel *selectionModel );
 
     /**
      * Returns a the maximum height of all possible labels.
@@ -142,9 +113,6 @@
     QVector<VisiblePlacemark*> m_placemarkPool;
     QHash<QModelIndex, VisiblePlacemark*> m_visiblePlacemarks;
     
-    QAbstractItemModel *m_placemarkModel;
-    QItemSelectionModel *m_selectionModel;
-
     QModelIndexList m_indexList;
 
     QVector< int > m_weightfilter;