summaryrefslogtreecommitdiff
path: root/src/history
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-03-10 19:02:12 +0100
committerAndrea Diamantini <adjam7@gmail.com>2013-03-10 19:02:12 +0100
commit9461c52f07a2bf8b9bc25f037b17805cda51b2b0 (patch)
treeb599e6eff700e65a864bb275c94adc9a6da7e529 /src/history
parentAdd toggle ability to bk folder in bk page (diff)
downloadrekonq-9461c52f07a2bf8b9bc25f037b17805cda51b2b0.tar.xz
Supporting panel (again) :)
- Move to a pure QWidget base window (instead of TabWidget one) (this to properly store panels position) - Restoring && rewamping panels code - Restoring actions to activate/deactivate them BUG: 312354
Diffstat (limited to 'src/history')
-rw-r--r--src/history/historymodels.cpp6
-rw-r--r--src/history/historymodels.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 4e1ca01f..76b504d3 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -748,20 +748,20 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i
// ----------------------------------------------------------------------------------------------------------
-UrlFilterProxyModel::UrlFilterProxyModel(QObject *parent)
+SortFilterProxyModel::SortFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
{
setFilterCaseSensitivity(Qt::CaseInsensitive);
}
-bool UrlFilterProxyModel::filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const
+bool SortFilterProxyModel::filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const
{
return recursiveMatch(sourceModel()->index(source_row, 0, source_parent));
}
-bool UrlFilterProxyModel::recursiveMatch(const QModelIndex &index) const
+bool SortFilterProxyModel::recursiveMatch(const QModelIndex &index) const
{
if (index.data().toString().contains(filterRegExp()))
return true;
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index be0cb442..598c8de3 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -186,12 +186,12 @@ private:
* If a url matches the filter it'll be shown,
* even if it's parent doesn't match it.
*/
-class UrlFilterProxyModel : public QSortFilterProxyModel
+class SortFilterProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
- explicit UrlFilterProxyModel(QObject *parent = 0);
+ explicit SortFilterProxyModel(QObject *parent = 0);
protected:
virtual bool filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const;