diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-01-08 08:08:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 15:39:14 +0100 |
| commit | 1ca893339669947fa60597d6a524a997e6bb87e9 (patch) | |
| tree | 0c76345773f15bd0b3c3c0abba79ef7d348d764d /src/contacts/qcontactfilter_p.h | |
| parent | 7487a1bfc3f85c8d3d69ed294fc97e6079f30201 (diff) | |
Use the installed headers
This fixes synqt warnings about incorrect inclusions in public headers.
Also deals with extra- and duplicate includes, forward declaration,
namespacing issues, and circular dependencies...
...and Qt-ifies the headers after all.
Change-Id: Ia373d6fb93e0fecedd2a2334fbeb4c2005a67a4c
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/contacts/qcontactfilter_p.h')
| -rw-r--r-- | src/contacts/qcontactfilter_p.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h index ffaf55d48..351cc8ae2 100644 --- a/src/contacts/qcontactfilter_p.h +++ b/src/contacts/qcontactfilter_p.h @@ -53,13 +53,16 @@ // We mean it. // -#include "qcontactfilter.h" -#include <QSharedData> -#include <QDataStream> - +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> + +#include <QtContacts/qcontactfilter.h> /* Boiler plate code */ #define Q_IMPLEMENT_CONTACTFILTER_PRIVATE(Class) \ @@ -119,5 +122,4 @@ template<> QTCONTACTS_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPoint #endif QT_END_NAMESPACE - -#endif +#endif // QCONTACTFILTER_P_H |