summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2014-01-15 09:30:41 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-01-15 15:49:50 +0700
commit795443766597e512504b4d4599d26131c83bff1d (patch)
treeb67953ac6c8b278317ed0346aaa910fa51d12145
parent9e55b64631f0f3079d6859b0b53db5fdc6830348 (diff)
downloadsubsurface-795443766597e512504b4d4599d26131c83bff1d.tar.gz
Resync included header with upstream
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/marble/GeoDataTreeModel.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/qt-ui/marble/GeoDataTreeModel.h b/qt-ui/marble/GeoDataTreeModel.h
index 2889b65ae..39eff8388 100644
--- a/qt-ui/marble/GeoDataTreeModel.h
+++ b/qt-ui/marble/GeoDataTreeModel.h
@@ -13,7 +13,9 @@
// -> does not appear to be needed #include "marble_export.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
+
+class QItemSelectionModel;
namespace Marble
{
@@ -72,6 +74,8 @@ class MARBLE_EXPORT GeoDataTreeModel : public QAbstractItemModel
void reset();
+ QItemSelectionModel *selectionModel();
+
public Q_SLOTS:
/**
@@ -82,11 +86,11 @@ public Q_SLOTS:
void setRootDocument( GeoDataDocument *document );
GeoDataDocument* rootDocument();
- int addFeature( GeoDataContainer *parent, GeoDataFeature *feature );
+ int addFeature( GeoDataContainer *parent, GeoDataFeature *feature, int row = -1 );
bool removeFeature( GeoDataContainer *parent, int index );
- bool removeFeature( GeoDataFeature *feature );
+ int removeFeature( const GeoDataFeature *feature );
void updateFeature( GeoDataFeature *feature );