diff -r 338ebdc9b947 -r 14f2b1b15242 mysortfilterproxymodel.cpp
--- a/mysortfilterproxymodel.cpp	Fri Oct 02 14:31:03 2009 +0000
+++ b/mysortfilterproxymodel.cpp	Fri Nov 13 08:32:03 2009 +0000
@@ -1,55 +1,14 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtGui>
+//#include <QtGui>
 
 #include "mysortfilterproxymodel.h"
 
-//! [0]
 MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
 }
 //! [0]
 
+/*
 //! [1]
 void MySortFilterProxyModel::setFilterMinimumDate(const QDate &date)
 {
@@ -64,10 +23,9 @@
     maxDate = date;
     invalidateFilter();
 }
-//! [2]
+*/
 
-//! [3]
-bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow,
+bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow,	// FIXME-1 find a way to show _all_ rows which match, independent of parent
         const QModelIndex &sourceParent) const
 {
     QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
@@ -75,12 +33,11 @@
     QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
 
     return (sourceModel()->data(index0).toString().contains(filterRegExp())
-            || sourceModel()->data(index1).toString().contains(filterRegExp()))
-           && dateInRange(sourceModel()->data(index2).toDate());
+            || sourceModel()->data(index1).toString().contains(filterRegExp()));
+//           && dateInRange(sourceModel()->data(index2).toDate());
 }
-//! [3]
 
-//! [4] //! [5]
+/*
 bool MySortFilterProxyModel::lessThan(const QModelIndex &left,
                                       const QModelIndex &right) const
 {
@@ -114,3 +71,4 @@
            && (!maxDate.isValid() || date < maxDate);
 }
 //! [7]
+*/