diff options
author | Jon Ander Peñalba <jonan88@gmail.com> | 2010-08-30 00:05:47 +0200 |
---|---|---|
committer | Jon Ander Peñalba <jonan88@gmail.com> | 2010-08-30 16:58:35 +0200 |
commit | 51ef0020a78bd216cb357eaa574161299fa0b608 (patch) | |
tree | 9c5f7ef427b79eaa3df14cf030a646e9508da043 /src/history/historymodels.h | |
parent | Merge branch 'master' of gitorious.org:rekonq/mainline (diff) | |
download | rekonq-51ef0020a78bd216cb357eaa574161299fa0b608.tar.xz |
Use the same FilterProxyModel for the bookmarks and history panels
Diffstat (limited to 'src/history/historymodels.h')
-rw-r--r-- | src/history/historymodels.h | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/history/historymodels.h b/src/history/historymodels.h index b61e8969..d193cf86 100644 --- a/src/history/historymodels.h +++ b/src/history/historymodels.h @@ -95,16 +95,16 @@ public: inline bool historyContains(const QString &url) const { - load(); + load(); return m_historyHash.contains(url); } - + inline QList<QString> keys() const { load(); return m_historyHash.keys(); } - + int historyLocation(const QString &url) const; QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; @@ -139,7 +139,7 @@ private: /** * Proxy model for the history model that converts the list * into a tree, one top level node per day. - * + * * Used in the HistoryDialog. * */ @@ -177,28 +177,4 @@ private: }; -// ----------------------------------------------------------------------------------------------------------------- - - -/** - * A modified QSortFilterProxyModel that always accepts - * the root nodes in the tree - * so filtering is only done on the children. - * - * Used in the HistoryDialog. - * - */ - -class TreeProxyModel : public QSortFilterProxyModel -{ - Q_OBJECT - -public: - TreeProxyModel(QObject *parent = 0); - -protected: - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; -}; - - #endif // HISTORYMODELS_H |