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

[Thibaut Gridel]

SVN commit 1159202 by tgridel:

remove AbstractFileviewItem

 D             AbstractFileViewItem.h  
 M  +6 -7      FileManager.cpp  
 M  +3 -3      FileManager.h  
 M  +3 -3      FileViewModel.cpp  
 M  +0 -1      FileViewModel.h  
 M  +8 -9      KmlFileViewItem.cpp  
 M  +7 -9      KmlFileViewItem.h  
 M  +0 -1      MarbleModel.cpp  
 M  +2 -4      PlacemarkManager.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/FileManager.cpp #1159201:1159202
@@ -39,7 +39,7 @@
     MarbleDataFacade* m_datafacade;
     QList<FileLoader*> m_loaderList;
     QStringList m_pathList;
-    QList < AbstractFileViewItem* > m_fileItemList;
+    QList < KmlFileViewItem* > m_fileItemList;
 };
 }
 
@@ -58,7 +58,7 @@
         }
     }
 
-    foreach ( AbstractFileViewItem *file, d->m_fileItemList ) {
+    foreach ( KmlFileViewItem *file, d->m_fileItemList ) {
         delete file;
     }
 
@@ -131,7 +131,7 @@
     }
 }
 
-void FileManager::addFile ( AbstractFileViewItem * item )
+void FileManager::addFile ( KmlFileViewItem * item )
 {
     mDebug() << "FileManager::addFile";
     d->m_fileItemList.append( item );
@@ -150,8 +150,7 @@
     mDebug() << "FileManager::closeFile";
     if ( index < d->m_fileItemList.size() ) {
         emit fileRemoved( index );
-        KmlFileViewItem *file =
-                static_cast<KmlFileViewItem*>( d->m_fileItemList.at( index ));
+        KmlFileViewItem *file = d->m_fileItemList.at( index );
         if ( file ) {
             delete file->document();
         }
@@ -165,7 +164,7 @@
     return d->m_fileItemList.size();
 }
 
-AbstractFileViewItem * FileManager::at( int index )
+KmlFileViewItem * FileManager::at( int index )
 {
     if ( index < d->m_fileItemList.size() ) {
         return d->m_fileItemList.at( index );
@@ -175,7 +174,7 @@
 
 void FileManager::addGeoDataDocument( GeoDataDocument* document )
 {
-    KmlFileViewItem* item = new KmlFileViewItem( *this, document );
+    KmlFileViewItem* item = new KmlFileViewItem( *document );
     addFile( item );
 
     // now get the document that will be preserved throughout the life time
--- trunk/KDE/kdeedu/marble/src/lib/FileManager.h #1159201:1159202
@@ -19,7 +19,7 @@
 namespace Marble
 {
 
-class AbstractFileViewItem;
+class KmlFileViewItem;
 class FileManagerPrivate;
 class GeoDataDocument;
 class MarbleDataFacade;
@@ -78,12 +78,12 @@
     */
     void addData( const QString &name, const QString &data );
 
-    void addFile( AbstractFileViewItem *item );
+    void addFile( KmlFileViewItem *item );
     void saveFile( int index );
     void closeFile( int index );
 
     int size() const;
-    AbstractFileViewItem *at( int index );
+    KmlFileViewItem *at( int index );
 
 
  Q_SIGNALS:
--- trunk/KDE/kdeedu/marble/src/lib/FileViewModel.cpp #1159201:1159202
@@ -14,7 +14,7 @@
 
 #include <QtGui/QItemSelectionModel>
 
-#include "AbstractFileViewItem.h"
+#include "KmlFileViewItem.h"
 #include "FileManager.h"
 
 using namespace Marble;
@@ -46,7 +46,7 @@
 
     if ( row < m_manager->size() ) {
         if ( index.column() == 0 ) {
-            const AbstractFileViewItem& item = *m_manager->at( row );
+            const KmlFileViewItem& item = *m_manager->at( row );
 
             if ( role == Qt::CheckStateRole ) {
                 return item.isShown () ? Qt::Checked : Qt::Unchecked;
@@ -81,7 +81,7 @@
         if ( index.column() == 0 ) {
             if ( role == Qt::CheckStateRole ) {
 
-                AbstractFileViewItem& item = *m_manager->at( row );
+                KmlFileViewItem& item = *m_manager->at( row );
                 bool newValue = value.toBool ();
 
                 if ( item.isShown() != newValue ) {
--- trunk/KDE/kdeedu/marble/src/lib/FileViewModel.h #1159201:1159202
@@ -22,7 +22,6 @@
 namespace Marble
 {
 
-class AbstractFileViewItem;
 class FileManager;
 
 class MARBLE_EXPORT FileViewModel : public QAbstractListModel
--- trunk/KDE/kdeedu/marble/src/lib/KmlFileViewItem.cpp #1159201:1159202
@@ -15,8 +15,7 @@
 
 using namespace Marble;
 
-KmlFileViewItem::KmlFileViewItem( FileManager& manager, GeoDataDocument* document ) :
-    m_fileManager( manager ),
+KmlFileViewItem::KmlFileViewItem( const GeoDataDocument &document ) :
     m_document( document )
 {
 }
@@ -33,25 +32,25 @@
 
 GeoDataDocument* KmlFileViewItem::document()
 {
-    return m_document;
+    return &m_document;
 }
 
 bool KmlFileViewItem::isShown() const
 {
-    return m_document->isVisible();
+    return m_document.isVisible();
 }
 
 void KmlFileViewItem::setShown( bool value )
 {
-    m_document->setVisible( value );
+    m_document.setVisible( value );
 }
 
 QString KmlFileViewItem::name() const
 {
-    if(!m_document->name().isEmpty())
-        return m_document->name();
-    else if(!m_document->fileName().isEmpty())
-        return m_document->fileName();
+    if(!m_document.name().isEmpty())
+        return m_document.name();
+    else if(!m_document.fileName().isEmpty())
+        return m_document.fileName();
     else
         return QString("KML Document");
 
--- trunk/KDE/kdeedu/marble/src/lib/KmlFileViewItem.h #1159201:1159202
@@ -11,7 +11,6 @@
 #ifndef MARBLE_KMLFILEVIEWITEM_H
 #define MARBLE_KMLFILEVIEWITEM_H
 
-#include "AbstractFileViewItem.h"
 #include "GeoDataDocument.h"
 
 namespace Marble
@@ -19,24 +18,23 @@
 
 class FileManager;
 
-class KmlFileViewItem : public AbstractFileViewItem
+class KmlFileViewItem
 {
   public:
-    KmlFileViewItem( FileManager &manager, GeoDataDocument *document );
+    KmlFileViewItem( const GeoDataDocument &document );
     ~KmlFileViewItem();
 
     /*
      * AbstractFileViewItem methods
      */
-    virtual void saveFile();
-    virtual bool isShown() const;
-    virtual void setShown( bool value );
-    virtual QString name() const;
+    void saveFile();
+    bool isShown() const;
+    void setShown( bool value );
+    QString name() const;
 
     GeoDataDocument* document();
   private:
-    FileManager  &m_fileManager;
-    GeoDataDocument    *m_document;
+    GeoDataDocument    m_document;
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1159201:1159202
@@ -52,7 +52,6 @@
 #include "MercatorScanlineTextureMapper.h"
 #include "gps/PositionTracking.h"
 #include "HttpDownloadManager.h"
-#include "KmlFileViewItem.h"
 #include "LayerManager.h"
 #include "MarbleDataFacade.h"
 #include "MarbleDirs.h"
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkManager.cpp #1159201:1159202
@@ -86,8 +86,7 @@
 
 void PlacemarkManager::addGeoDataDocument( int index )
 {
-    KmlFileViewItem *file =
-            static_cast<KmlFileViewItem*>(d->m_fileManager->at(index));
+    KmlFileViewItem *file = d->m_fileManager->at(index);
     if (file)
     {
         const GeoDataDocument &document = *file->document();
@@ -109,8 +108,7 @@
 
 void PlacemarkManager::removeGeoDataDocument( int index )
 {
-    KmlFileViewItem *file =
-            static_cast<KmlFileViewItem*>(d->m_fileManager->at(index));
+    KmlFileViewItem *file = d->m_fileManager->at(index);
     if (file)
     {
         const GeoDataDocument &document = *file->document();