1.1 --- a/mysortfilterproxymodel.h Fri Oct 02 09:40:57 2009 +0000
1.2 +++ b/mysortfilterproxymodel.h Fri Oct 02 13:24:55 2009 +0000
1.3 @@ -1,37 +1,41 @@
1.4 /****************************************************************************
1.5 **
1.6 -** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
1.7 -** Contact: Qt Software Information (qt-info@nokia.com)
1.8 +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
1.9 +** Contact: Nokia Corporation (qt-info@nokia.com)
1.10 **
1.11 -** This file is part of the example classes of the Qt Toolkit.
1.12 +** This file is part of the examples of the Qt Toolkit.
1.13 **
1.14 +** $QT_BEGIN_LICENSE:LGPL$
1.15 ** Commercial Usage
1.16 ** Licensees holding valid Qt Commercial licenses may use this file in
1.17 ** accordance with the Qt Commercial License Agreement provided with the
1.18 ** Software or, alternatively, in accordance with the terms contained in
1.19 ** a written agreement between you and Nokia.
1.20 **
1.21 +** GNU Lesser General Public License Usage
1.22 +** Alternatively, this file may be used under the terms of the GNU Lesser
1.23 +** General Public License version 2.1 as published by the Free Software
1.24 +** Foundation and appearing in the file LICENSE.LGPL included in the
1.25 +** packaging of this file. Please review the following information to
1.26 +** ensure the GNU Lesser General Public License version 2.1 requirements
1.27 +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1.28 +**
1.29 +** In addition, as a special exception, Nokia gives you certain
1.30 +** additional rights. These rights are described in the Nokia Qt LGPL
1.31 +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
1.32 +** package.
1.33 **
1.34 ** GNU General Public License Usage
1.35 ** Alternatively, this file may be used under the terms of the GNU
1.36 -** General Public License versions 2.0 or 3.0 as published by the Free
1.37 -** Software Foundation and appearing in the file LICENSE.GPL included in
1.38 -** the packaging of this file. Please review the following information
1.39 -** to ensure GNU General Public Licensing requirements will be met:
1.40 -** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
1.41 -** http://www.gnu.org/copyleft/gpl.html. In addition, as a special
1.42 -** exception, Nokia gives you certain additional rights. These rights
1.43 -** are described in the Nokia Qt GPL Exception version 1.3, included in
1.44 -** the file GPL_EXCEPTION.txt in this package.
1.45 -**
1.46 -** Qt for Windows(R) Licensees
1.47 -** As a special exception, Nokia, as the sole copyright holder for Qt
1.48 -** Designer, grants users of the Qt/Eclipse Integration plug-in the
1.49 -** right for the Qt/Eclipse Integration to link to functionality
1.50 -** provided by Qt Designer and its related libraries.
1.51 +** General Public License version 3.0 as published by the Free Software
1.52 +** Foundation and appearing in the file LICENSE.GPL included in the
1.53 +** packaging of this file. Please review the following information to
1.54 +** ensure the GNU General Public License version 3.0 requirements will be
1.55 +** met: http://www.gnu.org/copyleft/gpl.html.
1.56 **
1.57 ** If you are unsure which license is appropriate for your use, please
1.58 -** contact the sales department at qt-sales@nokia.com.
1.59 +** contact the sales department at http://www.qtsoftware.com/contact.
1.60 +** $QT_END_LICENSE$
1.61 **
1.62 ****************************************************************************/
1.63
1.64 @@ -49,15 +53,15 @@
1.65 public:
1.66 MySortFilterProxyModel(QObject *parent = 0);
1.67
1.68 - // QDate filterMinimumDate() const { return minDate; }
1.69 -// void setFilterMinimumDate(const QDate &date);
1.70 + QDate filterMinimumDate() const { return minDate; }
1.71 + void setFilterMinimumDate(const QDate &date);
1.72
1.73 -// QDate filterMaximumDate() const { return maxDate; }
1.74 -// void setFilterMaximumDate(const QDate &date);
1.75 + QDate filterMaximumDate() const { return maxDate; }
1.76 + void setFilterMaximumDate(const QDate &date);
1.77
1.78 protected:
1.79 bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
1.80 -// bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
1.81 + bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
1.82
1.83 private:
1.84 bool dateInRange(const QDate &date) const;