From 9461c52f07a2bf8b9bc25f037b17805cda51b2b0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 10 Mar 2013 19:02:12 +0100 Subject: 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 --- src/history/historymodels.cpp | 6 +++--- src/history/historymodels.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/history') 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; -- cgit v1.2.1