[Marble-devel] [PATCH 6/8] dead code
Thibaut GRIDEL
tgridel at free.fr
Tue Sep 1 23:24:34 CEST 2009
8 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/src/lib/FileManager.cpp b/src/lib/FileManager.cpp
index 5776961..d77663d 100644
--- a/src/lib/FileManager.cpp
+++ b/src/lib/FileManager.cpp
@@ -200,7 +200,6 @@ void FileManager::addGeoDataDocument( GeoDataDocument* document )
// do not set this file if it only contains points
if( doc->isVisible() && d->m_datafacade->geometryModel() )
d->m_datafacade->geometryModel()->setGeoDataRoot( doc );
- emit geoDataDocumentAdded( *doc );
if( d->m_loaderList.isEmpty() ) {
emit finalize();
diff --git a/src/lib/FileManager.h b/src/lib/FileManager.h
index b4d862a..6be37c9 100644
--- a/src/lib/FileManager.h
+++ b/src/lib/FileManager.h
@@ -88,7 +88,6 @@ class FileManager : public QObject
Q_SIGNALS:
- void geoDataDocumentAdded( const GeoDataDocument &document );
void fileAdded( int index );
void fileRemoved( int index );
void finalize();
diff --git a/src/lib/KmlFileViewItem.cpp b/src/lib/KmlFileViewItem.cpp
index 71f4398..8296de1 100644
--- a/src/lib/KmlFileViewItem.cpp
+++ b/src/lib/KmlFileViewItem.cpp
@@ -15,7 +15,6 @@
#include "FileManager.h"
#include "MarbleDataFacade.h"
#include "MarblePlacemarkModel.h"
-#include "MarbleGeometryModel.h"
#include <QtCore/QDebug>
diff --git a/src/lib/MarbleModel.cpp b/src/lib/MarbleModel.cpp
index e3beba1..b92ba31 100644
--- a/src/lib/MarbleModel.cpp
+++ b/src/lib/MarbleModel.cpp
@@ -100,7 +100,6 @@ class MarbleModelPrivate
void resize( int width, int height );
void notifyModelChanged();
- void geoDataDocumentAdded( const GeoDataDocument& document );
static QAtomicInt refCounter;
MarbleModel *m_parent;
@@ -172,8 +171,6 @@ MarbleModel::MarbleModel( QObject *parent )
d->m_placemarkmanager = new PlacemarkManager();
d->m_placemarkmanager->setDataFacade(d->m_dataFacade);
- connect( d->m_fileManager, SIGNAL( geoDataDocumentAdded( const GeoDataDocument& ) ),
- this, SLOT( geoDataDocumentAdded( const GeoDataDocument& ) ) );
d->m_placemarkmanager->setFileManager(d->m_fileManager);
d->m_popSortModel = new QSortFilterProxyModel( this );
@@ -741,19 +738,6 @@ void MarbleModelPrivate::notifyModelChanged()
emit m_parent->modelChanged();
}
-void MarbleModelPrivate::geoDataDocumentAdded( const GeoDataDocument& document )
-{
- Q_UNUSED(document);
-/* QVector<GeoDataFeature>::Iterator end = document->end();
- QVector<GeoDataFeature>::Iterator itr = document->begin();
- for ( ; itr != end; ++itr ) {
- // use *itr (or itr.value()) here
- QString styleUrl = itr->styleUrl().remove('#');
- itr->setStyle( &document->style( styleUrl ) );
- }
-*/
-}
-
void MarbleModel::update()
{
qDebug() << "MarbleModel::update()";
diff --git a/src/lib/MarbleModel.h b/src/lib/MarbleModel.h
index 85e9ae7..2660089 100644
--- a/src/lib/MarbleModel.h
+++ b/src/lib/MarbleModel.h
@@ -367,7 +367,6 @@ class MARBLE_EXPORT MarbleModel : public QObject
MarbleModelPrivate * const d;
Q_PRIVATE_SLOT( d, void notifyModelChanged() )
- Q_PRIVATE_SLOT( d, void geoDataDocumentAdded( const GeoDataDocument& ) )
};
}
diff --git a/src/lib/MarblePlacemarkModel.h b/src/lib/MarblePlacemarkModel.h
index b76d5fe..dddcd35 100644
--- a/src/lib/MarblePlacemarkModel.h
+++ b/src/lib/MarblePlacemarkModel.h
@@ -110,12 +110,6 @@ class MARBLE_EXPORT MarblePlacemarkModel : public QAbstractListModel
int start,
int length );
- Q_SIGNALS:
- /**
- * @brief Signal that the persistant Index has been updated
- */
- void indexUpdated();
-
private:
void createFilterProperties( QVector<Marble::GeoDataPlacemark> &container );
diff --git a/src/lib/MarbleRunnerManager.h b/src/lib/MarbleRunnerManager.h
index ad47d0d..9ab8a1e 100644
--- a/src/lib/MarbleRunnerManager.h
+++ b/src/lib/MarbleRunnerManager.h
@@ -43,7 +43,6 @@ public:
public slots:
void newText(QString text);
signals:
- void allDone();
void modelChanged( MarblePlacemarkModel *model );
private slots:
diff --git a/src/lib/PlacemarkManager.cpp b/src/lib/PlacemarkManager.cpp
index 4120d00..47684ca 100644
--- a/src/lib/PlacemarkManager.cpp
+++ b/src/lib/PlacemarkManager.cpp
@@ -24,7 +24,6 @@
#include "FileViewModel.h"
#include "MarbleDirs.h"
#include "MarblePlacemarkModel.h"
-#include "MarbleGeometryModel.h"
#include "MarbleDataFacade.h"
#include "GeoDataDocument.h"
--
1.6.3.3
More information about the Marble-devel
mailing list