diff options
author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-12-12 15:39:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-09 11:52:32 +0100 |
commit | b65802ecdd9d65522995eb7287dfdcdf878a7450 (patch) | |
tree | 00b389f93deeea6b8219deb17605f74d8014f697 /src/organizer/filters/qorganizeriteminvalidfilter.cpp | |
parent | 7e268a606c241be24a95fe57732b0eae50d1ac98 (diff) |
Fix various coding style issues.
Change-Id: I2e09a57b26073accc0ff236161529637c2ea12f1
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Sanity-Review: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'src/organizer/filters/qorganizeriteminvalidfilter.cpp')
-rw-r--r-- | src/organizer/filters/qorganizeriteminvalidfilter.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/organizer/filters/qorganizeriteminvalidfilter.cpp b/src/organizer/filters/qorganizeriteminvalidfilter.cpp index 603fb4c7b..d3280ad05 100644 --- a/src/organizer/filters/qorganizeriteminvalidfilter.cpp +++ b/src/organizer/filters/qorganizeriteminvalidfilter.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qorganizeriteminvalidfilter.h" -#include "qorganizeritemfilter_p.h" +#include <qorganizeriteminvalidfilter.h> +#include <private/qorganizeritemfilter_p.h> /*! - \class QOrganizerItemInvalidFilter - \brief The QOrganizerItemInvalidFilter class matches no organizeritems. - \inmodule QtOrganizer - \ingroup organizer-filters + \class QOrganizerItemInvalidFilter + \brief The QOrganizerItemInvalidFilter class matches no organizeritems. + \inmodule QtOrganizer + \ingroup organizer-filters - This class provides a filter which will never match any organizeritems + This class provides a filter which will never match any organizer items. */ QTORGANIZER_BEGIN_NAMESPACE @@ -61,33 +61,34 @@ public: { } - bool compare(const QOrganizerItemFilterPrivate*) const + bool compare(const QOrganizerItemFilterPrivate *) const { - return true; // all invalid filters are alike + return true; } - QDataStream& outputToStream(QDataStream& stream, quint8 formatVersion) const +#ifndef QT_NO_DATASTREAM + QDataStream &outputToStream(QDataStream &stream, quint8 formatVersion) const { Q_UNUSED(formatVersion) return stream; } - QDataStream& inputFromStream(QDataStream& stream, quint8 formatVersion) + QDataStream &inputFromStream(QDataStream &stream, quint8 formatVersion) { Q_UNUSED(formatVersion) return stream; } +#endif // QT_NO_DATASTREAM #ifndef QT_NO_DEBUG_STREAM - QDebug& debugStreamOut(QDebug& dbg) const + QDebug &debugStreamOut(QDebug &dbg) const { dbg.nospace() << "QOrganizerItemInvalidFilter()"; return dbg.maybeSpace() ; } -#endif +#endif // QT_NO_DEBUG_STREAM - /* There is no way this can be called - d is never detached */ - QOrganizerItemFilterPrivate* clone() const + QOrganizerItemFilterPrivate *clone() const { return new QOrganizerItemInvalidFilterPrivate(); } @@ -101,7 +102,7 @@ public: }; /*! - * Constructs a new invalid filter + Constructs a new invalid filter. */ QOrganizerItemInvalidFilter::QOrganizerItemInvalidFilter() : QOrganizerItemFilter(new QOrganizerItemInvalidFilterPrivate) @@ -109,12 +110,11 @@ QOrganizerItemInvalidFilter::QOrganizerItemInvalidFilter() } /*! - * Constructs a new invalid filter, ignoring the \a other filter + Constructs a new invalid filter, ignoring the \a other filter. */ -QOrganizerItemInvalidFilter::QOrganizerItemInvalidFilter(const QOrganizerItemFilter& other) +QOrganizerItemInvalidFilter::QOrganizerItemInvalidFilter(const QOrganizerItemFilter &other) : QOrganizerItemFilter(new QOrganizerItemInvalidFilterPrivate) { - // Initializing a QCIF from anything is the same as just constructing a QCIF Q_UNUSED(other); } |