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/qcontactmanagerengine.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/qcontactmanagerengine.h')
-rw-r--r-- | src/contacts/qcontactmanagerengine.h | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/contacts/qcontactmanagerengine.h b/src/contacts/qcontactmanagerengine.h index ffd3631d0..53ae3b64e 100644 --- a/src/contacts/qcontactmanagerengine.h +++ b/src/contacts/qcontactmanagerengine.h @@ -39,29 +39,26 @@ ** ****************************************************************************/ - #ifndef QCONTACTMANAGERENGINE_H #define QCONTACTMANAGERENGINE_H -#include <QSharedData> -#include <QMap> -#include <QList> -#include <QString> -#include <QDateTime> -#include <QVariant> -#include <QObject> - -#include "qcontact.h" -#include "qcontactmanager.h" -#include "qcontactabstractrequest.h" -#include "qcontactrequests.h" -#include "qcontactfetchhint.h" +#include <QtCore/qdatetime.h> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> + +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactfetchhint.h> +#include <QtContacts/qcontactfilter.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactrequests.h> +#include <QtContacts/qcontactsortorder.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactFilter; -class QContactSortOrder; - class Q_CONTACTS_EXPORT QContactManagerEngine : public QObject { Q_OBJECT @@ -165,4 +162,4 @@ QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(QtContacts::QContactManagerEngine, "org.qt-project.Qt.QContactManagerEngine") QT_END_NAMESPACE -#endif +#endif // QCONTACTMANAGERENGINE_H |