[PATCH 10/13] Resync included header with upstream
Anton Lundin
glance at acc.umu.se
Wed Jan 15 00:30:41 UTC 2014
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
qt-ui/marble/GeoDataTreeModel.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/qt-ui/marble/GeoDataTreeModel.h b/qt-ui/marble/GeoDataTreeModel.h
index 2889b65..39eff83 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 );
--
1.8.3.2
More information about the subsurface
mailing list