merged from 0.6.7 codebase

1 files changed, 41 insertions, 39 deletions

diff --git a/application/VersionProxyModel.h b/application/VersionProxyModel.h
index 91d1ba23..8991c31b 100644
--- a/application/VersionProxyModel.h
+++ b/application/VersionProxyModel.h
@@ -8,58 +8,60 @@ class VersionFilterModel;
 
 class VersionProxyModel: public QAbstractProxyModel
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
 
-	enum Column
-	{
-		Name,
-		ParentVersion,
-		Branch,
-		Type,
-		Architecture,
-		Path,
-		Time
-	};
-	typedef QHash<BaseVersionList::ModelRoles, std::shared_ptr<Filter>> FilterMap;
+    enum Column
+    {
+        Name,
+        ParentVersion,
+        Branch,
+        Type,
+        Architecture,
+        Path,
+        Time
+    };
+    typedef QHash<BaseVersionList::ModelRoles, std::shared_ptr<Filter>> FilterMap;
 
 public:
     VersionProxyModel ( QObject* parent = 0 );
     virtual ~VersionProxyModel() {};
 
-	virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-	virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
-	virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
-	virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
-	virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-	virtual QModelIndex parent(const QModelIndex &child) const override;
-	virtual void setSourceModel(QAbstractItemModel *sourceModel) override;
+    virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
+    virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
+    virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    virtual QModelIndex parent(const QModelIndex &child) const override;
+    virtual void setSourceModel(QAbstractItemModel *sourceModel) override;
 
-	const FilterMap &filters() const;
-	void setFilter(const BaseVersionList::ModelRoles column, Filter * filter);
-	void clearFilters();
-	QModelIndex getRecommended() const;
-	QModelIndex getVersion(const QString & version) const;
+    const FilterMap &filters() const;
+    void setFilter(const BaseVersionList::ModelRoles column, Filter * filter);
+    void clearFilters();
+    QModelIndex getRecommended() const;
+    QModelIndex getVersion(const QString & version) const;
+    void setCurrentVersion(const QString &version);
 private slots:
 
-	void sourceDataChanged(const QModelIndex &source_top_left,const QModelIndex &source_bottom_right);
+    void sourceDataChanged(const QModelIndex &source_top_left,const QModelIndex &source_bottom_right);
 
-	void sourceAboutToBeReset();
-	void sourceReset();
+    void sourceAboutToBeReset();
+    void sourceReset();
 
-	void sourceRowsAboutToBeInserted(const QModelIndex &parent, int first, int last);
-	void sourceRowsInserted(const QModelIndex &parent, int first, int last);
+    void sourceRowsAboutToBeInserted(const QModelIndex &parent, int first, int last);
+    void sourceRowsInserted(const QModelIndex &parent, int first, int last);
 
-	void sourceRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
-	void sourceRowsRemoved(const QModelIndex &parent, int first, int last);
+    void sourceRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
+    void sourceRowsRemoved(const QModelIndex &parent, int first, int last);
 
 private:
-	QList<Column> m_columns;
-	FilterMap m_filters;
-	BaseVersionList::RoleList roles;
-	VersionFilterModel * filterModel;
-	bool hasRecommended = false;
-	bool hasLatest = false;
+    QList<Column> m_columns;
+    FilterMap m_filters;
+    BaseVersionList::RoleList roles;
+    VersionFilterModel * filterModel;
+    bool hasRecommended = false;
+    bool hasLatest = false;
+    QString m_currentVersion;
 };