diff -r 6b0a5f4923d3 -r f076fdec767d mysortfilterproxymodel.cpp
--- a/mysortfilterproxymodel.cpp	Thu Sep 17 09:41:09 2009 +0000
+++ b/mysortfilterproxymodel.cpp	Fri Oct 02 13:24:55 2009 +0000
@@ -1,37 +1,41 @@
 /****************************************************************************
 **
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the example classes of the Qt Toolkit.
+** 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 versions 2.0 or 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 GNU General Public Licensing requirements will be met:
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
-** exception, Nokia gives you certain additional rights. These rights
-** are described in the Nokia Qt GPL Exception version 1.3, included in
-** the file GPL_EXCEPTION.txt in this package.
-**
-** Qt for Windows(R) Licensees
-** As a special exception, Nokia, as the sole copyright holder for Qt
-** Designer, grants users of the Qt/Eclipse Integration plug-in the
-** right for the Qt/Eclipse Integration to link to functionality
-** provided by Qt Designer and its related libraries.
+** 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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -39,42 +43,52 @@
 
 #include "mysortfilterproxymodel.h"
 
+//! [0]
 MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent)
     : QSortFilterProxyModel(parent)
 {
 }
-/*
+//! [0]
+
+//! [1]
 void MySortFilterProxyModel::setFilterMinimumDate(const QDate &date)
 {
     minDate = date;
     invalidateFilter();
 }
+//! [1]
+
+//! [2]
 void MySortFilterProxyModel::setFilterMaximumDate(const QDate &date)
 {
     maxDate = date;
     invalidateFilter();
 }
-*/
+//! [2]
 
-#include <iostream>
-using namespace std;
+//! [3]
 bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow,
         const QModelIndex &sourceParent) const
 {
-	return true;
-cout << "MSFPM  sM="<<sourceModel()<<endl;
     QModelIndex index0 = sourceModel()->index(sourceRow, 0, sourceParent);
     QModelIndex index1 = sourceModel()->index(sourceRow, 1, sourceParent);
+    QModelIndex index2 = sourceModel()->index(sourceRow, 2, sourceParent);
 
-    return (sourceModel()->data(index0).toString().contains(filterRegExp()) );
+    return (sourceModel()->data(index0).toString().contains(filterRegExp())
+            || sourceModel()->data(index1).toString().contains(filterRegExp()))
+           && dateInRange(sourceModel()->data(index2).toDate());
 }
+//! [3]
 
-/*
+//! [4] //! [5]
 bool MySortFilterProxyModel::lessThan(const QModelIndex &left,
                                       const QModelIndex &right) const
 {
     QVariant leftData = sourceModel()->data(left);
     QVariant rightData = sourceModel()->data(right);
+//! [4]
+
+//! [6]
     if (leftData.type() == QVariant::DateTime) {
         return leftData.toDateTime() < rightData.toDateTime();
     } else {
@@ -91,9 +105,12 @@
         return QString::localeAwareCompare(leftString, rightString) < 0;
     }
 }
+//! [5] //! [6]
+
+//! [7]
 bool MySortFilterProxyModel::dateInRange(const QDate &date) const
 {
     return (!minDate.isValid() || date > minDate)
            && (!maxDate.isValid() || date < maxDate);
 }
-*/
+//! [7]