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 | |
| 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>
532 files changed, 2586 insertions, 2449 deletions
diff --git a/examples/organizer/calendardemo/src/addcalendarpage.cpp b/examples/organizer/calendardemo/src/addcalendarpage.cpp index 9c479b2af..60b4ca2aa 100644 --- a/examples/organizer/calendardemo/src/addcalendarpage.cpp +++ b/examples/organizer/calendardemo/src/addcalendarpage.cpp @@ -40,7 +40,7 @@ #include "addcalendarpage.h" #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/addcalendarpage.h b/examples/organizer/calendardemo/src/addcalendarpage.h index 3c6816c2b..16c247ba8 100644 --- a/examples/organizer/calendardemo/src/addcalendarpage.h +++ b/examples/organizer/calendardemo/src/addcalendarpage.h @@ -41,7 +41,7 @@ #define ADDCALENDARPAGE_H #include <QWidget> -#include <qorganizercollection.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp index afa0f6641..ea1dd1d72 100644 --- a/examples/organizer/calendardemo/src/calendardemo.cpp +++ b/examples/organizer/calendardemo/src/calendardemo.cpp @@ -56,7 +56,7 @@ #endif #include <QtWidgets> #include <QDesktopServices> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/calendardemo.h b/examples/organizer/calendardemo/src/calendardemo.h index a8773ed7f..2ed4140bb 100644 --- a/examples/organizer/calendardemo/src/calendardemo.h +++ b/examples/organizer/calendardemo/src/calendardemo.h @@ -43,8 +43,8 @@ #include <QMainWindow> #include <QDate> -#include <qorganizeritemsaverequest.h> -#include <qorganizeritemremovebyidrequest.h> +#include <QtOrganizer/qorganizeritemsaverequest.h> +#include <QtOrganizer/qorganizeritemremovebyidrequest.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/daypage.cpp b/examples/organizer/calendardemo/src/daypage.cpp index 54f9aabeb..c2d055601 100644 --- a/examples/organizer/calendardemo/src/daypage.cpp +++ b/examples/organizer/calendardemo/src/daypage.cpp @@ -42,7 +42,7 @@ #include "calendardemo.h" #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/daypage.h b/examples/organizer/calendardemo/src/daypage.h index 260e42f20..40fa0cb82 100644 --- a/examples/organizer/calendardemo/src/daypage.h +++ b/examples/organizer/calendardemo/src/daypage.h @@ -43,7 +43,7 @@ #include <QWidget> #include <QDate> -#include <qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/editcalendarspage.cpp b/examples/organizer/calendardemo/src/editcalendarspage.cpp index 4b9e1be35..1f81998e4 100644 --- a/examples/organizer/calendardemo/src/editcalendarspage.cpp +++ b/examples/organizer/calendardemo/src/editcalendarspage.cpp @@ -41,7 +41,7 @@ #include "calendardemo.h" #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/editcalendarspage.h b/examples/organizer/calendardemo/src/editcalendarspage.h index c5213ad33..e4fff5d9a 100644 --- a/examples/organizer/calendardemo/src/editcalendarspage.h +++ b/examples/organizer/calendardemo/src/editcalendarspage.h @@ -41,7 +41,7 @@ #define EDITCALENDARSPAGE_H #include <QWidget> -#include <qorganizercollection.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/eventeditpage.cpp b/examples/organizer/calendardemo/src/eventeditpage.cpp index f2351fe69..af97076e2 100644 --- a/examples/organizer/calendardemo/src/eventeditpage.cpp +++ b/examples/organizer/calendardemo/src/eventeditpage.cpp @@ -40,7 +40,7 @@ #include "eventeditpage.h" #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/eventeditpage.h b/examples/organizer/calendardemo/src/eventeditpage.h index 3e3741f1b..1cccf9729 100644 --- a/examples/organizer/calendardemo/src/eventeditpage.h +++ b/examples/organizer/calendardemo/src/eventeditpage.h @@ -42,9 +42,9 @@ #include <QWidget> #include <QDate> -#include <qorganizeritemid.h> -#include <qorganizerevent.h> -#include <qorganizercollection.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizerevent.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp index 11acf9926..519f40b05 100644 --- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp +++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.cpp @@ -40,7 +40,7 @@ #include "eventoccurrenceeditpage.h" #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h index c50b5489a..a093255e2 100644 --- a/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h +++ b/examples/organizer/calendardemo/src/eventoccurrenceeditpage.h @@ -42,9 +42,9 @@ #include <QWidget> #include <QDate> -#include <qorganizeritemid.h> -#include <qorganizerevent.h> -#include <qorganizereventoccurrence.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizerevent.h> +#include <QtOrganizer/qorganizereventoccurrence.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/journaleditpage.cpp b/examples/organizer/calendardemo/src/journaleditpage.cpp index 7e5128398..356e1b7e7 100644 --- a/examples/organizer/calendardemo/src/journaleditpage.cpp +++ b/examples/organizer/calendardemo/src/journaleditpage.cpp @@ -41,7 +41,7 @@ #include <QtWidgets> #include <QComboBox> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/journaleditpage.h b/examples/organizer/calendardemo/src/journaleditpage.h index e8d36226f..e2e67c535 100644 --- a/examples/organizer/calendardemo/src/journaleditpage.h +++ b/examples/organizer/calendardemo/src/journaleditpage.h @@ -43,9 +43,9 @@ #include <QWidget> #include <QDate> -#include <qorganizeritemid.h> -#include <qorganizerjournal.h> -#include <qorganizercollection.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizerjournal.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/monthpage.cpp b/examples/organizer/calendardemo/src/monthpage.cpp index 3f2f443b5..850f517d2 100644 --- a/examples/organizer/calendardemo/src/monthpage.cpp +++ b/examples/organizer/calendardemo/src/monthpage.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include <QtWidgets> -#include <qorganizer.h> -#include <qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizer.h> +#include <QtOrganizer/qorganizerabstractrequest.h> #include "monthpage.h" #include "calendardemo.h" diff --git a/examples/organizer/calendardemo/src/monthpage.h b/examples/organizer/calendardemo/src/monthpage.h index 1d8c83833..11e3b6275 100644 --- a/examples/organizer/calendardemo/src/monthpage.h +++ b/examples/organizer/calendardemo/src/monthpage.h @@ -43,7 +43,7 @@ #include <QWidget> #include <QDate> -#include <qorganizerglobal.h> +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/calendardemo/src/todoeditpage.cpp b/examples/organizer/calendardemo/src/todoeditpage.cpp index 25db0402c..c3eaaca8a 100644 --- a/examples/organizer/calendardemo/src/todoeditpage.cpp +++ b/examples/organizer/calendardemo/src/todoeditpage.cpp @@ -41,7 +41,7 @@ #include <QtWidgets> #include <QComboBox> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/calendardemo/src/todoeditpage.h b/examples/organizer/calendardemo/src/todoeditpage.h index c0e0a8c84..3fe6981ad 100644 --- a/examples/organizer/calendardemo/src/todoeditpage.h +++ b/examples/organizer/calendardemo/src/todoeditpage.h @@ -42,9 +42,9 @@ #include <QWidget> #include <QDate> -#include <qorganizeritemid.h> -#include <qorganizertodo.h> -#include <qorganizercollection.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizertodo.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/examples/organizer/todo/todoeditor.cpp b/examples/organizer/todo/todoeditor.cpp index eed35ab7c..6d2acf67b 100644 --- a/examples/organizer/todo/todoeditor.cpp +++ b/examples/organizer/todo/todoeditor.cpp @@ -40,10 +40,12 @@ #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> #include "todoeditor.h" +QTORGANIZER_USE_NAMESPACE + TodoEditor::TodoEditor() { setupGui(); diff --git a/examples/organizer/todo/todoeditor.h b/examples/organizer/todo/todoeditor.h index b215ac883..3a6c48d3e 100644 --- a/examples/organizer/todo/todoeditor.h +++ b/examples/organizer/todo/todoeditor.h @@ -43,7 +43,7 @@ #include <QWidget> -#include <qorganizertodo.h> +#include <QtOrganizer/qorganizertodo.h> QTORGANIZER_USE_NAMESPACE diff --git a/examples/organizer/todo/window.cpp b/examples/organizer/todo/window.cpp index 0eab1be1c..198d51ae3 100644 --- a/examples/organizer/todo/window.cpp +++ b/examples/organizer/todo/window.cpp @@ -40,11 +40,13 @@ #include <QtWidgets> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> #include "window.h" #include "todoeditor.h" +QTORGANIZER_USE_NAMESPACE + //! [0] Window::Window() { diff --git a/examples/organizer/todo/window.h b/examples/organizer/todo/window.h index a1997ca7d..f46cbf933 100644 --- a/examples/organizer/todo/window.h +++ b/examples/organizer/todo/window.h @@ -42,7 +42,7 @@ #define WINDOW_H #include <QWidget> -#include <qorganizerglobal.h> +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManager; diff --git a/src/contacts/details/qcontactaddress.h b/src/contacts/details/qcontactaddress.h index fdfed5fbf..e9051fd57 100644 --- a/src/contacts/details/qcontactaddress.h +++ b/src/contacts/details/qcontactaddress.h @@ -39,16 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTADDRESS_H #define QCONTACTADDRESS_H -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactAddress : public QContactDetail { @@ -98,5 +97,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTADDRESS_H diff --git a/src/contacts/details/qcontactanniversary.h b/src/contacts/details/qcontactanniversary.h index a534f7b55..92fb16393 100644 --- a/src/contacts/details/qcontactanniversary.h +++ b/src/contacts/details/qcontactanniversary.h @@ -42,11 +42,9 @@ #ifndef QCONTACTANNIVERSARY_H #define QCONTACTANNIVERSARY_H -#include <QString> +#include <QtCore/qdatetime.h> -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -91,5 +89,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTANNIVERSARY_H diff --git a/src/contacts/details/qcontactavatar.h b/src/contacts/details/qcontactavatar.h index 32c12613d..e4a127087 100644 --- a/src/contacts/details/qcontactavatar.h +++ b/src/contacts/details/qcontactavatar.h @@ -42,12 +42,9 @@ #ifndef QCONTACTAVATAR_H #define QCONTACTAVATAR_H -#include <QString> -#include <QUrl> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,4 +72,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTAVATAR_H diff --git a/src/contacts/details/qcontactbirthday.h b/src/contacts/details/qcontactbirthday.h index 1af0e4551..352dd386d 100644 --- a/src/contacts/details/qcontactbirthday.h +++ b/src/contacts/details/qcontactbirthday.h @@ -42,11 +42,9 @@ #ifndef QCONTACTBIRTHDAY_H #define QCONTACTBIRTHDAY_H -#include <QString> +#include <QtCore/qdatetime.h> -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,5 +73,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTBIRTHDAY_H diff --git a/src/contacts/details/qcontactdetails.cpp b/src/contacts/details/qcontactdetails.cpp index 6d100a7ef..d59cc33e2 100644 --- a/src/contacts/details/qcontactdetails.cpp +++ b/src/contacts/details/qcontactdetails.cpp @@ -39,14 +39,13 @@ ** ****************************************************************************/ -#include <QByteArray> -#include <QUrl> -#include <QFile> - -#include <qcontactmanager.h> -#include <qcontacts.h> -#include <qcontactdetails.h> -#include <qcontactdetail.h> +#include "qcontactdetails.h" + +#include <QtCore/qfile.h> + +#include "qcontactmanager.h" +#include "qcontactfilter.h" +#include "qcontacts.h" /* When these conditions are satisfied, QStringLiteral is implemented by diff --git a/src/contacts/details/qcontactdetails.h b/src/contacts/details/qcontactdetails.h index fdc30b19b..6e55d23b8 100644 --- a/src/contacts/details/qcontactdetails.h +++ b/src/contacts/details/qcontactdetails.h @@ -45,36 +45,36 @@ // this file includes all of the leaf detail classes // provided by the Qt Contacts API. -#include <qcontactaddress.h> -#include <qcontactanniversary.h> -#include <qcontactavatar.h> -#include <qcontactbirthday.h> -#include <qcontactdisplaylabel.h> -#include <qcontactemailaddress.h> -#include <qcontactextendeddetail.h> -#include <qcontactfamily.h> -#include <qcontactfavorite.h> -#include <qcontactgender.h> -#include <qcontactgeolocation.h> -#include <qcontactglobalpresence.h> -#include <qcontactguid.h> -#include <qcontacthobby.h> -#include <qcontactname.h> -#include <qcontactnickname.h> -#include <qcontactnote.h> -#include <qcontactonlineaccount.h> -#include <qcontactorganization.h> -#include <qcontactphonenumber.h> -#include <qcontactpresence.h> -#include <qcontactringtone.h> -#include <qcontactsynctarget.h> -#include <qcontacttag.h> -#include <qcontacttimestamp.h> -#include <qcontacttype.h> -#include <qcontacturl.h> -#include <qcontactversion.h> +#include <QtContacts/qcontactaddress.h> +#include <QtContacts/qcontactanniversary.h> +#include <QtContacts/qcontactavatar.h> +#include <QtContacts/qcontactbirthday.h> +#include <QtContacts/qcontactdisplaylabel.h> +#include <QtContacts/qcontactemailaddress.h> +#include <QtContacts/qcontactextendeddetail.h> +#include <QtContacts/qcontactfamily.h> +#include <QtContacts/qcontactfavorite.h> +#include <QtContacts/qcontactgender.h> +#include <QtContacts/qcontactgeolocation.h> +#include <QtContacts/qcontactglobalpresence.h> +#include <QtContacts/qcontactguid.h> +#include <QtContacts/qcontacthobby.h> +#include <QtContacts/qcontactname.h> +#include <QtContacts/qcontactnickname.h> +#include <QtContacts/qcontactnote.h> +#include <QtContacts/qcontactonlineaccount.h> +#include <QtContacts/qcontactorganization.h> +#include <QtContacts/qcontactphonenumber.h> +#include <QtContacts/qcontactpresence.h> +#include <QtContacts/qcontactringtone.h> +#include <QtContacts/qcontactsynctarget.h> +#include <QtContacts/qcontacttag.h> +#include <QtContacts/qcontacttimestamp.h> +#include <QtContacts/qcontacttype.h> +#include <QtContacts/qcontacturl.h> +#include <QtContacts/qcontactversion.h> QT_BEGIN_NAMESPACE_CONTACTS QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAILS_H diff --git a/src/contacts/details/qcontactdisplaylabel.h b/src/contacts/details/qcontactdisplaylabel.h index 44c6b9ad8..9462aa68e 100644 --- a/src/contacts/details/qcontactdisplaylabel.h +++ b/src/contacts/details/qcontactdisplaylabel.h @@ -39,18 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTDISPLAYLABEL_H #define QCONTACTDISPLAYLABEL_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontactfilter.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactDisplayLabel : public QContactDetail { @@ -73,4 +70,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDISPLAYLABEL_H diff --git a/src/contacts/details/qcontactemailaddress.h b/src/contacts/details/qcontactemailaddress.h index 6aa04ec3b..075043b55 100644 --- a/src/contacts/details/qcontactemailaddress.h +++ b/src/contacts/details/qcontactemailaddress.h @@ -39,18 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTEMAILADDRESS_H #define QCONTACTEMAILADDRESS_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontactfilter.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactEmailAddress : public QContactDetail { @@ -74,5 +71,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTEMAILADDRESS_H diff --git a/src/contacts/details/qcontactextendeddetail.h b/src/contacts/details/qcontactextendeddetail.h index 6166051cc..d62334c5b 100644 --- a/src/contacts/details/qcontactextendeddetail.h +++ b/src/contacts/details/qcontactextendeddetail.h @@ -42,7 +42,7 @@ #ifndef QCONTACTEXTENDEDDETAIL_H #define QCONTACTEXTENDEDDETAIL_H -#include <qcontactdetail.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/details/qcontactfamily.h b/src/contacts/details/qcontactfamily.h index 4202336d1..58e8bd4f9 100644 --- a/src/contacts/details/qcontactfamily.h +++ b/src/contacts/details/qcontactfamily.h @@ -39,15 +39,10 @@ ** ****************************************************************************/ - #ifndef QCONTACTFAMILY_H #define QCONTACTFAMILY_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -74,5 +69,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTFAMILY_H diff --git a/src/contacts/details/qcontactfavorite.h b/src/contacts/details/qcontactfavorite.h index c65d0f746..1591e105d 100644 --- a/src/contacts/details/qcontactfavorite.h +++ b/src/contacts/details/qcontactfavorite.h @@ -39,16 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTFAVORITE_H #define QCONTACTFAVORITE_H -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactFavorite : public QContactDetail { @@ -75,4 +74,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTFAVORITE_H diff --git a/src/contacts/details/qcontactgender.h b/src/contacts/details/qcontactgender.h index f6619bed6..3c72edfaf 100644 --- a/src/contacts/details/qcontactgender.h +++ b/src/contacts/details/qcontactgender.h @@ -42,11 +42,7 @@ #ifndef QCONTACTGENDER_H #define QCONTACTGENDER_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -73,5 +69,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTGENDER_H diff --git a/src/contacts/details/qcontactgeolocation.h b/src/contacts/details/qcontactgeolocation.h index 9ff2508c0..11c50dc2b 100644 --- a/src/contacts/details/qcontactgeolocation.h +++ b/src/contacts/details/qcontactgeolocation.h @@ -39,15 +39,12 @@ ** ****************************************************************************/ - #ifndef QCONTACTGEOLOCATION_H #define QCONTACTGEOLOCATION_H -#include <QString> +#include <QtCore/qdatetime.h> -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -96,5 +93,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTGEOLOCATION_H diff --git a/src/contacts/details/qcontactglobalpresence.h b/src/contacts/details/qcontactglobalpresence.h index 791d9b0e3..b55f931c6 100644 --- a/src/contacts/details/qcontactglobalpresence.h +++ b/src/contacts/details/qcontactglobalpresence.h @@ -39,20 +39,19 @@ ** ****************************************************************************/ - #ifndef QCONTACTGLOBALPRESENCE_H #define QCONTACTGLOBALPRESENCE_H -#include <QString> -#include <QUrl> +#include <QtCore/qdatetime.h> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> -#include <qcontactpresence.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactpresence.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactGlobalPresence : public QContactDetail { @@ -91,5 +90,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTGLOBALPRESENCE_H diff --git a/src/contacts/details/qcontactguid.h b/src/contacts/details/qcontactguid.h index ff159b60d..72dc99b8f 100644 --- a/src/contacts/details/qcontactguid.h +++ b/src/contacts/details/qcontactguid.h @@ -39,15 +39,10 @@ ** ****************************************************************************/ - #ifndef QCONTACTGUID_H #define QCONTACTGUID_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -71,5 +66,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTGUID_H diff --git a/src/contacts/details/qcontacthobby.h b/src/contacts/details/qcontacthobby.h index 93aec085a..3ca3d0737 100644 --- a/src/contacts/details/qcontacthobby.h +++ b/src/contacts/details/qcontacthobby.h @@ -42,10 +42,7 @@ #ifndef QCONTACTHOBBY_H #define QCONTACTHOBBY_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -69,4 +66,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTHOBBY_H diff --git a/src/contacts/details/qcontactname.h b/src/contacts/details/qcontactname.h index 0c8334e05..b493851f3 100644 --- a/src/contacts/details/qcontactname.h +++ b/src/contacts/details/qcontactname.h @@ -39,18 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTNAME_H #define QCONTACTNAME_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontactfilter.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactName : public QContactDetail { @@ -88,4 +85,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTNAME_H diff --git a/src/contacts/details/qcontactnickname.h b/src/contacts/details/qcontactnickname.h index bda4b4854..7541017d6 100644 --- a/src/contacts/details/qcontactnickname.h +++ b/src/contacts/details/qcontactnickname.h @@ -42,11 +42,7 @@ #ifndef QCONTACTNICKNAME_H #define QCONTACTNICKNAME_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -70,5 +66,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTNICKNAME_H diff --git a/src/contacts/details/qcontactnote.h b/src/contacts/details/qcontactnote.h index 3d6a9a31e..394a2b358 100644 --- a/src/contacts/details/qcontactnote.h +++ b/src/contacts/details/qcontactnote.h @@ -42,11 +42,7 @@ #ifndef QCONTACTNOTE_H #define QCONTACTNOTE_H -#include <QString> - -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -70,5 +66,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTNOTE_H diff --git a/src/contacts/details/qcontactonlineaccount.h b/src/contacts/details/qcontactonlineaccount.h index 2feffc111..eb249f590 100644 --- a/src/contacts/details/qcontactonlineaccount.h +++ b/src/contacts/details/qcontactonlineaccount.h @@ -39,15 +39,10 @@ ** ****************************************************************************/ - #ifndef QCONTACTONLINEACCOUNT_H #define QCONTACTONLINEACCOUNT_H -#include <QString> - -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -106,4 +101,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTONLINEACCOUNT_H diff --git a/src/contacts/details/qcontactorganization.h b/src/contacts/details/qcontactorganization.h index feedb3b97..9d154fe19 100644 --- a/src/contacts/details/qcontactorganization.h +++ b/src/contacts/details/qcontactorganization.h @@ -42,12 +42,9 @@ #ifndef QCONTACTORGANIZATION_H #define QCONTACTORGANIZATION_H -#include <QString> -#include <QUrl> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -89,4 +86,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTORGANIZATION_H diff --git a/src/contacts/details/qcontactphonenumber.h b/src/contacts/details/qcontactphonenumber.h index 9d1d8052e..5cd04bd7f 100644 --- a/src/contacts/details/qcontactphonenumber.h +++ b/src/contacts/details/qcontactphonenumber.h @@ -39,18 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTPHONENUMBER_H #define QCONTACTPHONENUMBER_H -#include <QString> - -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontactfilter.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ //! [0] class Q_CONTACTS_EXPORT QContactPhoneNumber : public QContactDetail @@ -95,5 +92,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTPHONENUMBER_H diff --git a/src/contacts/details/qcontactpresence.h b/src/contacts/details/qcontactpresence.h index 735b9276b..6281bfc7a 100644 --- a/src/contacts/details/qcontactpresence.h +++ b/src/contacts/details/qcontactpresence.h @@ -39,16 +39,13 @@ ** ****************************************************************************/ - #ifndef QCONTACTPRESENCE_H #define QCONTACTPRESENCE_H -#include <QString> -#include <QUrl> +#include <QtCore/qdatetime.h> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -97,5 +94,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTPRESENCE_H diff --git a/src/contacts/details/qcontactringtone.h b/src/contacts/details/qcontactringtone.h index 7f0f855a5..0626a749c 100644 --- a/src/contacts/details/qcontactringtone.h +++ b/src/contacts/details/qcontactringtone.h @@ -42,11 +42,9 @@ #ifndef QCONTACTRINGTONE_H #define QCONTACTRINGTONE_H -#include <QString> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -78,4 +76,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRINGTONE_H diff --git a/src/contacts/details/qcontactsynctarget.h b/src/contacts/details/qcontactsynctarget.h index c142a7e5c..938669de5 100644 --- a/src/contacts/details/qcontactsynctarget.h +++ b/src/contacts/details/qcontactsynctarget.h @@ -39,15 +39,10 @@ ** ****************************************************************************/ - #ifndef QCONTACTSYNCTARGET_H #define QCONTACTSYNCTARGET_H -#include <QString> - -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -71,5 +66,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTSYNCTARGET_H diff --git a/src/contacts/details/qcontacttag.h b/src/contacts/details/qcontacttag.h index 71322dbe7..b10cd7e51 100644 --- a/src/contacts/details/qcontacttag.h +++ b/src/contacts/details/qcontacttag.h @@ -42,14 +42,12 @@ #ifndef QCONTACTTAG_H #define QCONTACTTAG_H -#include <QString> - -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + /* Leaf class */ class Q_CONTACTS_EXPORT QContactTag : public QContactDetail { @@ -73,4 +71,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTTAG_H diff --git a/src/contacts/details/qcontacttimestamp.h b/src/contacts/details/qcontacttimestamp.h index 195535eb3..c2168a72e 100644 --- a/src/contacts/details/qcontacttimestamp.h +++ b/src/contacts/details/qcontacttimestamp.h @@ -42,11 +42,9 @@ #ifndef QCONTACTTIMESTAMP_H #define QCONTACTTIMESTAMP_H -#include <QString> +#include <QtCore/qdatetime.h> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -73,4 +71,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTTIMESTAMP_H diff --git a/src/contacts/details/qcontacttype.h b/src/contacts/details/qcontacttype.h index 6fee905aa..01bf3ef3b 100644 --- a/src/contacts/details/qcontacttype.h +++ b/src/contacts/details/qcontacttype.h @@ -42,10 +42,7 @@ #ifndef QCONTACTTYPE_H #define QCONTACTTYPE_H -#include <QString> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,5 +72,4 @@ QT_END_NAMESPACE_CONTACTS Q_DECLARE_METATYPE(QTCONTACTS_PREPEND_NAMESPACE(QContactType::TypeValues)) -#endif - +#endif // QCONTACTTYPE_H diff --git a/src/contacts/details/qcontacturl.h b/src/contacts/details/qcontacturl.h index c19c92373..be39a8764 100644 --- a/src/contacts/details/qcontacturl.h +++ b/src/contacts/details/qcontacturl.h @@ -42,12 +42,9 @@ #ifndef QCONTACTURL_H #define QCONTACTURL_H -#include <QString> -#include <QUrl> +#include <QtCore/qurl.h> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -81,5 +78,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTURL_H diff --git a/src/contacts/details/qcontactversion.h b/src/contacts/details/qcontactversion.h index 4b98240f8..edea36761 100644 --- a/src/contacts/details/qcontactversion.h +++ b/src/contacts/details/qcontactversion.h @@ -42,9 +42,7 @@ #ifndef QCONTACTVERSION_H #define QCONTACTVERSION_H -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -79,4 +77,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTVERSION_H diff --git a/src/contacts/doc/snippets/multiaction/multiaction.cpp b/src/contacts/doc/snippets/multiaction/multiaction.cpp index 9a63deffd..8b8040b20 100644 --- a/src/contacts/doc/snippets/multiaction/multiaction.cpp +++ b/src/contacts/doc/snippets/multiaction/multiaction.cpp @@ -47,9 +47,9 @@ #include "multiaction_p.h" -#include "qcontactphonenumber.h" -#include "qcontactemailaddress.h" -#include "qcontactfilters.h" +#include <QtContacts/qcontactphonenumber.h> +#include <QtContacts/qcontactemailaddress.h> +#include <QtContacts/qcontactfilters.h> #include <QMessageBox> #include <QTimer> diff --git a/src/contacts/doc/snippets/multiaction/multiaction_p.h b/src/contacts/doc/snippets/multiaction/multiaction_p.h index c7686432b..936495a75 100644 --- a/src/contacts/doc/snippets/multiaction/multiaction_p.h +++ b/src/contacts/doc/snippets/multiaction/multiaction_p.h @@ -52,8 +52,8 @@ // We mean it. // -#include "qcontactaction.h" -#include "qcontactactionfactory.h" +#include <QtContacts/qcontactaction.h> +#include <QtContacts/qcontactactionfactory.h> #include "qserviceinterfacedescriptor.h" #include "qserviceplugininterface.h" diff --git a/src/contacts/doc/snippets/qcontactphonenumber.h b/src/contacts/doc/snippets/qcontactphonenumber.h index 1d63de839..795fff116 100644 --- a/src/contacts/doc/snippets/qcontactphonenumber.h +++ b/src/contacts/doc/snippets/qcontactphonenumber.h @@ -44,9 +44,9 @@ #include <QString> -#include <qcontactsglobal.h> -#include "qcontactdetail.h" -#include "qcontactfilter.h" +#include <QtContacts/qcontactsglobal.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp index 9d164fdc5..cbb20e810 100644 --- a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#include <qcontactsglobal.h> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> #include "requestexample.h" #include <QDebug> diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp index 755634aae..c1bb8249f 100644 --- a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp +++ b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp @@ -41,8 +41,7 @@ #include "requestexample.h" -#include <qcontactsglobal.h> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> #include <QDebug> #include <QCoreApplication> diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h b/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h index 41e862fde..3be355ccb 100644 --- a/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h +++ b/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h @@ -55,8 +55,8 @@ // #include <QObject> -#include "qcontactsglobal.h" -#include "qcontactrequests.h" + +#include <QtContacts/qcontactrequests.h> //! [Class setup] QTCONTACTS_USE_NAMESPACE diff --git a/src/contacts/engines/qcontactinvalidbackend.cpp b/src/contacts/engines/qcontactinvalidbackend.cpp index 41d6a4b97..3a9ff9bc0 100644 --- a/src/contacts/engines/qcontactinvalidbackend.cpp +++ b/src/contacts/engines/qcontactinvalidbackend.cpp @@ -41,8 +41,6 @@ #include "qcontactinvalidbackend_p.h" -#include <QSharedData> - /*! \class QContactInvalidEngine diff --git a/src/contacts/engines/qcontactinvalidbackend_p.h b/src/contacts/engines/qcontactinvalidbackend_p.h index 9a38619c8..a3a85e52d 100644 --- a/src/contacts/engines/qcontactinvalidbackend_p.h +++ b/src/contacts/engines/qcontactinvalidbackend_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTINVALIDBACKEND_P_H #define QCONTACTINVALIDBACKEND_P_H @@ -54,11 +53,7 @@ // We mean it. // -#include "qcontactmanager.h" -#include "qcontactmanager_p.h" - -#include <QMap> -#include <QString> +#include <QtContacts/qcontactmanagerengine.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -74,5 +69,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTINVALIDBACKEND_P_H diff --git a/src/contacts/filters/qcontactactionfilter.cpp b/src/contacts/filters/qcontactactionfilter.cpp index 8acc8de04..6aaa6070e 100644 --- a/src/contacts/filters/qcontactactionfilter.cpp +++ b/src/contacts/filters/qcontactactionfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactactionfilter.h" #include "qcontactactionfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactactionfilter.h b/src/contacts/filters/qcontactactionfilter.h index 36a7be0c8..030b84deb 100644 --- a/src/contacts/filters/qcontactactionfilter.h +++ b/src/contacts/filters/qcontactactionfilter.h @@ -42,7 +42,7 @@ #ifndef QCONTACTACTIONFILTER_H #define QCONTACTACTIONFILTER_H -#include "qcontactfilter.h" +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -64,4 +64,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTIONFILTER_H diff --git a/src/contacts/filters/qcontactactionfilter_p.h b/src/contacts/filters/qcontactactionfilter_p.h index 37c0051b9..74648ae95 100644 --- a/src/contacts/filters/qcontactactionfilter_p.h +++ b/src/contacts/filters/qcontactactionfilter_p.h @@ -53,11 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" - -#include <QString> -#include <QVariant> +#include <QtContacts/qcontactactionfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -116,4 +113,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTIONFILTER_P_H diff --git a/src/contacts/filters/qcontactchangelogfilter.cpp b/src/contacts/filters/qcontactchangelogfilter.cpp index 1604b3eec..381363ac7 100644 --- a/src/contacts/filters/qcontactchangelogfilter.cpp +++ b/src/contacts/filters/qcontactchangelogfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactchangelogfilter.h" #include "qcontactchangelogfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactchangelogfilter.h b/src/contacts/filters/qcontactchangelogfilter.h index b609d5fd3..16c26a4e7 100644 --- a/src/contacts/filters/qcontactchangelogfilter.h +++ b/src/contacts/filters/qcontactchangelogfilter.h @@ -42,9 +42,9 @@ #ifndef QCONTACTCHANGELOGFILTER_H #define QCONTACTCHANGELOGFILTER_H -#include "qcontactfilter.h" +#include <QtCore/qdatetime.h> -#include <QDateTime> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -73,4 +73,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTCHANGELOGFILTER_H diff --git a/src/contacts/filters/qcontactchangelogfilter_p.h b/src/contacts/filters/qcontactchangelogfilter_p.h index e3dac7565..76958b2c4 100644 --- a/src/contacts/filters/qcontactchangelogfilter_p.h +++ b/src/contacts/filters/qcontactchangelogfilter_p.h @@ -53,10 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" - -#include <QDateTime> +#include <QtContacts/qcontactchangelogfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -124,4 +122,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTCHANGELOGFILTER_P_H diff --git a/src/contacts/filters/qcontactdetailfilter.cpp b/src/contacts/filters/qcontactdetailfilter.cpp index a058b2dd9..bdd7a3260 100644 --- a/src/contacts/filters/qcontactdetailfilter.cpp +++ b/src/contacts/filters/qcontactdetailfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactdetailfilter.h" #include "qcontactdetailfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactdetailfilter.h b/src/contacts/filters/qcontactdetailfilter.h index 2f0d76113..6b2c3b409 100644 --- a/src/contacts/filters/qcontactdetailfilter.h +++ b/src/contacts/filters/qcontactdetailfilter.h @@ -42,8 +42,10 @@ #ifndef QCONTACTDETAILFILTER_H #define QCONTACTDETAILFILTER_H -#include "qcontactfilter.h" -#include "qcontactdetail.h" +#include <QtCore/qvariant.h> + +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -74,4 +76,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAILFILTER_H diff --git a/src/contacts/filters/qcontactdetailfilter_p.h b/src/contacts/filters/qcontactdetailfilter_p.h index be231e311..dd11bbc15 100644 --- a/src/contacts/filters/qcontactdetailfilter_p.h +++ b/src/contacts/filters/qcontactdetailfilter_p.h @@ -53,12 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" -#include "qcontactdetail.h" - -#include <QString> -#include <QVariant> +#include <QtContacts/qcontactdetailfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -137,4 +133,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAILFILTER_P_H diff --git a/src/contacts/filters/qcontactdetailrangefilter.cpp b/src/contacts/filters/qcontactdetailrangefilter.cpp index db908102f..7f935463f 100644 --- a/src/contacts/filters/qcontactdetailrangefilter.cpp +++ b/src/contacts/filters/qcontactdetailrangefilter.cpp @@ -41,8 +41,6 @@ #include "qcontactdetailrangefilter.h" #include "qcontactdetailrangefilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactdetailrangefilter.h b/src/contacts/filters/qcontactdetailrangefilter.h index 7e90b117b..dfb4903a6 100644 --- a/src/contacts/filters/qcontactdetailrangefilter.h +++ b/src/contacts/filters/qcontactdetailrangefilter.h @@ -42,8 +42,10 @@ #ifndef QCONTACTDETAILRANGEFILTER_H #define QCONTACTDETAILRANGEFILTER_H -#include "qcontactfilter.h" -#include "qcontactdetail.h" +#include <QtCore/qvariant.h> + +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -85,4 +87,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QContactDetailRangeFilter::RangeFlags) QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAILRANGEFILTER_H diff --git a/src/contacts/filters/qcontactdetailrangefilter_p.h b/src/contacts/filters/qcontactdetailrangefilter_p.h index ac6f43b7e..e80e6801a 100644 --- a/src/contacts/filters/qcontactdetailrangefilter_p.h +++ b/src/contacts/filters/qcontactdetailrangefilter_p.h @@ -53,13 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" - -#include "qcontactdetailrangefilter.h" - -#include <QString> -#include <QVariant> +#include <QtContacts/qcontactdetailrangefilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -155,4 +150,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAILRANGEFILTER_P_H diff --git a/src/contacts/filters/qcontactfilters.h b/src/contacts/filters/qcontactfilters.h index f532660a4..ccae29276 100644 --- a/src/contacts/filters/qcontactfilters.h +++ b/src/contacts/filters/qcontactfilters.h @@ -45,17 +45,17 @@ // this file includes all of the leaf filter classes // provided by the Qt Contacts API. -#include "qcontactactionfilter.h" -#include "qcontactchangelogfilter.h" -#include "qcontactdetailfilter.h" -#include "qcontactdetailrangefilter.h" -#include "qcontactidfilter.h" -#include "qcontactintersectionfilter.h" -#include "qcontactinvalidfilter.h" -#include "qcontactrelationshipfilter.h" -#include "qcontactunionfilter.h" +#include <QtContacts/qcontactactionfilter.h> +#include <QtContacts/qcontactchangelogfilter.h> +#include <QtContacts/qcontactdetailfilter.h> +#include <QtContacts/qcontactdetailrangefilter.h> +#include <QtContacts/qcontactidfilter.h> +#include <QtContacts/qcontactintersectionfilter.h> +#include <QtContacts/qcontactinvalidfilter.h> +#include <QtContacts/qcontactrelationshipfilter.h> +#include <QtContacts/qcontactunionfilter.h> QT_BEGIN_NAMESPACE_CONTACTS QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTFILTERS_H diff --git a/src/contacts/filters/qcontactidfilter.cpp b/src/contacts/filters/qcontactidfilter.cpp index 05a2d8463..182a9c613 100644 --- a/src/contacts/filters/qcontactidfilter.cpp +++ b/src/contacts/filters/qcontactidfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactidfilter.h" #include "qcontactidfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactidfilter.h b/src/contacts/filters/qcontactidfilter.h index 5855898b9..604cf24df 100644 --- a/src/contacts/filters/qcontactidfilter.h +++ b/src/contacts/filters/qcontactidfilter.h @@ -42,8 +42,10 @@ #ifndef QCONTACTIDFILTER_H #define QCONTACTIDFILTER_H -#include "qcontactfilter.h" -#include "qcontactid.h" +#include <QtCore/qlist.h> + +#include <QtContacts/qcontactfilter.h> +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -69,4 +71,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTIDFILTER_H diff --git a/src/contacts/filters/qcontactidfilter_p.h b/src/contacts/filters/qcontactidfilter_p.h index 34868fcf4..feca9b5c5 100644 --- a/src/contacts/filters/qcontactidfilter_p.h +++ b/src/contacts/filters/qcontactidfilter_p.h @@ -53,12 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" -#include "qcontactid.h" - -#include <QString> -#include <QVariant> +#include <QtContacts/qcontactidfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -117,4 +113,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTIDLISTFILTER_P_H diff --git a/src/contacts/filters/qcontactintersectionfilter.cpp b/src/contacts/filters/qcontactintersectionfilter.cpp index cecbd74eb..709b7d468 100644 --- a/src/contacts/filters/qcontactintersectionfilter.cpp +++ b/src/contacts/filters/qcontactintersectionfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactintersectionfilter.h" #include "qcontactintersectionfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactintersectionfilter.h b/src/contacts/filters/qcontactintersectionfilter.h index 18287d8ed..63f6d996b 100644 --- a/src/contacts/filters/qcontactintersectionfilter.h +++ b/src/contacts/filters/qcontactintersectionfilter.h @@ -42,7 +42,9 @@ #ifndef QCONTACTINTERSECTIONFILTER_H #define QCONTACTINTERSECTIONFILTER_H -#include "qcontactfilter.h" +#include <QtCore/qlist.h> + +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -72,4 +74,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTINTERSECTIONFILTER_H diff --git a/src/contacts/filters/qcontactintersectionfilter_p.h b/src/contacts/filters/qcontactintersectionfilter_p.h index 9eb33269e..f5a595aec 100644 --- a/src/contacts/filters/qcontactintersectionfilter_p.h +++ b/src/contacts/filters/qcontactintersectionfilter_p.h @@ -53,10 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" - -#include <QList> +#include <QtContacts/qcontactintersectionfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -117,4 +115,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTINTERSECTIONFILTER_P_H diff --git a/src/contacts/filters/qcontactinvalidfilter.cpp b/src/contacts/filters/qcontactinvalidfilter.cpp index fa079af2c..543128a38 100644 --- a/src/contacts/filters/qcontactinvalidfilter.cpp +++ b/src/contacts/filters/qcontactinvalidfilter.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactinvalidfilter.h" + #include "qcontactfilter_p.h" /*! diff --git a/src/contacts/filters/qcontactinvalidfilter.h b/src/contacts/filters/qcontactinvalidfilter.h index 05207d003..075b35321 100644 --- a/src/contacts/filters/qcontactinvalidfilter.h +++ b/src/contacts/filters/qcontactinvalidfilter.h @@ -42,7 +42,7 @@ #ifndef QCONTACTINVALIDFILTER_H #define QCONTACTINVALIDFILTER_H -#include "qcontactfilter.h" +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -56,4 +56,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTINVALIDFILTER_H diff --git a/src/contacts/filters/qcontactrelationshipfilter.cpp b/src/contacts/filters/qcontactrelationshipfilter.cpp index 184538936..c658d237a 100644 --- a/src/contacts/filters/qcontactrelationshipfilter.cpp +++ b/src/contacts/filters/qcontactrelationshipfilter.cpp @@ -41,7 +41,6 @@ #include "qcontactrelationshipfilter.h" #include "qcontactrelationshipfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactrelationshipfilter.h b/src/contacts/filters/qcontactrelationshipfilter.h index 182ec7263..211939e4b 100644 --- a/src/contacts/filters/qcontactrelationshipfilter.h +++ b/src/contacts/filters/qcontactrelationshipfilter.h @@ -42,15 +42,9 @@ #ifndef QCONTACTRELATIONSHIPFILTER_H #define QCONTACTRELATIONSHIPFILTER_H -#include <qcontactsglobal.h> -#include <qcontactfilter.h> -#include <qcontact.h> -#include <qcontactrelationship.h> - -#include <QSharedDataPointer> -#include <QStringList> -#include <QList> -#include <QString> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactfilter.h> +#include <QtContacts/qcontactrelationship.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,4 +69,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIPFILTER_H diff --git a/src/contacts/filters/qcontactrelationshipfilter_p.h b/src/contacts/filters/qcontactrelationshipfilter_p.h index c0c3ad2d2..cae1520d8 100644 --- a/src/contacts/filters/qcontactrelationshipfilter_p.h +++ b/src/contacts/filters/qcontactrelationshipfilter_p.h @@ -53,16 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" -#include "qcontactid.h" -#include "qcontactrelationship.h" - -#include "qcontactrelationshipfilter.h" - -#include <QString> -#include <QStringList> -#include <QList> +#include <QtContacts/qcontactrelationshipfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -134,4 +126,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIPFILTER_P_H diff --git a/src/contacts/filters/qcontactunionfilter.cpp b/src/contacts/filters/qcontactunionfilter.cpp index b941b0630..45bbb0d01 100644 --- a/src/contacts/filters/qcontactunionfilter.cpp +++ b/src/contacts/filters/qcontactunionfilter.cpp @@ -41,8 +41,6 @@ #include "qcontactunionfilter.h" #include "qcontactunionfilter_p.h" -#include "qcontactfilter_p.h" -#include "qcontactmanager.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/filters/qcontactunionfilter.h b/src/contacts/filters/qcontactunionfilter.h index 6c59633f2..d4001e94b 100644 --- a/src/contacts/filters/qcontactunionfilter.h +++ b/src/contacts/filters/qcontactunionfilter.h @@ -42,7 +42,9 @@ #ifndef QCONTACTUNIONFILTER_H #define QCONTACTUNIONFILTER_H -#include "qcontactfilter.h" +#include <QtCore/qlist.h> + +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -72,4 +74,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTUNIONFILTER_H diff --git a/src/contacts/filters/qcontactunionfilter_p.h b/src/contacts/filters/qcontactunionfilter_p.h index 8ba647ccc..bab1b67cd 100644 --- a/src/contacts/filters/qcontactunionfilter_p.h +++ b/src/contacts/filters/qcontactunionfilter_p.h @@ -53,10 +53,8 @@ // We mean it. // -#include "qcontactfilter_p.h" -#include "qcontactfilter.h" - -#include <QList> +#include <QtContacts/qcontactunionfilter.h> +#include <QtContacts/private/qcontactfilter_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -117,4 +115,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTUNIONFILTER_P_H diff --git a/src/contacts/qcontact.cpp b/src/contacts/qcontact.cpp index 9e278e9fd..e4c8fb131 100644 --- a/src/contacts/qcontact.cpp +++ b/src/contacts/qcontact.cpp @@ -39,13 +39,20 @@ ** ****************************************************************************/ -#include <QSet> -#include <QDebug> -#include <QDataStream> - #include "qcontact.h" #include "qcontact_p.h" + +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qset.h> + +#include "qcontactactiondescriptor.h" #include "qcontactdetail_p.h" +#include "qcontactdetails.h" #include "qcontactmanager_p.h" #include "qcontactactionmanager_p.h" #include "qcontactaction.h" diff --git a/src/contacts/qcontact.h b/src/contacts/qcontact.h index ad1f370ae..207a52d75 100644 --- a/src/contacts/qcontact.h +++ b/src/contacts/qcontact.h @@ -42,42 +42,22 @@ #ifndef QCONTACT_H #define QCONTACT_H -#include <QVariant> -#include <QString> -#include <QPair> -#include <QMultiMap> -#include <QList> -#include <QDateTime> -#include <QSharedDataPointer> - -#include <qcontactsglobal.h> -#include <qcontactdetail.h> -#include <qcontactid.h> -#include <qcontactrelationship.h> - -#include <qcontactdisplaylabel.h> -#include <qcontactrelationshipfilter.h> -#include <qcontacttype.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactrelationship.h> +#include <QtContacts/qcontacttype.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactManager; -class QContactData; -class QContactName; -class QContactAction; class QContactActionDescriptor; +class QContactId; +class QContactManager; -// MSVC needs the function declared before the friend declaration -class QContact; -#ifndef QT_NO_DATASTREAM -Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContact& contact); -Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContact& contact); -#endif - +class QContactData; class Q_CONTACTS_EXPORT QContact { public: @@ -159,6 +139,10 @@ Q_CONTACTS_EXPORT uint qHash(const QContact& key); #ifndef QT_NO_DEBUG_STREAM Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContact& contact); #endif +#ifndef QT_NO_DATASTREAM +Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContact& contact); +Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContact& contact); +#endif QT_END_NAMESPACE_CONTACTS @@ -166,4 +150,4 @@ QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContact), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif +#endif // QCONTACT_H diff --git a/src/contacts/qcontact_p.h b/src/contacts/qcontact_p.h index d26668229..eba3dfe93 100644 --- a/src/contacts/qcontact_p.h +++ b/src/contacts/qcontact_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACT_P_H #define QCONTACT_P_H @@ -54,13 +53,14 @@ // We mean it. // -#include <QSharedData> -#include <QList> -#include <QDateTime> -#include <QMultiHash> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> -#include <qcontacts.h> -#include <qcontactdetail.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactrelationship.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -98,5 +98,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACT_P_H diff --git a/src/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp index d06f899c8..db58d77bc 100644 --- a/src/contacts/qcontactabstractrequest.cpp +++ b/src/contacts/qcontactabstractrequest.cpp @@ -41,17 +41,14 @@ #include "qcontactabstractrequest.h" #include "qcontactabstractrequest_p.h" -#include "qcontactmanager.h" -#include "qcontactmanager_p.h" -#include "qcontactmanagerengine.h" - -#include <QMutex> -#include <QMutexLocker> #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif +#include "qcontactmanager_p.h" +#include "qcontactmanagerengine.h" + QT_BEGIN_NAMESPACE_CONTACTS /*! \class QContactAbstractRequest diff --git a/src/contacts/qcontactabstractrequest.h b/src/contacts/qcontactabstractrequest.h index c70081185..52d87a5f4 100644 --- a/src/contacts/qcontactabstractrequest.h +++ b/src/contacts/qcontactabstractrequest.h @@ -42,12 +42,14 @@ #ifndef QCONTACTABSTRACTREQUEST_H #define QCONTACTABSTRACTREQUEST_H -#include <qcontactmanager.h> -#include <QObject> +#include <QtCore/qobject.h> + +#include <QtContacts/qcontactmanager.h> QT_BEGIN_NAMESPACE_CONTACTS class QContactManagerEngine; + class QContactAbstractRequestPrivate; class Q_CONTACTS_EXPORT QContactAbstractRequest : public QObject { @@ -126,6 +128,10 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QContactAbstractRequest::StorageLocations) +#ifndef QT_NO_DEBUG_STREAM +Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactAbstractRequest& request); +#endif + QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTABSTRACTREQUEST_H diff --git a/src/contacts/qcontactabstractrequest_p.h b/src/contacts/qcontactabstractrequest_p.h index fe76873db..7344149e8 100644 --- a/src/contacts/qcontactabstractrequest_p.h +++ b/src/contacts/qcontactabstractrequest_p.h @@ -53,17 +53,12 @@ // We mean it. // -#include <qcontactmanager.h> -#include "qcontactmanager_p.h" -#include <qcontactabstractrequest.h> +#include <QtCore/qmutex.h> +#include <QtCore/qpointer.h> -#include <QList> -#include <QPointer> -#include <QMutex> - -#ifndef QT_NO_DEBUG_STREAM -#include <QDebug> -#endif +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/private/qcontactmanager_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -114,4 +109,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTABSTRACTREQUEST_P_H diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp index fa9f2b8e9..9b00f6885 100644 --- a/src/contacts/qcontactaction.cpp +++ b/src/contacts/qcontactaction.cpp @@ -40,13 +40,12 @@ ****************************************************************************/ #include "qcontactaction.h" -#include "qcontactmanager_p.h" -#include "qcontactactiondescriptor.h" -#include "qcontactactionmanager_p.h" +#include <QtCore/qset.h> -#include <QSet> -#include <QString> +#include "qcontactactiondescriptor.h" +#include "qcontactactionmanager_p.h" +#include "qcontactmanager_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactaction.h b/src/contacts/qcontactaction.h index e3aaf61b7..b27746e31 100644 --- a/src/contacts/qcontactaction.h +++ b/src/contacts/qcontactaction.h @@ -39,22 +39,22 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTION_H #define QCONTACTACTION_H -#include <qcontactsglobal.h> - -#include <qcontactfilter.h> -#include <qcontactdetail.h> -#include <qcontact.h> -#include <qcontactactiontarget.h> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <QObject> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactactiontarget.h> +#include <QtContacts/qcontactactiondescriptor.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactActionDescriptor; class QContactActionData; class Q_CONTACTS_EXPORT QContactAction : public QObject { @@ -117,4 +117,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTION_H diff --git a/src/contacts/qcontactactiondescriptor.cpp b/src/contacts/qcontactactiondescriptor.cpp index de03e1cc9..52f92ab09 100644 --- a/src/contacts/qcontactactiondescriptor.cpp +++ b/src/contacts/qcontactactiondescriptor.cpp @@ -41,12 +41,15 @@ #include "qcontactactiondescriptor.h" #include "qcontactactiondescriptor_p.h" -#include "qcontactactionfactory.h" + +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + #include "qcontact.h" +#include "qcontactactionfactory.h" #include "qcontactinvalidfilter.h" -#include <QHash> - /* When these conditions are satisfied, QStringLiteral is implemented by gcc's statement-expression extension. However, in this file it will diff --git a/src/contacts/qcontactactiondescriptor.h b/src/contacts/qcontactactiondescriptor.h index b2ffc0856..24abb41f0 100644 --- a/src/contacts/qcontactactiondescriptor.h +++ b/src/contacts/qcontactactiondescriptor.h @@ -39,34 +39,25 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTIONDESCRIPTOR_H #define QCONTACTACTIONDESCRIPTOR_H -#include <qcontactsglobal.h> -#include <qcontactfilter.h> -#include <qcontactdetail.h> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <QSet> -#include <QVariant> -#include <QMap> -#include <QString> -#include <QSharedDataPointer> +#include <QtContacts/qcontactactiontarget.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfilter.h> QT_BEGIN_NAMESPACE_CONTACTS class QContact; class QContactActionFactory; -class QContactActionTarget; -class QContactActionDescriptorPrivate; - -// MSVC needs the declaration before the friend statement -class QContactActionDescriptor; -Q_CONTACTS_EXPORT uint qHash(const QContactActionDescriptor& key); -#ifndef QT_NO_DEBUG_STREAM -Q_CONTACTS_EXPORT QDebug& operator<<(QDebug dbg, const QContactActionDescriptor& descriptor); -#endif +class QContactActionDescriptorPrivate; class Q_CONTACTS_EXPORT QContactActionDescriptor { public: @@ -112,10 +103,15 @@ private: Q_CONTACTS_EXPORT friend uint qHash(const QContactActionDescriptor& key); }; +Q_CONTACTS_EXPORT uint qHash(const QContactActionDescriptor& key); +#ifndef QT_NO_DEBUG_STREAM +Q_CONTACTS_EXPORT QDebug& operator<<(QDebug dbg, const QContactActionDescriptor& descriptor); +#endif + QT_END_NAMESPACE_CONTACTS QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactActionDescriptor), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif +#endif // QCONTACTACTIONDESCRIPTOR_H diff --git a/src/contacts/qcontactactiondescriptor_p.h b/src/contacts/qcontactactiondescriptor_p.h index 51404a038..4a62d2025 100644 --- a/src/contacts/qcontactactiondescriptor_p.h +++ b/src/contacts/qcontactactiondescriptor_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include <QSharedData> -#include <QString> -#include <QVariantMap> +#include <QtCore/qshareddata.h> + +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -94,4 +94,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTIONDESCRIPTOR_P_H diff --git a/src/contacts/qcontactactionfactory.cpp b/src/contacts/qcontactactionfactory.cpp index 8ce9f0466..104dc6162 100644 --- a/src/contacts/qcontactactionfactory.cpp +++ b/src/contacts/qcontactactionfactory.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include "qcontactactionfactory.h" + +#include "qcontact.h" #include "qcontactactiondescriptor_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactactionfactory.h b/src/contacts/qcontactactionfactory.h index 691671821..8319b177a 100644 --- a/src/contacts/qcontactactionfactory.h +++ b/src/contacts/qcontactactionfactory.h @@ -39,25 +39,24 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTIONFACTORY_H #define QCONTACTACTIONFACTORY_H -#include <qcontactsglobal.h> -#include <qcontactactiondescriptor.h> -#include <qcontactactiontarget.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qset.h> +#include <QtCore/qvariant.h> -#include <QObject> -#include <QtPlugin> -#include <QString> -#include <QList> -#include <QVariantMap> -#include <QStringList> -#include <QHash> +#include <QtContacts/qcontactactiontarget.h> +#include <QtContacts/qcontactactiondescriptor.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContact; class QContactAction; +class QContactFilter; + class Q_CONTACTS_EXPORT QContactActionFactory : public QObject { Q_OBJECT @@ -83,4 +82,4 @@ protected: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTIONFACTORY_H diff --git a/src/contacts/qcontactactionmanager_p.cpp b/src/contacts/qcontactactionmanager_p.cpp index 6d9e141dc..30210d9f0 100644 --- a/src/contacts/qcontactactionmanager_p.cpp +++ b/src/contacts/qcontactactionmanager_p.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ - #include "qcontactactionmanager_p.h" #include "qcontactaction.h" -#include "qcontactactiondescriptor.h" #include "qcontactactionfactory.h" - #include "qcontactmanager_p.h" -#include <QMutexLocker> -#include <QDebug> - QT_BEGIN_NAMESPACE_CONTACTS Q_GLOBAL_STATIC(QContactActionManager, contactActionManagerInstance) diff --git a/src/contacts/qcontactactionmanager_p.h b/src/contacts/qcontactactionmanager_p.h index d20e039c7..66ef244e0 100644 --- a/src/contacts/qcontactactionmanager_p.h +++ b/src/contacts/qcontactactionmanager_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTIONMANAGER_P_H #define QCONTACTACTIONMANAGER_P_H @@ -54,12 +53,12 @@ // We mean it. // -#include <QMultiHash> -#include <QHash> -#include <QMutex> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmutex.h> -#include <qcontact.h> -#include <qcontactactiondescriptor.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactactiondescriptor.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -99,4 +98,4 @@ QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(QtContacts::QContactActionManagerPlugin, "org.qt-project.Qt.QContactActionManagerPlugin") QT_END_NAMESPACE -#endif +#endif // QCONTACTACTIONMANAGER_P_H diff --git a/src/contacts/qcontactactiontarget.cpp b/src/contacts/qcontactactiontarget.cpp index 1ca24bfd7..5ae7f2379 100644 --- a/src/contacts/qcontactactiontarget.cpp +++ b/src/contacts/qcontactactiontarget.cpp @@ -42,9 +42,12 @@ #include "qcontactactiontarget.h" #include "qcontactactiontarget_p.h" -#include "qcontact.h" - -#include <QHash> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactactiontarget.h b/src/contacts/qcontactactiontarget.h index 1d7c4363a..5a69b1989 100644 --- a/src/contacts/qcontactactiontarget.h +++ b/src/contacts/qcontactactiontarget.h @@ -39,31 +39,18 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTIONTARGET_H #define QCONTACTACTIONTARGET_H -#include <qcontactsglobal.h> -#include "qcontact.h" -#include "qcontactdetail.h" +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -#include <QDebug> -#include <QList> -#include <QString> -#include <QSharedDataPointer> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS -// MSVC needs the function declared before the friend declaration -class QContactActionTarget; -Q_CONTACTS_EXPORT uint qHash(const QContactActionTarget& key); -#ifndef QT_NO_DATASTREAM -Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactActionTarget& target); -Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactActionTarget& target); -#endif -#ifndef QT_NO_DEBUG_STREAM -Q_CONTACTS_EXPORT QDebug& operator<<(QDebug dbg, const QContactActionTarget& target); -#endif +class QContact; class QContactActionTargetPrivate; class Q_CONTACTS_EXPORT QContactActionTarget @@ -103,10 +90,19 @@ private: QSharedDataPointer<QContactActionTargetPrivate> d; }; +Q_CONTACTS_EXPORT uint qHash(const QContactActionTarget& key); +#ifndef QT_NO_DATASTREAM +Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactActionTarget& target); +Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactActionTarget& target); +#endif +#ifndef QT_NO_DEBUG_STREAM +Q_CONTACTS_EXPORT QDebug& operator<<(QDebug dbg, const QContactActionTarget& target); +#endif + QT_END_NAMESPACE_CONTACTS QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactActionTarget), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif +#endif // QCONTACTACTIONTARGET_H diff --git a/src/contacts/qcontactactiontarget_p.h b/src/contacts/qcontactactiontarget_p.h index ce7e97cd8..047d6645c 100644 --- a/src/contacts/qcontactactiontarget_p.h +++ b/src/contacts/qcontactactiontarget_p.h @@ -53,11 +53,11 @@ // We mean it. // -#include <QSharedData> -#include <QString> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -#include "qcontact.h" -#include "qcontactdetail.h" +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -88,4 +88,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTACTIONTARGET_P_H diff --git a/src/contacts/qcontactchangeset.cpp b/src/contacts/qcontactchangeset.cpp index d32a3c833..7d37a93e2 100644 --- a/src/contacts/qcontactchangeset.cpp +++ b/src/contacts/qcontactchangeset.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ - #include "qcontactchangeset.h" #include "qcontactchangeset_p.h" + #include "qcontactmanagerengine.h" QT_BEGIN_NAMESPACE_CONTACTS @@ -360,5 +360,4 @@ void QContactChangeSet::emitSignals(QContactManagerEngine *engine) } } - QT_END_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactchangeset.h b/src/contacts/qcontactchangeset.h index 78b4fd8d4..af19b4a3d 100644 --- a/src/contacts/qcontactchangeset.h +++ b/src/contacts/qcontactchangeset.h @@ -39,20 +39,20 @@ ** ****************************************************************************/ - #ifndef QCONTACTCHANGESET_H #define QCONTACTCHANGESET_H -#include <qcontactsglobal.h> -#include "qcontactid.h" +#include <QtCore/qlist.h> +#include <QtCore/qpair.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> -#include <QSet> -#include <QPair> -#include <QSharedDataPointer> +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS class QContactManagerEngine; + class QContactChangeSetData; class Q_CONTACTS_EXPORT QContactChangeSet { @@ -104,4 +104,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTCHANGESET_H diff --git a/src/contacts/qcontactchangeset_p.h b/src/contacts/qcontactchangeset_p.h index 91d49acfd..cf9ccc0e9 100644 --- a/src/contacts/qcontactchangeset_p.h +++ b/src/contacts/qcontactchangeset_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTCHANGESET_P_H #define QCONTACTCHANGESET_P_H @@ -54,11 +53,11 @@ // We mean it. // -#include <qcontactsglobal.h> -#include <qcontactid.h> -#include <QSharedData> -#include <QSet> -#include <QPair> +#include <QtCore/qpair.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -98,4 +97,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTCHANGESET_P_H diff --git a/src/contacts/qcontactdetail.cpp b/src/contacts/qcontactdetail.cpp index 8604a8cd1..167c7b734 100644 --- a/src/contacts/qcontactdetail.cpp +++ b/src/contacts/qcontactdetail.cpp @@ -41,9 +41,15 @@ #include "qcontactdetail.h" #include "qcontactdetail_p.h" + +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + #include "qcontactmanager.h" -#include <QDebug> -#include <QDataStream> /* When these conditions are satisfied, QStringLiteral is implemented by diff --git a/src/contacts/qcontactdetail.h b/src/contacts/qcontactdetail.h index 013ea9c07..7706afc75 100644 --- a/src/contacts/qcontactdetail.h +++ b/src/contacts/qcontactdetail.h @@ -39,32 +39,22 @@ ** ****************************************************************************/ - #ifndef QCONTACTDETAIL_H #define QCONTACTDETAIL_H -#include <qcontactsglobal.h> +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <QSharedDataPointer> -#include <QStringList> -#include <QVariant> - -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContact; class QContactActionDescriptor; -class QContactDetailPrivate; - -// MSVC needs the function declared before the friend declaration -class QContactDetail; -#ifndef QT_NO_DATASTREAM -Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactDetail& detail); -Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetail& detail); -#endif +class QContactDetailPrivate; class Q_CONTACTS_EXPORT QContactDetail { public: @@ -207,6 +197,10 @@ Q_CONTACTS_EXPORT uint qHash(const QContactDetail& key); #ifndef QT_NO_DEBUG_STREAM Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactDetail& detail); #endif +#ifndef QT_NO_DATASTREAM +Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactDetail& detail); +Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetail& detail); +#endif Q_DECLARE_OPERATORS_FOR_FLAGS(QContactDetail::AccessConstraints) @@ -222,5 +216,4 @@ QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactDetail), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif - +#endif // QCONTACTDETAIL_H diff --git a/src/contacts/qcontactdetail_p.h b/src/contacts/qcontactdetail_p.h index ba4c16ee1..8a416e110 100644 --- a/src/contacts/qcontactdetail_p.h +++ b/src/contacts/qcontactdetail_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTDETAIL_P_H #define QCONTACTDETAIL_P_H @@ -54,12 +53,11 @@ // We mean it. // -#include "qcontactactiondescriptor.h" -#include "qcontactdetail.h" +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> -#include <QSharedData> -#include <QString> -#include <QHash> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -106,4 +104,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTDETAIL_P_H diff --git a/src/contacts/qcontactengineid.cpp b/src/contacts/qcontactengineid.cpp index 2c5d3b55c..489ff45ac 100644 --- a/src/contacts/qcontactengineid.cpp +++ b/src/contacts/qcontactengineid.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "qcontactengineid.h" -#include "qcontactabstractrequest.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactengineid.h b/src/contacts/qcontactengineid.h index 576be3290..f4bc00026 100644 --- a/src/contacts/qcontactengineid.h +++ b/src/contacts/qcontactengineid.h @@ -42,15 +42,10 @@ #ifndef QCONTACTENGINEID_H #define QCONTACTENGINEID_H -#include <QString> -#include <QSharedDataPointer> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> -#include "qcontactsglobal.h" -#include "qcontactabstractrequest.h" - -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE +#include <QtContacts/qcontactabstractrequest.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -78,5 +73,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTENGINEID_H diff --git a/src/contacts/qcontactfetchhint.cpp b/src/contacts/qcontactfetchhint.cpp index 65e2bfe03..f6aa9da96 100644 --- a/src/contacts/qcontactfetchhint.cpp +++ b/src/contacts/qcontactfetchhint.cpp @@ -42,10 +42,11 @@ #include "qcontactfetchhint.h" #include "qcontactfetchhint_p.h" -#include <QStringList> - +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactfetchhint.h b/src/contacts/qcontactfetchhint.h index 1b286f38a..dae9bde25 100644 --- a/src/contacts/qcontactfetchhint.h +++ b/src/contacts/qcontactfetchhint.h @@ -42,13 +42,11 @@ #ifndef QCONTACTFETCHHINT_H #define QCONTACTFETCHHINT_H -#include <QVariant> -#include <QList> -#include <QSharedData> -#include <QSize> -#include "qcontactsglobal.h" -#include "qcontactdetail.h" -#include "qcontact.h" +#include <QtCore/qshareddata.h> +#include <QtCore/qsize.h> +#include <QtCore/qstringlist.h> + +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -101,5 +99,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints) QT_END_NAMESPACE_CONTACTS - -#endif +#endif // QCONTACTFETCHHINT_H diff --git a/src/contacts/qcontactfetchhint_p.h b/src/contacts/qcontactfetchhint_p.h index 5a670b463..8556238b8 100644 --- a/src/contacts/qcontactfetchhint_p.h +++ b/src/contacts/qcontactfetchhint_p.h @@ -53,11 +53,12 @@ // We mean it. // -#include "qcontactfetchhint.h" -#include "qcontactdetail.h" +#include <QtCore/qshareddata.h> +#include <QtCore/qsize.h> +#include <QtCore/qstringlist.h> -#include <QSharedData> -#include <QStringList> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfetchhint.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -93,4 +94,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTFETCHHINT_P_H diff --git a/src/contacts/qcontactfilter.cpp b/src/contacts/qcontactfilter.cpp index facadf7a1..24193b73c 100644 --- a/src/contacts/qcontactfilter.cpp +++ b/src/contacts/qcontactfilter.cpp @@ -41,17 +41,17 @@ #include "qcontactfilter.h" #include "qcontactfilter_p.h" -#include "qcontactfilters.h" - -#include "qcontactintersectionfilter.h" -#include "qcontactunionfilter.h" - -#include "qcontactmanager.h" +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif +#include "qcontactfilters.h" +#include "qcontactmanager.h" + /*! \class QContactFilter \brief The QContactFilter class is used to select contacts made available @@ -308,4 +308,5 @@ const QContactFilter operator|(const QContactFilter& left, const QContactFilter& nif << left << right; return nif; } + QT_END_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactfilter.h b/src/contacts/qcontactfilter.h index 755a90b93..fdcddf77f 100644 --- a/src/contacts/qcontactfilter.h +++ b/src/contacts/qcontactfilter.h @@ -42,12 +42,9 @@ #ifndef QCONTACTFILTER_H #define QCONTACTFILTER_H -#include <QVariant> -#include <QList> -#include <QDateTime> -#include <QSharedData> +#include <QtCore/qshareddata.h> -#include <qcontactsglobal.h> +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -59,14 +56,6 @@ QT_BEGIN_NAMESPACE_CONTACTS friend class Class##Private; class QContactFilterPrivate; - -// MSVC needs the function declared before the friend declaration -class QContactFilter; -#ifndef QT_NO_DATASTREAM -Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactFilter& filter); -Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFilter& filter); -#endif - class Q_CONTACTS_EXPORT QContactFilter { public: @@ -125,10 +114,18 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFilter::MatchFlags) const Q_CONTACTS_EXPORT QContactFilter operator&(const QContactFilter& left, const QContactFilter& right); const Q_CONTACTS_EXPORT QContactFilter operator|(const QContactFilter& left, const QContactFilter& right); +#ifndef QT_NO_DATASTREAM +Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactFilter& filter); +Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFilter& filter); +#endif +#ifndef QT_NO_DEBUG_STREAM +Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactFilter& filter); +#endif + QT_END_NAMESPACE_CONTACTS QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactFilter), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif +#endif // QCONTACTFILTER_H 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 diff --git a/src/contacts/qcontactid.cpp b/src/contacts/qcontactid.cpp index db231bd62..e8a92eac1 100644 --- a/src/contacts/qcontactid.cpp +++ b/src/contacts/qcontactid.cpp @@ -40,11 +40,16 @@ ****************************************************************************/ #include "qcontactid.h" -#include "qcontactmanager_p.h" + +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + #include "qcontactengineid.h" -#include <QHash> -#include <QDebug> -#include <QDataStream> +#include "qcontactmanager_p.h" QT_BEGIN_NAMESPACE template<> QTCONTACTS_PREPEND_NAMESPACE(QContactEngineId) *QSharedDataPointer<QTCONTACTS_PREPEND_NAMESPACE(QContactEngineId)>::clone() diff --git a/src/contacts/qcontactid.h b/src/contacts/qcontactid.h index 19c0d8484..b87b2ab08 100644 --- a/src/contacts/qcontactid.h +++ b/src/contacts/qcontactid.h @@ -42,29 +42,17 @@ #ifndef QCONTACTID_H #define QCONTACTID_H -#include <QString> -#include <QSharedDataPointer> - -#include <qcontactsglobal.h> - -#ifndef QT_NO_DEBUG_STREAM -#include <QtCore/qdebug.h> -#endif +#include <QtCore/qmap.h> #include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> - -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactId; -Q_CONTACTS_EXPORT uint qHash(const QContactId &key); - -class QContactEngineId; class QContactManagerEngine; +class QContactEngineId; class Q_CONTACTS_EXPORT QContactId { public: @@ -98,9 +86,12 @@ private: #endif }; +Q_CONTACTS_EXPORT uint qHash(const QContactId &key); + #ifndef QT_NO_DEBUG_STREAM Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactId &id); #endif + #ifndef QT_NO_DATASTREAM Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream &out, const QContactId &id); Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream &in, QContactId &id); @@ -114,6 +105,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QTCONTACTS_PREPEND_NAMESPACE(QContactId)) - -#endif - +#endif // QCONTACTID_H diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp index 92deb0bdc..5060cc3c4 100644 --- a/src/contacts/qcontactmanager.cpp +++ b/src/contacts/qcontactmanager.cpp @@ -41,15 +41,11 @@ #include "qcontactmanager.h" +#include <QtCore/qmetaobject.h> + #include "qcontact_p.h" #include "qcontactfilter.h" #include "qcontactmanager_p.h" -#include "qcontactfetchhint.h" - -#include <QMetaMethod> -#include <QSharedData> -#include <QPair> -#include <QSet> QT_BEGIN_NAMESPACE_CONTACTS /*! @@ -944,7 +940,6 @@ void QContactManager::disconnectNotify(const QMetaMethod &signal) } } - #include "moc_qcontactmanager.cpp" QT_END_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h index 33255c8f8..39f979d7a 100644 --- a/src/contacts/qcontactmanager.h +++ b/src/contacts/qcontactmanager.h @@ -39,29 +39,24 @@ ** ****************************************************************************/ - #ifndef QCONTACTMANAGER_H #define QCONTACTMANAGER_H -#include <QObject> - -#include <QMap> -#include <QString> -#include <QStringList> -#include <QList> -#include <QDateTime> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> -#include <qcontact.h> -#include <qcontactid.h> -#include <qcontactrelationship.h> -#include <qcontactsortorder.h> -#include <qcontactfetchhint.h> -#include <qcontacttype.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactfetchhint.h> +#include <QtContacts/qcontactrelationship.h> +#include <QtContacts/qcontactsortorder.h> +#include <QtContacts/qcontacttype.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactFilter; class QContactAction; +class QContactFilter; class QContactManagerData; class Q_CONTACTS_EXPORT QContactManager : public QObject @@ -186,4 +181,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTMANAGER_H diff --git a/src/contacts/qcontactmanager_p.cpp b/src/contacts/qcontactmanager_p.cpp index 4af377417..0b62c2b4e 100644 --- a/src/contacts/qcontactmanager_p.cpp +++ b/src/contacts/qcontactmanager_p.cpp @@ -41,29 +41,25 @@ #include "qcontactmanager.h" #include "qcontactmanager_p.h" -#include "qcontactmanagerengine.h" -#include "qcontactmanagerenginefactory.h" -#include "qcontact_p.h" +#if !defined(QT_NO_DEBUG) +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qjsonarray.h> +#include <QtCore/qpluginloader.h> +#include <QtCore/qpointer.h> +#include <QtCore/private/qfactoryloader_p.h> +#include "qcontact_p.h" #include "qcontactaction.h" #include "qcontactactiondescriptor.h" - -#include <QSharedData> -#include <QtPlugin> -#include <QPluginLoader> -#include <QPointer> - -#include <QDebug> -#include <QDir> -#include <QFile> +#include "qcontactmanagerenginefactory.h" #include "qcontactinvalidbackend_p.h" #include "qcontactspluginsearch_p.h" -#include <QtCore/private/qfactoryloader_p.h> -#include <QJsonArray> - QT_BEGIN_NAMESPACE_CONTACTS /* Shared QContactManager stuff here, default engine stuff below */ @@ -153,7 +149,7 @@ void QContactManagerData::createEngine(const QString &managerName, const QMap<QS versions.contains(implementationVersion)) { m_engine = f->engine(parameters, &m_lastError); if (!m_engine) { - qWarning() << "Creation of" << managerName << "engine failed."; + qWarning("Creation of %s engine failed.", qPrintable(managerName)); } else { found = true; break; @@ -233,12 +229,12 @@ void QContactManagerData::loadStaticFactories() if (name != QStringLiteral("invalid") && !name.isEmpty()) { // we also need to ensure that we haven't already loaded this factory. if (m_engines.keys().contains(name)) { - qWarning() << "Static contacts plugin" << name << "has the same name as a currently loaded plugin; ignored"; + qWarning("Static contacts plugin %s has the same name as a currently loaded plugin; ignored", qPrintable(name)); } else { m_engines.insertMulti(name, f); } } else { - qWarning() << "Static contacts plugin with reserved name" << name << "ignored"; + qWarning("Static contacts plugin with reserved name %s ignored", qPrintable(name)); } } } @@ -353,4 +349,3 @@ QContactManagerEngine* QContactManagerData::engine(const QContactManager *manage } QT_END_NAMESPACE_CONTACTS - diff --git a/src/contacts/qcontactmanager_p.h b/src/contacts/qcontactmanager_p.h index 5a1c0d437..2ed5122a8 100644 --- a/src/contacts/qcontactmanager_p.h +++ b/src/contacts/qcontactmanager_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTMANAGER_P_H #define QCONTACTMANAGER_P_H @@ -54,17 +53,17 @@ // We mean it. // -#include <QMap> -#include <QMultiMap> -#include <QList> -#include <QString> +#include <QtCore/qhash.h> +#include <QtCore/qjsonobject.h> +#include <QtCore/qmap.h> +#include <QtCore/qstringlist.h> -#include "qcontactmanager.h" -#include "qcontactmanagerengine.h" -#include "qcontactactionmanager_p.h" -#include "qcontactobserver.h" +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactobserver.h> +#include <QtContacts/private/qcontactactionmanager_p.h> -#include <QJsonObject> QT_BEGIN_NAMESPACE_CONTACTS @@ -151,4 +150,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTMANAGER_P_H diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp index ba1792b78..e6ee354bc 100644 --- a/src/contacts/qcontactmanagerengine.cpp +++ b/src/contacts/qcontactmanagerengine.cpp @@ -41,27 +41,20 @@ #include "qcontactmanagerengine.h" +#include <QtCore/qmutex.h> +#include <QtCore/qpointer.h> +#include <QtCore/qset.h> + +#include "qcontact_p.h" +#include "qcontactdetail_p.h" #include "qcontactdetails.h" -#include "qcontactsortorder.h" #include "qcontactfilters.h" +#include "qcontactabstractrequest_p.h" #include "qcontactaction.h" #include "qcontactactiondescriptor.h" -#include "qcontactabstractrequest.h" -#include "qcontactabstractrequest_p.h" -#include "qcontactrequests.h" -#include "qcontactrequests_p.h" -#include "qcontact.h" -#include "qcontactfetchhint.h" - -#include "qcontact_p.h" -#include "qcontactdetail_p.h" #include "qcontactactionmanager_p.h" - -#include <QMutex> -#include <QMutexLocker> -#include <QPointer> - -#include <QDebug> +#include "qcontactrequests_p.h" +#include "qcontactsortorder.h" QT_BEGIN_NAMESPACE_CONTACTS 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 diff --git a/src/contacts/qcontactmanagerenginefactory.cpp b/src/contacts/qcontactmanagerenginefactory.cpp index b287c94d9..c5ac6d951 100644 --- a/src/contacts/qcontactmanagerenginefactory.cpp +++ b/src/contacts/qcontactmanagerenginefactory.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include "qcontactmanagerenginefactory.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h index cef19a3d3..7f185f565 100644 --- a/src/contacts/qcontactmanagerenginefactory.h +++ b/src/contacts/qcontactmanagerenginefactory.h @@ -39,19 +39,17 @@ ** ****************************************************************************/ - #ifndef QCONTACTMANAGERENGINEFACTORY_H #define QCONTACTMANAGERENGINEFACTORY_H -#include <QtPlugin> -#include <QFactoryInterface> -#include <QMap> -#include <QString> +#include <QtCore/qfactoryinterface.h> +#include <QtCore/qplugin.h> -#include <qcontactmanager.h> +#include <QtContacts/qcontactmanager.h> QT_BEGIN_NAMESPACE_CONTACTS /* Backend plugin API interface, creates engines for us */ +class QContactEngineId; class QContactManagerEngine; struct Q_CONTACTS_EXPORT QContactManagerEngineFactoryInterface : public QFactoryInterface @@ -81,6 +79,7 @@ public: virtual QString managerName() const = 0; virtual QStringList keys() const; }; + QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTMANAGERENGINEFACTORY_H diff --git a/src/contacts/qcontactmanagerenginev2wrapper_p.cpp b/src/contacts/qcontactmanagerenginev2wrapper_p.cpp index 30f91ab30..ad5074ee0 100644 --- a/src/contacts/qcontactmanagerenginev2wrapper_p.cpp +++ b/src/contacts/qcontactmanagerenginev2wrapper_p.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include "qcontact_p.h" #include "qcontactmanagerenginev2wrapper_p.h" + +#include <QtCore/qset.h> + +#include "qcontact_p.h" #include "qcontactidfilter.h" #include "qcontactabstractrequest_p.h" #include "qcontactfetchbyidrequest.h" -#include <QDebug> QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactobserver.cpp b/src/contacts/qcontactobserver.cpp index 22b8f3fc9..a9b4eb226 100644 --- a/src/contacts/qcontactobserver.cpp +++ b/src/contacts/qcontactobserver.cpp @@ -40,10 +40,11 @@ ****************************************************************************/ #include "qcontactobserver.h" -#include "qcontactid.h" -#include "qcontactmanager_p.h" -#include <QPointer> +#include <QtCore/qpointer.h> + +#include "qcontactmanager.h" +#include "qcontactmanager_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactobserver.h b/src/contacts/qcontactobserver.h index 8e9f772d9..1c1eb70ab 100644 --- a/src/contacts/qcontactobserver.h +++ b/src/contacts/qcontactobserver.h @@ -42,13 +42,15 @@ #ifndef QCONTACTOBSERVER_H #define QCONTACTOBSERVER_H -#include <QObject> -#include <qcontactmanager.h> +#include <QtCore/qobject.h> + +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactObserverPrivate; +class QContactManager; +class QContactObserverPrivate; class Q_CONTACTS_EXPORT QContactObserver : public QObject { Q_OBJECT @@ -67,4 +69,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTOBSERVER_H diff --git a/src/contacts/qcontactrelationship.cpp b/src/contacts/qcontactrelationship.cpp index 15e37e337..d5bb5f13b 100644 --- a/src/contacts/qcontactrelationship.cpp +++ b/src/contacts/qcontactrelationship.cpp @@ -39,16 +39,15 @@ ** ****************************************************************************/ -#include <qcontactrelationship.h> +#include "qcontactrelationship.h" #include "qcontactrelationship_p.h" -#include <qcontact.h> - -#include <QList> -#include <QPair> -#include <QString> -#include <QHash> -#include <QDebug> -#include <QDataStream> + +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactrelationship.h b/src/contacts/qcontactrelationship.h index 859fe3478..254464405 100644 --- a/src/contacts/qcontactrelationship.h +++ b/src/contacts/qcontactrelationship.h @@ -39,26 +39,19 @@ ** ****************************************************************************/ - #ifndef QCONTACTRELATIONSHIP_H #define QCONTACTRELATIONSHIP_H -#include <QString> -#include <QList> -#include <QPair> -#include <QSharedDataPointer> - -#include <qcontactsglobal.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactRelationshipPrivate; class QContact; +class QContactRelationshipPrivate; class Q_CONTACTS_EXPORT QContactRelationship { public: @@ -106,5 +99,4 @@ Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactRelationship& QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTRELATIONSHIP_H diff --git a/src/contacts/qcontactrelationship_p.h b/src/contacts/qcontactrelationship_p.h index 8a22ec7c8..029d5a766 100644 --- a/src/contacts/qcontactrelationship_p.h +++ b/src/contacts/qcontactrelationship_p.h @@ -53,13 +53,11 @@ // We mean it. // -#include <QList> -#include <QPair> -#include <QString> -#include <QSharedData> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> -#include <qcontactsglobal.h> -#include <qcontact.h> +#include <QtContacts/qcontact.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -90,4 +88,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIP_P_H diff --git a/src/contacts/qcontacts.h b/src/contacts/qcontacts.h index 1ee7ebdfd..a1b57c2bf 100644 --- a/src/contacts/qcontacts.h +++ b/src/contacts/qcontacts.h @@ -45,28 +45,28 @@ // this file includes all of the public header files // provided by the Qt Contacts API -#include <qcontactsglobal.h> // global exports -#include <qcontactmanager.h> // manager -#include <qcontactmanagerengine.h> // manager backend -#include <qcontactmanagerenginefactory.h> // manage backend instantiator -#include <qcontact.h> // contact -#include <qcontactid.h> // contact identifier -#include <qcontactobserver.h> // contact observer -#include <qcontactdetail.h> // contact detail -#include <qcontactdetails.h> // leaf detail classes -#include <qcontactfetchhint.h> // backend optimization hint class -#include <qcontactfilter.h> // contact filter -#include <qcontactfilters.h> // leaf filter classes -#include <qcontactsortorder.h> // contact sorting -#include <qcontactaction.h> // actions -#include <qcontactactiondescriptor.h> // action descriptors -#include <qcontactactionfactory.h> // action factory -#include <qcontactactiontarget.h> // action target (contact + detail(s)) -#include <qcontactabstractrequest.h> // asynchronous request -#include <qcontactrequests.h> // request leaf classes -#include <qcontactrelationship.h> // contact relationships +#include <QtContacts/qcontactsglobal.h> // global exports +#include <QtContacts/qcontactmanager.h> // manager +#include <QtContacts/qcontactmanagerengine.h> // manager backend +#include <QtContacts/qcontactmanagerenginefactory.h> // manage backend instantiator +#include <QtContacts/qcontact.h> // contact +#include <QtContacts/qcontactid.h> // contact identifier +#include <QtContacts/qcontactobserver.h> // contact observer +#include <QtContacts/qcontactdetail.h> // contact detail +#include <QtContacts/qcontactdetails.h> // leaf detail classes +#include <QtContacts/qcontactfetchhint.h> // backend optimization hint class +#include <QtContacts/qcontactfilter.h> // contact filter +#include <QtContacts/qcontactfilters.h> // leaf filter classes +#include <QtContacts/qcontactsortorder.h> // contact sorting +#include <QtContacts/qcontactaction.h> // actions +#include <QtContacts/qcontactactiondescriptor.h> // action descriptors +#include <QtContacts/qcontactactionfactory.h> // action factory +#include <QtContacts/qcontactactiontarget.h> // action target (contact + detail(s)) +#include <QtContacts/qcontactabstractrequest.h> // asynchronous request +#include <QtContacts/qcontactrequests.h> // request leaf classes +#include <QtContacts/qcontactrelationship.h> // contact relationships QT_BEGIN_NAMESPACE_CONTACTS QT_END_NAMESPACE_CONTACTS -#endif +#endif // QTCONTACTS_H diff --git a/src/contacts/qcontactsglobal.h b/src/contacts/qcontactsglobal.h index bc674f97f..625c85064 100644 --- a/src/contacts/qcontactsglobal.h +++ b/src/contacts/qcontactsglobal.h @@ -69,4 +69,7 @@ #define QTCONTACTS_VERSION_NAME "org.qt-project.Qt.contacts.api.version" #define QTCONTACTS_IMPLEMENTATION_VERSION_NAME "org.qt-project.Qt.contacts.implementation.version" -#endif +QT_BEGIN_NAMESPACE_CONTACTS +QT_END_NAMESPACE_CONTACTS + +#endif // QTCONTACTSGLOBAL_H diff --git a/src/contacts/qcontactsortorder.cpp b/src/contacts/qcontactsortorder.cpp index 0dc9ac347..b1327a1c2 100644 --- a/src/contacts/qcontactsortorder.cpp +++ b/src/contacts/qcontactsortorder.cpp @@ -41,10 +41,12 @@ #include "qcontactsortorder.h" #include "qcontactsortorder_p.h" -#include "qcontactdetail.h" +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/qcontactsortorder.h b/src/contacts/qcontactsortorder.h index abbb7091d..ea4b705bd 100644 --- a/src/contacts/qcontactsortorder.h +++ b/src/contacts/qcontactsortorder.h @@ -42,13 +42,10 @@ #ifndef QCONTACTSORTORDER_H #define QCONTACTSORTORDER_H -#include <qcontactsglobal.h> -#include <qcontactdetail.h> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -#include <QString> -#include <QSharedData> -#include <QList> -#include "qcontact.h" +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -107,4 +104,4 @@ QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactSortOrder), Q_MOVABLE_TYPE); QT_END_NAMESPACE -#endif +#endif // QCONTACTSORTORDER_H diff --git a/src/contacts/qcontactsortorder_p.h b/src/contacts/qcontactsortorder_p.h index f43863e60..2da490298 100644 --- a/src/contacts/qcontactsortorder_p.h +++ b/src/contacts/qcontactsortorder_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qcontactsortorder.h" -#include "qcontactdetail.h" +#include <QtCore/qshareddata.h> -#include <QSharedData> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactsortorder.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -86,4 +86,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTSORTORDER_P_H diff --git a/src/contacts/qcontactspluginsearch_p.h b/src/contacts/qcontactspluginsearch_p.h index 84e814453..eb116b774 100644 --- a/src/contacts/qcontactspluginsearch_p.h +++ b/src/contacts/qcontactspluginsearch_p.h @@ -42,12 +42,25 @@ #ifndef QCONTACTSPLUGINSEARCH_H #define QCONTACTSPLUGINSEARCH_H -#include <qcontactsglobal.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qcoreapplication.h> +#if !defined QT_NO_DEBUG +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qdir.h> +#include <QtCore/qstringlist.h> -#include <QCoreApplication> -#include <QStringList> -#include <QDir> -#include <QDebug> +#include <QtContacts/qcontactsglobal.h> QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactfetchbyidrequest.cpp b/src/contacts/requests/qcontactfetchbyidrequest.cpp index 1f13a330e..4f8f605c0 100644 --- a/src/contacts/requests/qcontactfetchbyidrequest.cpp +++ b/src/contacts/requests/qcontactfetchbyidrequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactfetchbyidrequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactfetchbyidrequest.h b/src/contacts/requests/qcontactfetchbyidrequest.h index 045862fdf..254b6f40a 100644 --- a/src/contacts/requests/qcontactfetchbyidrequest.h +++ b/src/contacts/requests/qcontactfetchbyidrequest.h @@ -42,16 +42,17 @@ #ifndef QCONTACTFETCHBYIDREQUEST_H #define QCONTACTFETCHBYIDREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontact.h> -#include <qcontactfetchhint.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QList> -#include <QStringList> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFetchHint; + class QContactFetchByIdRequestPrivate; class Q_CONTACTS_EXPORT QContactFetchByIdRequest : public QContactAbstractRequest { @@ -79,4 +80,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTFETCHBYIDREQUEST_H diff --git a/src/contacts/requests/qcontactfetchrequest.cpp b/src/contacts/requests/qcontactfetchrequest.cpp index 92ab912e1..14a725223 100644 --- a/src/contacts/requests/qcontactfetchrequest.cpp +++ b/src/contacts/requests/qcontactfetchrequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactfetchrequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactfetchrequest.h b/src/contacts/requests/qcontactfetchrequest.h index 9ba818a39..6fa71cbc4 100644 --- a/src/contacts/requests/qcontactfetchrequest.h +++ b/src/contacts/requests/qcontactfetchrequest.h @@ -42,18 +42,17 @@ #ifndef QCONTACTFETCHREQUEST_H #define QCONTACTFETCHREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontactsortorder.h> -#include <qcontactfilter.h> -#include <qcontact.h> -#include <qcontactfetchhint.h> +#include <QtCore/qlist.h> -#include <QList> -#include <QStringList> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactsortorder.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFetchHint; +class QContactFilter; + class QContactFetchRequestPrivate; class Q_CONTACTS_EXPORT QContactFetchRequest : public QContactAbstractRequest { @@ -86,4 +85,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTFETCHREQUEST_H diff --git a/src/contacts/requests/qcontactidfetchrequest.cpp b/src/contacts/requests/qcontactidfetchrequest.cpp index bc6a67279..2ce01bedd 100644 --- a/src/contacts/requests/qcontactidfetchrequest.cpp +++ b/src/contacts/requests/qcontactidfetchrequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactidfetchrequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactidfetchrequest.h b/src/contacts/requests/qcontactidfetchrequest.h index 1651911cc..4af496150 100644 --- a/src/contacts/requests/qcontactidfetchrequest.h +++ b/src/contacts/requests/qcontactidfetchrequest.h @@ -42,16 +42,16 @@ #ifndef QCONTACTIDFETCHREQUEST_H #define QCONTACTIDFETCHREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontactsortorder.h> -#include <qcontactfilter.h> +#include <QtCore/qlist.h> -#include <QList> -#include <QStringList> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactsortorder.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContactFilter; + class QContactIdFetchRequestPrivate; class Q_CONTACTS_EXPORT QContactIdFetchRequest : public QContactAbstractRequest { @@ -82,4 +82,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTIDFETCHREQUEST_H diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp index d608fde08..c63d1786c 100644 --- a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp +++ b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp @@ -40,8 +40,7 @@ ****************************************************************************/ #include "qcontactrelationshipfetchrequest.h" -#include "qcontactrelationship.h" -#include "qcontactrelationshipfilter.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.h b/src/contacts/requests/qcontactrelationshipfetchrequest.h index 3fe4af9a4..d9fcb2ecd 100644 --- a/src/contacts/requests/qcontactrelationshipfetchrequest.h +++ b/src/contacts/requests/qcontactrelationshipfetchrequest.h @@ -42,17 +42,15 @@ #ifndef QCONTACTRELATIONSHIPFETCHREQUEST_H #define QCONTACTRELATIONSHIPFETCHREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontactrelationship.h> -#include <qcontactrelationshipfilter.h> +#include <QtCore/qlist.h> -#include <QList> -#include <QPair> -#include <QString> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactrelationship.h> QT_BEGIN_NAMESPACE_CONTACTS +class QContact; + class QContactRelationshipFetchRequestPrivate; class Q_CONTACTS_EXPORT QContactRelationshipFetchRequest : public QContactAbstractRequest { @@ -83,4 +81,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIPFETCHREQUEST_H diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp index 92ae63e0d..38b39114d 100644 --- a/src/contacts/requests/qcontactrelationshipremoverequest.cpp +++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactrelationshipremoverequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.h b/src/contacts/requests/qcontactrelationshipremoverequest.h index fe73dceab..41f4aa6fc 100644 --- a/src/contacts/requests/qcontactrelationshipremoverequest.h +++ b/src/contacts/requests/qcontactrelationshipremoverequest.h @@ -42,8 +42,11 @@ #ifndef QCONTACTRELATIONSHIPREMOVEREQUEST_H #define QCONTACTRELATIONSHIPREMOVEREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactrelationship.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -72,4 +75,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIPREMOVEREQUEST_H diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.cpp b/src/contacts/requests/qcontactrelationshipsaverequest.cpp index 67ae04c7e..b13f2429c 100644 --- a/src/contacts/requests/qcontactrelationshipsaverequest.cpp +++ b/src/contacts/requests/qcontactrelationshipsaverequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactrelationshipsaverequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.h b/src/contacts/requests/qcontactrelationshipsaverequest.h index 8f4d23a63..56083864e 100644 --- a/src/contacts/requests/qcontactrelationshipsaverequest.h +++ b/src/contacts/requests/qcontactrelationshipsaverequest.h @@ -42,12 +42,11 @@ #ifndef QCONTACTRELATIONSHIPSAVEREQUEST_H #define QCONTACTRELATIONSHIPSAVEREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontactrelationship.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QList> -#include <QStringList> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactrelationship.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -76,4 +75,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTRELATIONSHIPSAVEREQUEST_H diff --git a/src/contacts/requests/qcontactremoverequest.cpp b/src/contacts/requests/qcontactremoverequest.cpp index 5be728be2..d66779751 100644 --- a/src/contacts/requests/qcontactremoverequest.cpp +++ b/src/contacts/requests/qcontactremoverequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactremoverequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactremoverequest.h b/src/contacts/requests/qcontactremoverequest.h index a9a861a0f..9be33ce7b 100644 --- a/src/contacts/requests/qcontactremoverequest.h +++ b/src/contacts/requests/qcontactremoverequest.h @@ -42,11 +42,11 @@ #ifndef QCONTACTREMOVEREQUEST_H #define QCONTACTREMOVEREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontactfilter.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QList> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactid.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,4 +75,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTREMOVEREQUEST_H diff --git a/src/contacts/requests/qcontactrequests.h b/src/contacts/requests/qcontactrequests.h index 10b02a417..d976eecfd 100644 --- a/src/contacts/requests/qcontactrequests.h +++ b/src/contacts/requests/qcontactrequests.h @@ -45,18 +45,17 @@ // this file includes all of the asynchronous request // leaf classes that are included in the public API -#include "qcontactrelationshipfetchrequest.h" -#include "qcontactrelationshipremoverequest.h" -#include "qcontactrelationshipsaverequest.h" +#include <QtContacts/qcontactrelationshipfetchrequest.h> +#include <QtContacts/qcontactrelationshipremoverequest.h> +#include <QtContacts/qcontactrelationshipsaverequest.h> -#include "qcontactfetchrequest.h" -#include "qcontactfetchbyidrequest.h" -#include "qcontactidfetchrequest.h" -#include "qcontactremoverequest.h" -#include "qcontactsaverequest.h" +#include <QtContacts/qcontactfetchrequest.h> +#include <QtContacts/qcontactfetchbyidrequest.h> +#include <QtContacts/qcontactidfetchrequest.h> +#include <QtContacts/qcontactremoverequest.h> +#include <QtContacts/qcontactsaverequest.h> QT_BEGIN_NAMESPACE_CONTACTS QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTREQUESTS_H diff --git a/src/contacts/requests/qcontactrequests_p.h b/src/contacts/requests/qcontactrequests_p.h index 3b9c40490..def998f8d 100644 --- a/src/contacts/requests/qcontactrequests_p.h +++ b/src/contacts/requests/qcontactrequests_p.h @@ -53,15 +53,19 @@ // We mean it. // -#include <qcontactabstractrequest_p.h> -#include <qcontactfilter.h> -#include <qcontactrelationshipfilter.h> -#include <qcontactsortorder.h> -#include <qcontact.h> -#include <qcontactdetail.h> +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qmap.h> +#include <QtCore/qstringlist.h> -#include <QStringList> -#include <QList> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactfetchhint.h> +#include <QtContacts/qcontactfilter.h> +#include <QtContacts/qcontactrelationshipfilter.h> +#include <QtContacts/qcontactsortorder.h> +#include <QtContacts/private/qcontactabstractrequest_p.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -353,4 +357,4 @@ public: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTREQUESTS_P_H diff --git a/src/contacts/requests/qcontactsaverequest.cpp b/src/contacts/requests/qcontactsaverequest.cpp index ca0625a1b..35f88b436 100644 --- a/src/contacts/requests/qcontactsaverequest.cpp +++ b/src/contacts/requests/qcontactsaverequest.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qcontactsaverequest.h" + #include "qcontactrequests_p.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/contacts/requests/qcontactsaverequest.h b/src/contacts/requests/qcontactsaverequest.h index 2c0e5a7f8..d5994e84d 100644 --- a/src/contacts/requests/qcontactsaverequest.h +++ b/src/contacts/requests/qcontactsaverequest.h @@ -42,12 +42,12 @@ #ifndef QCONTACTSAVEREQUEST_H #define QCONTACTSAVEREQUEST_H -#include <qcontactsglobal.h> -#include <qcontactabstractrequest.h> -#include <qcontact.h> -#include <qcontactdetail.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QList> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactdetail.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -83,4 +83,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTSAVEREQUEST_H diff --git a/src/imports/contacts/details/qdeclarativecontactaddress_p.h b/src/imports/contacts/details/qdeclarativecontactaddress_p.h index a048dca75..29e3d17fc 100644 --- a/src/imports/contacts/details/qdeclarativecontactaddress_p.h +++ b/src/imports/contacts/details/qdeclarativecontactaddress_p.h @@ -39,14 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTADDRESS_H #define QDECLARATIVECONTACTADDRESS_H -#include "qdeclarativecontactdetail_p.h" -#include "qcontactaddress.h" +#include <QtContacts/qcontactaddress.h> -#include <QSet> +#include "qdeclarativecontactdetail_p.h" QTCONTACTS_USE_NAMESPACE @@ -166,6 +164,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactAddress) - -#endif - +#endif // QDECLARATIVECONTACTADDRESS_H diff --git a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h index ce9c5159e..65f994386 100644 --- a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h +++ b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTANNIVERSARY_H #define QDECLARATIVECONTACTANNIVERSARY_H +#include <QtContacts/qcontactanniversary.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactanniversary.h" QTCONTACTS_USE_NAMESPACE @@ -141,6 +142,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactAnniversary) - -#endif - +#endif // QDECLARATIVECONTACTANNIVERSARY_H diff --git a/src/imports/contacts/details/qdeclarativecontactavatar_p.h b/src/imports/contacts/details/qdeclarativecontactavatar_p.h index 6d8775039..21436f68f 100644 --- a/src/imports/contacts/details/qdeclarativecontactavatar_p.h +++ b/src/imports/contacts/details/qdeclarativecontactavatar_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTAVATAR_H #define QDECLARATIVECONTACTAVATAR_H +#include <QtContacts/qcontactavatar.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactavatar.h" QTCONTACTS_USE_NAMESPACE @@ -98,4 +99,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactAvatar) -#endif +#endif // QDECLARATIVECONTACTAVATAR_H diff --git a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h index 4af65bf14..855b16fc3 100644 --- a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h +++ b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTBIRTHDAY_H #define QDECLARATIVECONTACTBIRTHDAY_H +#include <QtContacts/qcontactbirthday.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactbirthday.h" QTCONTACTS_USE_NAMESPACE @@ -87,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactBirthday) -#endif - +#endif // QDECLARATIVECONTACTBIRTHDAY_H diff --git a/src/imports/contacts/details/qdeclarativecontactdetails_p.h b/src/imports/contacts/details/qdeclarativecontactdetails_p.h index 2863f0acb..32df53c5e 100644 --- a/src/imports/contacts/details/qdeclarativecontactdetails_p.h +++ b/src/imports/contacts/details/qdeclarativecontactdetails_p.h @@ -73,4 +73,5 @@ #include "qdeclarativecontacturl_p.h" #include "qdeclarativecontactversion_p.h" #include "qdeclarativecontacthobby_p.h" -#endif + +#endif // QDECLARATIVECONTACTDETAILS_H diff --git a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h index 3e42a749c..151876329 100644 --- a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h +++ b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h @@ -39,13 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTDISPLAYLABEL_H #define QDECLARATIVECONTACTDISPLAYLABEL_H +#include <QtContacts/qcontactdisplaylabel.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactdisplaylabel.h" -#include <QDebug> QTCONTACTS_USE_NAMESPACE @@ -91,4 +90,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactDisplayLabel) -#endif +#endif // QDECLARATIVECONTACTDISPLAYLABEL_H diff --git a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h index 19c03fda0..035b8aaef 100644 --- a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h +++ b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTEMAILADDRESS_H #define QDECLARATIVECONTACTEMAILADDRESS_H +#include <QtContacts/qcontactemailaddress.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactemailaddress.h" QTCONTACTS_USE_NAMESPACE @@ -88,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactEmailAddress) -#endif - +#endif // QDECLARATIVECONTACTEMAILADDRESS_H diff --git a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h index c70558c8f..9456b3c62 100644 --- a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h +++ b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTEXTENDEDDETAIL_P_H #define QDECLARATIVECONTACTEXTENDEDDETAIL_P_H +#include <QtContacts/qcontactextendeddetail.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactextendeddetail.h" QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/details/qdeclarativecontactfamily_p.h b/src/imports/contacts/details/qdeclarativecontactfamily_p.h index 244b8aa28..d391af849 100644 --- a/src/imports/contacts/details/qdeclarativecontactfamily_p.h +++ b/src/imports/contacts/details/qdeclarativecontactfamily_p.h @@ -39,13 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTFAMILY_H #define QDECLARATIVECONTACTFAMILY_H +#include <QtContacts/qcontactfamily.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactfamily.h" -#include <QSet> QTCONTACTS_USE_NAMESPACE @@ -97,5 +96,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactFamily) -#endif - +#endif // QDECLARATIVECONTACTFAMILY_H diff --git a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h index 80d736af6..75b243822 100644 --- a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h +++ b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTFAVORITE_H #define QDECLARATIVECONTACTFAVORITE_H +#include <QtContacts/qcontactfavorite.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactfavorite.h" QTCONTACTS_USE_NAMESPACE @@ -97,4 +97,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactFavorite) -#endif +#endif // QDECLARATIVECONTACTFAVORITE_H diff --git a/src/imports/contacts/details/qdeclarativecontactgender_p.h b/src/imports/contacts/details/qdeclarativecontactgender_p.h index db412742b..6ad6622b8 100644 --- a/src/imports/contacts/details/qdeclarativecontactgender_p.h +++ b/src/imports/contacts/details/qdeclarativecontactgender_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTGENDER_H #define QDECLARATIVECONTACTGENDER_H +#include <QtContacts/qcontactgender.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactgender.h" QTCONTACTS_USE_NAMESPACE @@ -108,5 +109,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactGender) -#endif - +#endif // QDECLARATIVECONTACTGENDER_H diff --git a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h index 47fded30b..1ebde4550 100644 --- a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h +++ b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTGEOLOCATION_H #define QDECLARATIVECONTACTGEOLOCATION_H +#include <QtContacts/qcontactgeolocation.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactgeolocation.h" QTCONTACTS_USE_NAMESPACE @@ -169,5 +169,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactGeoLocation) -#endif - +#endif // QDECLARATIVECONTACTGEOLOCATION_H diff --git a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h index 376841a26..c2c1d0f63 100644 --- a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h +++ b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTGLOBALPRESENCE_H #define QDECLARATIVECONTACTGLOBALPRESENCE_H +#include <QtContacts/qcontactglobalpresence.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactglobalpresence.h" #include "qdeclarativecontactpresence_p.h" QTCONTACTS_USE_NAMESPACE @@ -144,5 +144,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactGlobalPresence) -#endif - +#endif // QDECLARATIVECONTACTGLOBALPRESENCE_H diff --git a/src/imports/contacts/details/qdeclarativecontactguid_p.h b/src/imports/contacts/details/qdeclarativecontactguid_p.h index dc33bde62..e3d179281 100644 --- a/src/imports/contacts/details/qdeclarativecontactguid_p.h +++ b/src/imports/contacts/details/qdeclarativecontactguid_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTGUID_H #define QDECLARATIVECONTACTGUID_H +#include <QtContacts/qcontactguid.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactguid.h" QTCONTACTS_USE_NAMESPACE @@ -88,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactGuid) -#endif - +#endif // QDECLARATIVECONTACTGUID_H diff --git a/src/imports/contacts/details/qdeclarativecontacthobby_p.h b/src/imports/contacts/details/qdeclarativecontacthobby_p.h index 9c70314b1..58536a969 100644 --- a/src/imports/contacts/details/qdeclarativecontacthobby_p.h +++ b/src/imports/contacts/details/qdeclarativecontacthobby_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTHOBBY_H #define QDECLARATIVECONTACTHOBBY_H +#include <QtContacts/qcontacthobby.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontacthobby.h" QTCONTACTS_USE_NAMESPACE @@ -88,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactHobby) -#endif - +#endif // QDECLARATIVECONTACTHOBBY_H diff --git a/src/imports/contacts/details/qdeclarativecontactname_p.h b/src/imports/contacts/details/qdeclarativecontactname_p.h index 2b54cd46a..3313e270a 100644 --- a/src/imports/contacts/details/qdeclarativecontactname_p.h +++ b/src/imports/contacts/details/qdeclarativecontactname_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTNAME_H #define QDECLARATIVECONTACTNAME_H +#include <QtContacts/qcontactname.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactname.h" QTCONTACTS_USE_NAMESPACE @@ -132,4 +132,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactName) -#endif +#endif // QDECLARATIVECONTACTNAME_H diff --git a/src/imports/contacts/details/qdeclarativecontactnickname_p.h b/src/imports/contacts/details/qdeclarativecontactnickname_p.h index 8b1a0249c..e8d9760ea 100644 --- a/src/imports/contacts/details/qdeclarativecontactnickname_p.h +++ b/src/imports/contacts/details/qdeclarativecontactnickname_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTNICKNAME_H #define QDECLARATIVECONTACTNICKNAME_H +#include <QtContacts/qcontactnickname.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactnickname.h" QTCONTACTS_USE_NAMESPACE @@ -87,5 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactNickname) -#endif - +#endif // QDECLARATIVECONTACTNICKNAME_H diff --git a/src/imports/contacts/details/qdeclarativecontactnote_p.h b/src/imports/contacts/details/qdeclarativecontactnote_p.h index 2d6f93b55..998d45dc6 100644 --- a/src/imports/contacts/details/qdeclarativecontactnote_p.h +++ b/src/imports/contacts/details/qdeclarativecontactnote_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTNOTE_H #define QDECLARATIVECONTACTNOTE_H +#include <QtContacts/qcontactnote.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactnote.h" QTCONTACTS_USE_NAMESPACE @@ -88,5 +89,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactNote) -#endif - +#endif // QDECLARATIVECONTACTNOTE_H diff --git a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h index 9221a80aa..c74588b05 100644 --- a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h +++ b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h @@ -39,13 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTONLINEACCOUNT_H #define QDECLARATIVECONTACTONLINEACCOUNT_H +#include <QtContacts/qcontactonlineaccount.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactonlineaccount.h" -#include <QSet> QTCONTACTS_USE_NAMESPACE @@ -166,5 +165,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactOnlineAccount) -#endif - +#endif // QDECLARATIVECONTACTONLINEACCOUNT_H diff --git a/src/imports/contacts/details/qdeclarativecontactorganization_p.h b/src/imports/contacts/details/qdeclarativecontactorganization_p.h index 02efd7004..bf7f27cd3 100644 --- a/src/imports/contacts/details/qdeclarativecontactorganization_p.h +++ b/src/imports/contacts/details/qdeclarativecontactorganization_p.h @@ -42,9 +42,9 @@ #ifndef QDECLARATIVECONTACTORGANIZATION_H #define QDECLARATIVECONTACTORGANIZATION_H +#include <QtContacts/qcontactorganization.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactorganization.h" -#include <QSet> QTCONTACTS_USE_NAMESPACE @@ -151,4 +151,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactOrganization) -#endif +#endif // QDECLARATIVECONTACTORGANIZATION_H diff --git a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h index d17bdcf0e..98630aa13 100644 --- a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h +++ b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h @@ -39,13 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTPHONENUMBER_H #define QDECLARATIVECONTACTPHONENUMBER_H +#include <QtContacts/qcontactphonenumber.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactphonenumber.h" -#include <QSet> QTCONTACTS_USE_NAMESPACE @@ -127,5 +126,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactPhoneNumber) -#endif - +#endif // QDECLARATIVECONTACTPHONENUMBER_H diff --git a/src/imports/contacts/details/qdeclarativecontactpresence_p.h b/src/imports/contacts/details/qdeclarativecontactpresence_p.h index 77dcf9776..dae354c9e 100644 --- a/src/imports/contacts/details/qdeclarativecontactpresence_p.h +++ b/src/imports/contacts/details/qdeclarativecontactpresence_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTPRESENCE_H #define QDECLARATIVECONTACTPRESENCE_H +#include <QtContacts/qcontactpresence.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactpresence.h" QTCONTACTS_USE_NAMESPACE @@ -156,5 +156,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactPresence) -#endif - +#endif // QDECLARATIVECONTACTPRESENCE_H diff --git a/src/imports/contacts/details/qdeclarativecontactringtone_p.h b/src/imports/contacts/details/qdeclarativecontactringtone_p.h index 6f860e62d..79238e846 100644 --- a/src/imports/contacts/details/qdeclarativecontactringtone_p.h +++ b/src/imports/contacts/details/qdeclarativecontactringtone_p.h @@ -42,10 +42,9 @@ #ifndef QDECLARATIVECONTACTRINGTONE_H #define QDECLARATIVECONTACTRINGTONE_H -#include <QUrl> +#include <QtContacts/qcontactringtone.h> #include "qdeclarativecontactdetail_p.h" -#include "qcontactringtone.h" QTCONTACTS_USE_NAMESPACE @@ -113,4 +112,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactRingtone) -#endif +#endif // QDECLARATIVECONTACTRINGTONE_H diff --git a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h index a137f7f39..a5ceb09fa 100644 --- a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h +++ b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ - #ifndef QDECLARATIVECONTACTSYNCTARGET_H #define QDECLARATIVECONTACTSYNCTARGET_H +#include <QtContacts/qcontactsynctarget.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontactsynctarget.h" QTCONTACTS_USE_NAMESPACE @@ -89,5 +89,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactSyncTarget) -#endif - +#endif // QDECLARATIVECONTACTSYNCTARGET_H diff --git a/src/imports/contacts/details/qdeclarativecontacttag_p.h b/src/imports/contacts/details/qdeclarativecontacttag_p.h index 65e5111e6..3c13e6b4c 100644 --- a/src/imports/contacts/details/qdeclarativecontacttag_p.h +++ b/src/imports/contacts/details/qdeclarativecontacttag_p.h @@ -43,8 +43,9 @@ #ifndef QDECLARATIVECONTACTTAG_H #define QDECLARATIVECONTACTTAG_H +#include <QtContacts/qcontacttag.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontacttag.h" QTCONTACTS_USE_NAMESPACE @@ -88,4 +89,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactTag) -#endif +#endif // QDECLARATIVECONTACTTAG_H diff --git a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h index ab1eeedd7..91f15e726 100644 --- a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h +++ b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTTIMESTAMP_H #define QDECLARATIVECONTACTTIMESTAMP_H +#include <QtContacts/qcontacttimestamp.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontacttimestamp.h" QTCONTACTS_USE_NAMESPACE @@ -97,4 +98,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactTimestamp) -#endif +#endif // QDECLARATIVECONTACTTIMESTAMP_H diff --git a/src/imports/contacts/details/qdeclarativecontacttype_p.h b/src/imports/contacts/details/qdeclarativecontacttype_p.h index 5a2058216..e7ec8b527 100644 --- a/src/imports/contacts/details/qdeclarativecontacttype_p.h +++ b/src/imports/contacts/details/qdeclarativecontacttype_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTTYPE_H #define QDECLARATIVECONTACTTYPE_H +#include <QtContacts/qcontacttype.h> + #include "qdeclarativecontactdetail_p.h" -#include "qcontacttype.h" QTCONTACTS_USE_NAMESPACE @@ -106,5 +107,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactType) -#endif - +#endif // QDECLARATIVECONTACTTYPE_H diff --git a/src/imports/contacts/details/qdeclarativecontacturl_p.h b/src/imports/contacts/details/qdeclarativecontacturl_p.h index 2cb8db6b9..ede38b381 100644 --- a/src/imports/contacts/details/qdeclarativecontacturl_p.h +++ b/src/imports/contacts/details/qdeclarativecontacturl_p.h @@ -41,10 +41,10 @@ #ifndef QDECLARATIVECONTACTURL_H #define QDECLARATIVECONTACTURL_H -#include <QUrl> + +#include <QtContacts/qcontacturl.h> #include "qdeclarativecontactdetail_p.h" -#include "qcontacturl.h" QTCONTACTS_USE_NAMESPACE @@ -123,5 +123,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactUrl) -#endif - +#endif // QDECLARATIVECONTACTURL_H diff --git a/src/imports/contacts/details/qdeclarativecontactversion_p.h b/src/imports/contacts/details/qdeclarativecontactversion_p.h index 3a1f5349a..6abde8aa5 100644 --- a/src/imports/contacts/details/qdeclarativecontactversion_p.h +++ b/src/imports/contacts/details/qdeclarativecontactversion_p.h @@ -41,10 +41,10 @@ #ifndef QDECLARATIVECONTACTVERSION_H #define QDECLARATIVECONTACTVERSION_H -#include <QByteArray> + +#include <QtContacts/qcontactversion.h> #include "qdeclarativecontactdetail_p.h" -#include "qcontactversion.h" QTCONTACTS_USE_NAMESPACE @@ -105,5 +105,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactVersion) -#endif - +#endif // QDECLARATIVECONTACTVERSION_H diff --git a/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h index a6026c8ce..ac0ddde6b 100644 --- a/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h @@ -38,11 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTACTIONFILTER_H #define QDECLARATIVECONTACTACTIONFILTER_H +#include <QtContacts/qcontactactionfilter.h> + #include "qdeclarativecontactfilter_p.h" -#include "qcontactactionfilter.h" QTCONTACTS_USE_NAMESPACE @@ -86,4 +88,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactActionFilter) -#endif +#endif // QDECLARATIVECONTACTACTIONFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h index 16f7b09ca..b36023ba4 100644 --- a/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTCHANGELOGFILTER_H #define QDECLARATIVECONTACTCHANGELOGFILTER_H +#include <QtContacts/qcontactchangelogfilter.h> + #include "qdeclarativecontactfilter_p.h" -#include "qcontactchangelogfilter.h" QTCONTACTS_USE_NAMESPACE @@ -110,4 +111,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactChangeLogFilter) -#endif +#endif // QDECLARATIVECONTACTCHANGELOGFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h index 8ccda2e36..bc31d48ac 100644 --- a/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVECONTACTDETAILFILTER_H #define QDECLARATIVECONTACTDETAILFILTER_H -#include "qdeclarativecontactfilter_p.h" -#include "qcontactdetailfilter.h" +#include <QtContacts/qcontactdetailfilter.h> + #include "qdeclarativecontactdetail_p.h" -#include <QQmlParserStatus> +#include "qdeclarativecontactfilter_p.h" QTCONTACTS_USE_NAMESPACE @@ -152,4 +152,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactDetailFilter) -#endif +#endif // QDECLARATIVECONTACTDETAILFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h b/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h index 71246a188..8fda4a3ac 100644 --- a/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVECONTACTDETAILRANGEFILTER_H #define QDECLARATIVECONTACTDETAILRANGEFILTER_H +#include <QtContacts/qcontactdetailrangefilter.h> + +#include "qdeclarativecontact_p.h" #include "qdeclarativecontactfilter_p.h" -#include "qcontactdetailrangefilter.h" -#include "qdeclarativecontactdetail_p.h" -#include <QQmlParserStatus> QTCONTACTS_USE_NAMESPACE @@ -184,4 +184,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactDetailRangeFilter) -#endif +#endif // QDECLARATIVECONTACTDETAILRANGEFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactfilters_p.h b/src/imports/contacts/filters/qdeclarativecontactfilters_p.h index 632d90b4a..c80393965 100644 --- a/src/imports/contacts/filters/qdeclarativecontactfilters_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactfilters_p.h @@ -55,4 +55,4 @@ #include "qdeclarativecontactrelationshipfilter_p.h" #include "qdeclarativecontactunionfilter_p.h" -#endif +#endif // QDECLARATIVECONTACTFILTERS_H diff --git a/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h index 9d4a3e52d..68dc29c41 100644 --- a/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h @@ -42,11 +42,9 @@ #ifndef QDECLARATIVECONTACTIDFILTER_H #define QDECLARATIVECONTACTIDFILTER_H -#include "qdeclarativecontactfilter_p.h" -#include "qcontactidfilter.h" +#include <QtContacts/qcontactidfilter.h> -#include <QStringList> -#include <QSet> +#include "qdeclarativecontactfilter_p.h" QTCONTACTS_USE_NAMESPACE @@ -111,4 +109,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactIdFilter) -#endif +#endif // QDECLARATIVECONTACTIDFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h index 1b4872689..72776c00f 100644 --- a/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h @@ -42,10 +42,9 @@ #ifndef QDECLARATIVECONTACTINTERSECTIONFILTER_H #define QDECLARATIVECONTACTINTERSECTIONFILTER_H -#include "qdeclarativecontactfilter_p.h" -#include "qcontactintersectionfilter.h" +#include <QtContacts/qcontactintersectionfilter.h> -#include <QQmlListProperty> +#include "qdeclarativecontactfilter_p.h" QTCONTACTS_USE_NAMESPACE @@ -77,4 +76,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactIntersectionFilter) -#endif +#endif // QDECLARATIVECONTACTINTERSECTIONFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h index 319c5a8ad..3f92b13ce 100644 --- a/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h @@ -42,8 +42,9 @@ #ifndef QDECLARATIVECONTACTINVALIDFILTER_H #define QDECLARATIVECONTACTINVALIDFILTER_H +#include <QtContacts/qcontactinvalidfilter.h> + #include "qdeclarativecontactfilter_p.h" -#include "qcontactinvalidfilter.h" QTCONTACTS_USE_NAMESPACE @@ -66,4 +67,4 @@ public: QT_END_NAMESPACE -#endif +#endif // QDECLARATIVECONTACTINVALIDFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h index 9998dfd6e..8b7b53209 100644 --- a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h @@ -42,12 +42,11 @@ #ifndef QDECLARATIVECONTACTRELATIONSHIPFILTER_H #define QDECLARATIVECONTACTRELATIONSHIPFILTER_H +#include <QtContacts/qcontactrelationshipfilter.h> + +#include "qdeclarativecontact_p.h" #include "qdeclarativecontactfilter_p.h" -#include "qcontactrelationshipfilter.h" #include "qdeclarativecontactrelationship_p.h" -#include "qdeclarativecontact_p.h" -#include <qcontactmanager.h> -#include <QDebug> QTCONTACTS_USE_NAMESPACE @@ -167,4 +166,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactRelationshipFilter) -#endif +#endif // QDECLARATIVECONTACTRELATIONSHIPFILTER_H diff --git a/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h index 158abd46a..dc4a0a79f 100644 --- a/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h @@ -42,10 +42,9 @@ #ifndef QDECLARATIVECONTACTUNIONFILTER_H #define QDECLARATIVECONTACTUNIONFILTER_H -#include "qdeclarativecontactfilter_p.h" -#include "qcontactunionfilter.h" +#include <QtContacts/qcontactunionfilter.h> -#include <QQmlListProperty> +#include "qdeclarativecontactfilter_p.h" QTCONTACTS_USE_NAMESPACE @@ -76,4 +75,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactUnionFilter) -#endif +#endif // QDECLARATIVECONTACTUNIONFILTER_H diff --git a/src/imports/contacts/plugin.cpp b/src/imports/contacts/plugin.cpp index 8cffa66ba..36ea088f9 100644 --- a/src/imports/contacts/plugin.cpp +++ b/src/imports/contacts/plugin.cpp @@ -39,19 +39,21 @@ ** ****************************************************************************/ +#include <QtQml/qqml.h> +#include <QtQml/qqmlextensionplugin.h> -#include <QtQml> -#include <QQmlExtensionPlugin> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactabstractrequest.h> -#include "qdeclarativecontactmodel_p.h" #include "qdeclarativecontact_p.h" #include "qdeclarativecontactdetail_p.h" -#include "qdeclarativecontactfilter_p.h" -#include "qdeclarativecontactsortorder_p.h" -#include "qdeclarativecontactrelationshipmodel_p.h" -#include "qdeclarativecontactrelationship_p.h" #include "qdeclarativecontactfetchhint_p.h" +#include "qdeclarativecontactfilter_p.h" #include "qdeclarativecontactfilters_p.h" +#include "qdeclarativecontactmodel_p.h" +#include "qdeclarativecontactrelationship_p.h" +#include "qdeclarativecontactrelationshipmodel_p.h" +#include "qdeclarativecontactsortorder_p.h" QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp index 30a7d294d..f4c99e7ad 100644 --- a/src/imports/contacts/qdeclarativecontact.cpp +++ b/src/imports/contacts/qdeclarativecontact.cpp @@ -39,15 +39,16 @@ ** ****************************************************************************/ -#include <qcontactdetails.h> -#include <qcontactmanager.h> #include "qdeclarativecontact_p.h" -#include "qdeclarativecontactmodel_p.h" + +#include <QtCore/qurl.h> #include <QtQml/qqmlengine.h> -#include <QUrl> -#include <QQmlListProperty> +#include <QtContacts/qcontactdetails.h> +#include <QtContacts/qcontactmanager.h> + +#include "qdeclarativecontactmodel_p.h" QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h index ce6a9d212..35937fdbb 100644 --- a/src/imports/contacts/qdeclarativecontact_p.h +++ b/src/imports/contacts/qdeclarativecontact_p.h @@ -38,16 +38,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACT_P_H #define QDECLARATIVECONTACT_P_H -#include <qcontact.h> -#include <qcontactid.h> +#include <QtQml/qqml.h> + +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactid.h> + #include "qdeclarativecontactdetails_p.h" -#include "qdeclarativecontacturl_p.h" -#include "qdeclarativecontacthobby_p.h" -#include "qdeclarativecontactdetail_p.h" -#include <QtQml/qqmllist.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactdetail.cpp b/src/imports/contacts/qdeclarativecontactdetail.cpp index 07cc22561..2fefbc666 100644 --- a/src/imports/contacts/qdeclarativecontactdetail.cpp +++ b/src/imports/contacts/qdeclarativecontactdetail.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ +#include "qdeclarativecontactdetail_p.h" + #include "qdeclarativecontactdetails_p.h" #include "qdeclarativecontact_p.h" -#include "qcontactdetails.h" -#include <QDebug> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactdetail_p.h b/src/imports/contacts/qdeclarativecontactdetail_p.h index 37697891e..1fcbf3da9 100644 --- a/src/imports/contacts/qdeclarativecontactdetail_p.h +++ b/src/imports/contacts/qdeclarativecontactdetail_p.h @@ -38,13 +38,16 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTDETAIL_P_H #define QDECLARATIVECONTACTDETAIL_P_H -#include <qqml.h> -#include <QtQml/qqmlinfo.h> -#include "qcontact.h" -#include "qcontactdetail.h" +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> + +#include <QtQml/qqml.h> + +#include <QtContacts/qcontactdetail.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactfetchhint.cpp b/src/imports/contacts/qdeclarativecontactfetchhint.cpp index d1c25c3ba..a9fdc0288 100644 --- a/src/imports/contacts/qdeclarativecontactfetchhint.cpp +++ b/src/imports/contacts/qdeclarativecontactfetchhint.cpp @@ -41,7 +41,7 @@ #include "qdeclarativecontactfetchhint_p.h" -#include <QSet> +#include <QtCore/qset.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactfetchhint_p.h b/src/imports/contacts/qdeclarativecontactfetchhint_p.h index b6262a8c4..d904f6fbb 100644 --- a/src/imports/contacts/qdeclarativecontactfetchhint_p.h +++ b/src/imports/contacts/qdeclarativecontactfetchhint_p.h @@ -38,18 +38,17 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTFETCHHINT_H #define QDECLARATIVECONTACTFETCHHINT_H -#include <QVariant> -#include <QList> -#include <QSize> -#include <QStringList> +#include <QtCore/qsize.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <qqml.h> -#include <QQmlExtensionPlugin> +#include <QtQml/qqml.h> -#include "qcontactfetchhint.h" +#include <QtContacts/qcontactfetchhint.h> QTCONTACTS_USE_NAMESPACE @@ -101,4 +100,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactFetchHint) -#endif +#endif // QDECLARATIVECONTACTFETCHHINT_H diff --git a/src/imports/contacts/qdeclarativecontactfilter_p.h b/src/imports/contacts/qdeclarativecontactfilter_p.h index f28389e66..3e2c90260 100644 --- a/src/imports/contacts/qdeclarativecontactfilter_p.h +++ b/src/imports/contacts/qdeclarativecontactfilter_p.h @@ -38,12 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTFILTER_P_H #define QDECLARATIVECONTACTFILTER_P_H -#include <qqml.h> -#include <QQmlExtensionPlugin> -#include <qcontactfilter.h> +#include <QtQml/qqml.h> + +#include <QtContacts/qcontactfilter.h> QTCONTACTS_USE_NAMESPACE @@ -130,4 +131,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactFilter) QML_DECLARE_TYPE(QDeclarativeContactCompoundFilter) -#endif +#endif // QDECLARATIVECONTACTFILTER_P_H diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp index 2f816f3da..02ec91321 100644 --- a/src/imports/contacts/qdeclarativecontactmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactmodel.cpp @@ -38,29 +38,33 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <qcontactdetails.h> -#include <QtQml/qqmlinfo.h> #include "qdeclarativecontactmodel_p.h" -#include "qcontactmanager.h" -#include "qcontactmanagerengine.h" -#include "qcontactengineid.h" -#include "qcontactdetailfilter.h" -#include "qcontactidfilter.h" -#include "qcontactintersectionfilter.h" -#include "qversitreader.h" -#include "qversitwriter.h" -#include "qversitcontactimporter.h" -#include "qversitcontactexporter.h" -#include <QPointer> -#include <QColor> -#include <QHash> -#include <QPixmap> -#include <QFile> -#include <QMap> -#include <QUrl> - -#include "qcontactrequests.h" + +#include <QtCore/qfile.h> +#include <QtCore/qhash.h> +#include <QtCore/qmap.h> +#include <QtCore/qpointer.h> +#include <QtCore/qurl.h> + +#include <QtGui/qcolor.h> +#include <QtGui/qpixmap.h> + +#include <QtQml/qqmlinfo.h> + +#include <QtContacts/qcontactdetails.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactengineid.h> +#include <QtContacts/qcontactdetailfilter.h> +#include <QtContacts/qcontactidfilter.h> +#include <QtContacts/qcontactintersectionfilter.h> +#include <QtContacts/qcontactrequests.h> + +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitwriter.h> +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitcontactexporter.h> QTCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactmodel_p.h b/src/imports/contacts/qdeclarativecontactmodel_p.h index aee401b0d..ab48d7b81 100644 --- a/src/imports/contacts/qdeclarativecontactmodel_p.h +++ b/src/imports/contacts/qdeclarativecontactmodel_p.h @@ -42,23 +42,20 @@ #ifndef QDECLARATIVECONTACTMODEL_P_H #define QDECLARATIVECONTACTMODEL_P_H -#include <QAbstractListModel> -#include <QQmlListProperty> -#include <QQmlParserStatus> +#include <QtCore/qabstractitemmodel.h> -#include <qcontact.h> -#include "qcontactrequests.h" -#include "qdeclarativecontact_p.h" -#include <qversitreader.h> -#include <qversitwriter.h> +#include <QtQml/qqml.h> + +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactrequests.h> +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitwriter.h> + +#include "qdeclarativecontact_p.h" #include "qdeclarativecontactfetchhint_p.h" -#include "qdeclarativecontactsortorder_p.h" #include "qdeclarativecontactfilter_p.h" - -QT_BEGIN_NAMESPACE_VERSIT -class QVersitReader; -QT_END_NAMESPACE_VERSIT +#include "qdeclarativecontactsortorder_p.h" QTCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp index bb592b8cc..d2d443657 100644 --- a/src/imports/contacts/qdeclarativecontactrelationship.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp @@ -38,9 +38,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtQml/qqmlinfo.h> + #include "qdeclarativecontactrelationship_p.h" -#include <QDebug> + +#include <QtQml/qqmlinfo.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactrelationship_p.h b/src/imports/contacts/qdeclarativecontactrelationship_p.h index 762299131..73c419572 100644 --- a/src/imports/contacts/qdeclarativecontactrelationship_p.h +++ b/src/imports/contacts/qdeclarativecontactrelationship_p.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVECONTACTRELATIONSHIP_P_H #define QDECLARATIVECONTACTRELATIONSHIP_P_H -#include <qqml.h> -#include <QQmlExtensionPlugin> +#include <QtQml/qqml.h> + +#include <QtContacts/qcontactrelationship.h> -#include "qcontactrelationship.h" #include "qdeclarativecontact_p.h" QTCONTACTS_USE_NAMESPACE @@ -100,5 +100,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactRelationship) -#endif - +#endif // QDECLARATIVECONTACTRELATIONSHIP_P_H diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp index cdb265d0f..55720edd2 100644 --- a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp @@ -38,12 +38,15 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtQml/qqmlinfo.h> + #include "qdeclarativecontactrelationshipmodel_p.h" -#include "qcontactmanager.h" -#include "qcontactrequests.h" -#include <QPixmap> +#include <QtGui/qpixmap.h> + +#include <QtQml/qqmlinfo.h> + +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactrequests.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h index da225dcfd..f837d45c8 100644 --- a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h +++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h @@ -38,11 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTRELATIONSHIPMODEL_P_H #define QDECLARATIVECONTACTRELATIONSHIPMODEL_P_H -#include <qqml.h> -#include <QAbstractListModel> +#include <QtCore/qabstractitemmodel.h> + +#include <QtQml/qqml.h> #include "qdeclarativecontactrelationship_p.h" diff --git a/src/imports/contacts/qdeclarativecontactsortorder.cpp b/src/imports/contacts/qdeclarativecontactsortorder.cpp index 5fa70676e..3e8818075 100644 --- a/src/imports/contacts/qdeclarativecontactsortorder.cpp +++ b/src/imports/contacts/qdeclarativecontactsortorder.cpp @@ -38,8 +38,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include "qdeclarativecontactsortorder_p.h" -#include <QDebug> QTCONTACTS_USE_NAMESPACE diff --git a/src/imports/contacts/qdeclarativecontactsortorder_p.h b/src/imports/contacts/qdeclarativecontactsortorder_p.h index 8991e1dff..da6da727e 100644 --- a/src/imports/contacts/qdeclarativecontactsortorder_p.h +++ b/src/imports/contacts/qdeclarativecontactsortorder_p.h @@ -38,14 +38,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QDECLARATIVECONTACTSORTORDER_P_H #define QDECLARATIVECONTACTSORTORDER_P_H -#include <qqml.h> -#include <QQmlExtensionPlugin> -#include <QQmlParserStatus> +#include <QtQml/qqml.h> + +#include <QtContacts/qcontactsortorder.h> -#include "qcontactsortorder.h" #include "qdeclarativecontactdetail_p.h" QTCONTACTS_USE_NAMESPACE @@ -105,4 +105,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeContactSortOrder) -#endif +#endif // QDECLARATIVECONTACTSORTORDER_P_H diff --git a/src/imports/contacts/qdeclarativeglobal_p.h b/src/imports/contacts/qdeclarativeglobal_p.h index 8a9cb1c9a..95c3ddb31 100644 --- a/src/imports/contacts/qdeclarativeglobal_p.h +++ b/src/imports/contacts/qdeclarativeglobal_p.h @@ -42,10 +42,7 @@ #ifndef QDECLARATIVEGLOBAL_H #define QDECLARATIVEGLOBAL_H -#include <QtCore/qglobal.h> -#include <QtCore/QObject> - -QT_BEGIN_HEADER +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE @@ -99,6 +96,4 @@ inline void QQml_setParent_noEvent(QObject *object, QObject *parent) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEGLOBAL_H diff --git a/src/imports/organizer/plugin.cpp b/src/imports/organizer/plugin.cpp index 1390cfdf1..957f8cd18 100644 --- a/src/imports/organizer/plugin.cpp +++ b/src/imports/organizer/plugin.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include <QtQml> -#include <QQmlExtensionPlugin> +#include <QtQml/qqml.h> +#include <QtQml/qqmlextensionplugin.h> -#include "qdeclarativeorganizermodel_p.h" +#include "qdeclarativeorganizercollection_p.h" #include "qdeclarativeorganizeritem_p.h" #include "qdeclarativeorganizeritemdetail_p.h" -#include "qdeclarativeorganizeritemfilter_p.h" -#include "qdeclarativeorganizerrecurrencerule_p.h" #include "qdeclarativeorganizeritemfetchhint_p.h" +#include "qdeclarativeorganizeritemfilter_p.h" #include "qdeclarativeorganizeritemsortorder_p.h" -#include "qdeclarativeorganizercollection_p.h" +#include "qdeclarativeorganizermodel_p.h" +#include "qdeclarativeorganizerrecurrencerule_p.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizercollection_p.h b/src/imports/organizer/qdeclarativeorganizercollection_p.h index 2b9fec14a..2dd4afb35 100644 --- a/src/imports/organizer/qdeclarativeorganizercollection_p.h +++ b/src/imports/organizer/qdeclarativeorganizercollection_p.h @@ -42,11 +42,14 @@ #ifndef QDECLARATIVEORGANIZERCOLLECTION_H #define QDECLARATIVEORGANIZERCOLLECTION_H -#include <qorganizercollection.h> #include <QtCore/qurl.h> -#include <QtQml/qqml.h> + #include <QtGui/qcolor.h> +#include <QtQml/qqml.h> + +#include <QtOrganizer/qorganizercollection.h> + QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritem.cpp b/src/imports/organizer/qdeclarativeorganizeritem.cpp index 4b5cd8f33..64d218b96 100644 --- a/src/imports/organizer/qdeclarativeorganizeritem.cpp +++ b/src/imports/organizer/qdeclarativeorganizeritem.cpp @@ -40,10 +40,11 @@ ****************************************************************************/ #include "qdeclarativeorganizeritem_p.h" -#include "qdeclarativeorganizermodel_p.h" #include <QtQml/qqmlengine.h> +#include "qdeclarativeorganizermodel_p.h" + QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritem_p.h b/src/imports/organizer/qdeclarativeorganizeritem_p.h index 74a0e3cfb..159589d7e 100644 --- a/src/imports/organizer/qdeclarativeorganizeritem_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritem_p.h @@ -42,10 +42,11 @@ #ifndef QDECLARATIVEORGANIZERITEM_H #define QDECLARATIVEORGANIZERITEM_H -#include <qorganizeritems.h> -#include "qdeclarativeorganizeritemdetail_p.h" +#include <QtQml/qqml.h> + +#include <QtOrganizer/qorganizeritems.h> -#include <QtQml/qqmllist.h> +#include "qdeclarativeorganizeritemdetail_p.h" QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp index b72c4a7b2..f12fac1c9 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp +++ b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp @@ -40,9 +40,11 @@ ****************************************************************************/ #include "qdeclarativeorganizeritemdetail_p.h" + #include <QtQml/qqmlinfo.h> -#include <qorganizeritemdetails.h> -#include <qorganizeritemid.h> + +#include <QtOrganizer/qorganizeritemdetails.h> +#include <QtOrganizer/qorganizeritemid.h> QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h index 21d9fb586..8487ef8ef 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h @@ -42,7 +42,10 @@ #ifndef QDECLARATIVEORGANIZERITEMDETAIL_H #define QDECLARATIVEORGANIZERITEMDETAIL_H -#include <qorganizeritemdetails.h> +#include <QtQml/qqml.h> + +#include <QtOrganizer/qorganizeritemdetails.h> + #include "qdeclarativeorganizerrecurrencerule_p.h" QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h index e09951d62..42d44cc06 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h @@ -42,9 +42,10 @@ #ifndef QDECLARATIVEORGANIZERITEMFETCHHINT_H #define QDECLARATIVEORGANIZERITEMFETCHHINT_H -#include <qorganizeritemfetchhint.h> #include <QtQml/qqml.h> +#include <QtOrganizer/qorganizeritemfetchhint.h> + QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h index ab76668e0..8eb26c68a 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h @@ -42,8 +42,11 @@ #ifndef QDECLARATIVEORGANIZERITEMFILTER_P_H #define QDECLARATIVEORGANIZERITEMFILTER_P_H +#include <QtQml/qqml.h> + +#include <QtOrganizer/qorganizeritemfilters.h> + #include "qdeclarativeorganizeritemdetail_p.h" -#include <qorganizeritemfilters.h> QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h index 2055e70df..df6a4e34e 100644 --- a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h +++ b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h @@ -42,10 +42,11 @@ #ifndef QDECLARATIVEORGANIZERITEMSORTORDER_H #define QDECLARATIVEORGANIZERITEMSORTORDER_H -#include "qdeclarativeorganizeritemdetail_p.h" -#include <qorganizeritemsortorder.h> #include <QtQml/qqml.h> -#include <QtQml/qqmlparserstatus.h> + +#include <QtOrganizer/qorganizeritemsortorder.h> + +#include "qdeclarativeorganizeritemdetail_p.h" QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp index f7ec3ede0..031131c80 100644 --- a/src/imports/organizer/qdeclarativeorganizermodel.cpp +++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp @@ -39,19 +39,22 @@ ** ****************************************************************************/ -#include <qorganizeritemdetails.h> -#include <QtQml/qqmlinfo.h> #include "qdeclarativeorganizermodel_p.h" -#include <qorganizermanager.h> -#include <qversitorganizerimporter.h> -#include <qversitorganizerexporter.h> -#include "qdeclarativeorganizercollection_p.h" -#include <QFile> -#include <QUrl> -#include <qorganizeritemrequests.h> +#include <QtCore/qfile.h> #include <QtCore/qmath.h> +#include <QtCore/qurl.h> + +#include <QtQml/qqmlinfo.h> +#include <QtOrganizer/qorganizeritemdetails.h> +#include <QtOrganizer/qorganizeritemrequests.h> +#include <QtOrganizer/qorganizermanager.h> + +#include <QtVersitOrganizer/qversitorganizerimporter.h> +#include <QtVersitOrganizer/qversitorganizerexporter.h> + +#include "qdeclarativeorganizercollection_p.h" QTORGANIZER_USE_NAMESPACE QTVERSITORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizermodel_p.h b/src/imports/organizer/qdeclarativeorganizermodel_p.h index d97c9ad5a..ee8407e2e 100644 --- a/src/imports/organizer/qdeclarativeorganizermodel_p.h +++ b/src/imports/organizer/qdeclarativeorganizermodel_p.h @@ -42,25 +42,22 @@ #ifndef QDECLARATIVEORGANIZERMODEL_H #define QDECLARATIVEORGANIZERMODEL_H -#include <QAbstractListModel> -#include <QQmlListProperty> -#include <QQmlParserStatus> +#include <QtCore/qabstractitemmodel.h> -#include <qorganizeritem.h> -#include <qorganizerabstractrequest.h> +#include <QtQml/qqml.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizeritem.h> + +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitwriter.h> + +#include "qdeclarativeorganizercollection_p.h" #include "qdeclarativeorganizeritem_p.h" -#include <qversitreader.h> -#include <qversitwriter.h> -#include <qorganizercollectionid.h> #include "qdeclarativeorganizeritemfetchhint_p.h" -#include "qdeclarativeorganizeritemsortorder_p.h" #include "qdeclarativeorganizeritemfilter_p.h" -#include "qdeclarativeorganizercollection_p.h" - -QT_BEGIN_NAMESPACE_VERSIT -class QVersitReader; -class QVersitWriter; -QT_END_NAMESPACE_VERSIT +#include "qdeclarativeorganizeritemsortorder_p.h" QTORGANIZER_USE_NAMESPACE QTVERSIT_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp index 02dead513..f8c8534ab 100644 --- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp +++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qdeclarativeorganizerrecurrencerule_p.h" + #include <QtQml/qqmlinfo.h> QTORGANIZER_USE_NAMESPACE diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h index 4302ee354..7104537d5 100644 --- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h +++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h @@ -42,9 +42,10 @@ #ifndef QDECLARATIVEORGANIZERITEMRECURRENCERULE_H #define QDECLARATIVEORGANIZERITEMRECURRENCERULE_H -#include <qorganizerrecurrencerule.h> #include <QtQml/qqml.h> +#include <QtOrganizer/qorganizerrecurrencerule.h> + QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE diff --git a/src/organizer/details/qorganizereventattendee.h b/src/organizer/details/qorganizereventattendee.h index b90cb48b7..3ea656e68 100644 --- a/src/organizer/details/qorganizereventattendee.h +++ b/src/organizer/details/qorganizereventattendee.h @@ -1,3 +1,4 @@ + /**************************************************************************** ** ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -42,7 +43,7 @@ #ifndef QORGANIZEREVENTATTENDEE_H #define QORGANIZEREVENTATTENDEE_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizereventrsvp.h b/src/organizer/details/qorganizereventrsvp.h index dc6b495c9..d74991c34 100644 --- a/src/organizer/details/qorganizereventrsvp.h +++ b/src/organizer/details/qorganizereventrsvp.h @@ -42,8 +42,10 @@ #ifndef QORGANIZEREVENTRSVP_H #define QORGANIZEREVENTRSVP_H -#include <qorganizereventattendee.h> -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizereventattendee.h> +#include <QtOrganizer/qorganizeritemdetail.h> + +QT_FORWARD_DECLARE_CLASS(QDate) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizereventtime.h b/src/organizer/details/qorganizereventtime.h index ee6914720..89def2ccf 100644 --- a/src/organizer/details/qorganizereventtime.h +++ b/src/organizer/details/qorganizereventtime.h @@ -42,9 +42,9 @@ #ifndef QORGANIZEREVENTTIME_H #define QORGANIZEREVENTTIME_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemaudiblereminder.h b/src/organizer/details/qorganizeritemaudiblereminder.h index a82b6a433..d94ae0c9d 100644 --- a/src/organizer/details/qorganizeritemaudiblereminder.h +++ b/src/organizer/details/qorganizeritemaudiblereminder.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERITEMAUDIBLEREMINDER_H #define QORGANIZERITEMAUDIBLEREMINDER_H -#include <qorganizeritemreminder.h> +#include <QtOrganizer/qorganizeritemreminder.h> -#include <QtCore/qurl.h> +QT_FORWARD_DECLARE_CLASS(QUrl) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemclassification.h b/src/organizer/details/qorganizeritemclassification.h index c0516e8c1..acbac332c 100644 --- a/src/organizer/details/qorganizeritemclassification.h +++ b/src/organizer/details/qorganizeritemclassification.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMCLASSIFICATION_H #define QORGANIZERITEMCLASSIFICATION_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemcomment.h b/src/organizer/details/qorganizeritemcomment.h index f4446efbd..3072c8855 100644 --- a/src/organizer/details/qorganizeritemcomment.h +++ b/src/organizer/details/qorganizeritemcomment.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMCOMMENT_H #define QORGANIZERITEMCOMMENT_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemdescription.h b/src/organizer/details/qorganizeritemdescription.h index 9fa629c9c..60bc18bff 100644 --- a/src/organizer/details/qorganizeritemdescription.h +++ b/src/organizer/details/qorganizeritemdescription.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMDESCRIPTION_H #define QORGANIZERITEMDESCRIPTION_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp index 7f599a40f..3ce1a4e0e 100644 --- a/src/organizer/details/qorganizeritemdetails.cpp +++ b/src/organizer/details/qorganizeritemdetails.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <qorganizeritemdetails.h> -#include <qorganizeritemdetailfilter.h> -#include <qorganizeritemid.h> +#include "qorganizeritemdetails.h" + +#include <QtCore/qdatetime.h> +#include <QtCore/qurl.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemdetails.h b/src/organizer/details/qorganizeritemdetails.h index 1858a092c..514e7e2b0 100644 --- a/src/organizer/details/qorganizeritemdetails.h +++ b/src/organizer/details/qorganizeritemdetails.h @@ -42,32 +42,32 @@ #ifndef QORGANIZERITEMDETAILS_H #define QORGANIZERITEMDETAILS_H -#include <qorganizereventtime.h> -#include <qorganizeritemcomment.h> -#include <qorganizeritemdescription.h> -#include <qorganizeritemdisplaylabel.h> -#include <qorganizeritemguid.h> -#include <qorganizeritemlocation.h> -#include <qorganizeritemparent.h> -#include <qorganizeritempriority.h> -#include <qorganizeritemrecurrence.h> -#include <qorganizeritemtag.h> -#include <qorganizeritemtimestamp.h> -#include <qorganizeritemtype.h> -#include <qorganizerjournaltime.h> -#include <qorganizertodoprogress.h> -#include <qorganizertodotime.h> +#include <QtOrganizer/qorganizereventtime.h> +#include <QtOrganizer/qorganizeritemcomment.h> +#include <QtOrganizer/qorganizeritemdescription.h> +#include <QtOrganizer/qorganizeritemdisplaylabel.h> +#include <QtOrganizer/qorganizeritemguid.h> +#include <QtOrganizer/qorganizeritemlocation.h> +#include <QtOrganizer/qorganizeritemparent.h> +#include <QtOrganizer/qorganizeritempriority.h> +#include <QtOrganizer/qorganizeritemrecurrence.h> +#include <QtOrganizer/qorganizeritemtag.h> +#include <QtOrganizer/qorganizeritemtimestamp.h> +#include <QtOrganizer/qorganizeritemtype.h> +#include <QtOrganizer/qorganizerjournaltime.h> +#include <QtOrganizer/qorganizertodoprogress.h> +#include <QtOrganizer/qorganizertodotime.h> -#include <qorganizeritemreminder.h> -#include <qorganizeritemaudiblereminder.h> -#include <qorganizeritememailreminder.h> -#include <qorganizeritemvisualreminder.h> +#include <QtOrganizer/qorganizeritemreminder.h> +#include <QtOrganizer/qorganizeritemaudiblereminder.h> +#include <QtOrganizer/qorganizeritememailreminder.h> +#include <QtOrganizer/qorganizeritemvisualreminder.h> -#include <qorganizeritemextendeddetail.h> -#include <qorganizereventattendee.h> -#include <qorganizereventrsvp.h> -#include <qorganizeritemclassification.h> -#include <qorganizeritemversion.h> +#include <QtOrganizer/qorganizeritemextendeddetail.h> +#include <QtOrganizer/qorganizereventattendee.h> +#include <QtOrganizer/qorganizereventrsvp.h> +#include <QtOrganizer/qorganizeritemclassification.h> +#include <QtOrganizer/qorganizeritemversion.h> QT_BEGIN_NAMESPACE_ORGANIZER QT_END_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemdisplaylabel.h b/src/organizer/details/qorganizeritemdisplaylabel.h index 8c6845c64..7f484d6ac 100644 --- a/src/organizer/details/qorganizeritemdisplaylabel.h +++ b/src/organizer/details/qorganizeritemdisplaylabel.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMDISPLAYLABEL_H #define QORGANIZERITEMDISPLAYLABEL_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritememailreminder.h b/src/organizer/details/qorganizeritememailreminder.h index c20ec18fe..e859c92f5 100644 --- a/src/organizer/details/qorganizeritememailreminder.h +++ b/src/organizer/details/qorganizeritememailreminder.h @@ -42,9 +42,7 @@ #ifndef QORGANIZERITEMEMAILREMINDER_H #define QORGANIZERITEMEMAILREMINDER_H -#include <qorganizeritemreminder.h> - -#include <QtCore/qstringlist.h> +#include <QtOrganizer/qorganizeritemreminder.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemextendeddetail.h b/src/organizer/details/qorganizeritemextendeddetail.h index 52dea9362..eb629436c 100644 --- a/src/organizer/details/qorganizeritemextendeddetail.h +++ b/src/organizer/details/qorganizeritemextendeddetail.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMEXTENDEDDETAIL_H #define QORGANIZERITEMEXTENDEDDETAIL_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemguid.h b/src/organizer/details/qorganizeritemguid.h index 9da7eb2d8..38409c763 100644 --- a/src/organizer/details/qorganizeritemguid.h +++ b/src/organizer/details/qorganizeritemguid.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMGUID_H #define QORGANIZERITEMGUID_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemlocation.h b/src/organizer/details/qorganizeritemlocation.h index 8640dcaf4..ac388301d 100644 --- a/src/organizer/details/qorganizeritemlocation.h +++ b/src/organizer/details/qorganizeritemlocation.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMLOCATION_H #define QORGANIZERITEMLOCATION_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemparent.h b/src/organizer/details/qorganizeritemparent.h index 7fc315a8d..8cabb79d8 100644 --- a/src/organizer/details/qorganizeritemparent.h +++ b/src/organizer/details/qorganizeritemparent.h @@ -42,9 +42,10 @@ #ifndef QORGANIZERITEMPARENT_H #define QORGANIZERITEMPARENT_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemid.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDate) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritempriority.h b/src/organizer/details/qorganizeritempriority.h index e38cbf9c9..9d67e20a8 100644 --- a/src/organizer/details/qorganizeritempriority.h +++ b/src/organizer/details/qorganizeritempriority.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMPRIORITY_H #define QORGANIZERITEMPRIORITY_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemrecurrence.h b/src/organizer/details/qorganizeritemrecurrence.h index f595d53a4..84cd90836 100644 --- a/src/organizer/details/qorganizeritemrecurrence.h +++ b/src/organizer/details/qorganizeritemrecurrence.h @@ -42,8 +42,12 @@ #ifndef QORGANIZERITEMRECURRENCE_H #define QORGANIZERITEMRECURRENCE_H -#include <qorganizeritemdetail.h> -#include <qorganizerrecurrencerule.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qset.h> +#include <QtCore/qurl.h> + +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizerrecurrencerule.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemreminder.h b/src/organizer/details/qorganizeritemreminder.h index 34e2fc252..82bdeb2da 100644 --- a/src/organizer/details/qorganizeritemreminder.h +++ b/src/organizer/details/qorganizeritemreminder.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMREMINDER_H #define QORGANIZERITEMREMINDER_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemtag.h b/src/organizer/details/qorganizeritemtag.h index 5852d8bf2..e631fca7d 100644 --- a/src/organizer/details/qorganizeritemtag.h +++ b/src/organizer/details/qorganizeritemtag.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMTAG_H #define QORGANIZERITEMTAG_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemtimestamp.h b/src/organizer/details/qorganizeritemtimestamp.h index 1de747974..36cd93e4e 100644 --- a/src/organizer/details/qorganizeritemtimestamp.h +++ b/src/organizer/details/qorganizeritemtimestamp.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERITEMTIMESTAMP_H #define QORGANIZERITEMTIMESTAMP_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemtype.h b/src/organizer/details/qorganizeritemtype.h index a5caaae28..cf0ba6f82 100644 --- a/src/organizer/details/qorganizeritemtype.h +++ b/src/organizer/details/qorganizeritemtype.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMTYPE_H #define QORGANIZERITEMTYPE_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemversion.h b/src/organizer/details/qorganizeritemversion.h index 6c6203b43..58ab657b4 100644 --- a/src/organizer/details/qorganizeritemversion.h +++ b/src/organizer/details/qorganizeritemversion.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMVERSION_H #define QORGANIZERITEMVERSION_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizeritemvisualreminder.h b/src/organizer/details/qorganizeritemvisualreminder.h index ec93ad73c..5d8906e7f 100644 --- a/src/organizer/details/qorganizeritemvisualreminder.h +++ b/src/organizer/details/qorganizeritemvisualreminder.h @@ -42,7 +42,9 @@ #ifndef QORGANIZERITEMVISUALREMINDER_H #define QORGANIZERITEMVISUALREMINDER_H -#include <qorganizeritemreminder.h> +#include <QtOrganizer/qorganizeritemreminder.h> + +QT_FORWARD_DECLARE_CLASS(QUrl) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizerjournaltime.h b/src/organizer/details/qorganizerjournaltime.h index 7cf08abd1..104e0d7db 100644 --- a/src/organizer/details/qorganizerjournaltime.h +++ b/src/organizer/details/qorganizerjournaltime.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERJOURNALTIME_H #define QORGANIZERJOURNALTIME_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizertodoprogress.h b/src/organizer/details/qorganizertodoprogress.h index 7dcc360e2..82bcb934a 100644 --- a/src/organizer/details/qorganizertodoprogress.h +++ b/src/organizer/details/qorganizertodoprogress.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERTODOPROGRESS_H #define QORGANIZERTODOPROGRESS_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/details/qorganizertodotime.h b/src/organizer/details/qorganizertodotime.h index 97ba11130..516bbf70c 100644 --- a/src/organizer/details/qorganizertodotime.h +++ b/src/organizer/details/qorganizertodotime.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERTODOTIME_H #define QORGANIZERTODOTIME_H -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QtCore/qdatetime.h> +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp index 1603c08c4..0c8e20f89 100644 --- a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp +++ b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qtorganizer.h" +#include <QtOrganizer> #include <QDebug> #include <QCoreApplication> diff --git a/src/organizer/filters/qorganizeritemcollectionfilter.cpp b/src/organizer/filters/qorganizeritemcollectionfilter.cpp index 67a5899cf..836d56784 100644 --- a/src/organizer/filters/qorganizeritemcollectionfilter.cpp +++ b/src/organizer/filters/qorganizeritemcollectionfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemcollectionfilter.h> -#include <private/qorganizeritemcollectionfilter_p.h> +#include "qorganizeritemcollectionfilter.h" +#include "qorganizeritemcollectionfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemcollectionfilter.h b/src/organizer/filters/qorganizeritemcollectionfilter.h index 247f78927..79ea449ef 100644 --- a/src/organizer/filters/qorganizeritemcollectionfilter.h +++ b/src/organizer/filters/qorganizeritemcollectionfilter.h @@ -42,10 +42,11 @@ #ifndef QORGANIZERITEMCOLLECTIONFILTER_H #define QORGANIZERITEMCOLLECTIONFILTER_H -#include <qorganizeritemfilter.h> -#include <qorganizercollectionid.h> #include <QtCore/qset.h> +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizeritemfilter.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemCollectionFilterPrivate; diff --git a/src/organizer/filters/qorganizeritemcollectionfilter_p.h b/src/organizer/filters/qorganizeritemcollectionfilter_p.h index 4b7150979..a5398d5f1 100644 --- a/src/organizer/filters/qorganizeritemcollectionfilter_p.h +++ b/src/organizer/filters/qorganizeritemcollectionfilter_p.h @@ -53,9 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <qorganizercollectionid.h> - +#include <QtOrganizer/qorganizeritemcollectionfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfieldfilter.cpp b/src/organizer/filters/qorganizeritemdetailfieldfilter.cpp index 09fd9af0d..838dc5aa7 100644 --- a/src/organizer/filters/qorganizeritemdetailfieldfilter.cpp +++ b/src/organizer/filters/qorganizeritemdetailfieldfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemdetailfieldfilter.h> -#include <private/qorganizeritemdetailfieldfilter_p.h> +#include "qorganizeritemdetailfieldfilter.h" +#include "qorganizeritemdetailfieldfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfieldfilter.h b/src/organizer/filters/qorganizeritemdetailfieldfilter.h index f046541c5..09020714a 100644 --- a/src/organizer/filters/qorganizeritemdetailfieldfilter.h +++ b/src/organizer/filters/qorganizeritemdetailfieldfilter.h @@ -42,8 +42,8 @@ #ifndef QORGANIZERITEMDETAILFIELDFILTER_H #define QORGANIZERITEMDETAILFIELDFILTER_H -#include <qorganizeritemfilter.h> -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemfilter.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h b/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h index c5020620c..80b7449d8 100644 --- a/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h +++ b/src/organizer/filters/qorganizeritemdetailfieldfilter_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <qorganizeritemdetailfilter.h> +#include <QtOrganizer/qorganizeritemdetailfieldfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfilter.cpp b/src/organizer/filters/qorganizeritemdetailfilter.cpp index 8d6810775..f2ae0fa8e 100644 --- a/src/organizer/filters/qorganizeritemdetailfilter.cpp +++ b/src/organizer/filters/qorganizeritemdetailfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemdetailfilter.h> -#include <private/qorganizeritemdetailfilter_p.h> +#include "qorganizeritemdetailfilter.h" +#include "qorganizeritemdetailfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfilter.h b/src/organizer/filters/qorganizeritemdetailfilter.h index 96fd868ff..d2cac21b6 100644 --- a/src/organizer/filters/qorganizeritemdetailfilter.h +++ b/src/organizer/filters/qorganizeritemdetailfilter.h @@ -42,8 +42,8 @@ #ifndef QORGANIZERITEMDETAILFILTER_H #define QORGANIZERITEMDETAILFILTER_H -#include <qorganizeritemfilter.h> -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemfilter.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailfilter_p.h b/src/organizer/filters/qorganizeritemdetailfilter_p.h index fdfbb56d0..7500392df 100644 --- a/src/organizer/filters/qorganizeritemdetailfilter_p.h +++ b/src/organizer/filters/qorganizeritemdetailfilter_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <qorganizeritemdetailfilter.h> +#include <QtOrganizer/qorganizeritemdetailfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter.cpp b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp index d7231ea70..ea4c86aff 100644 --- a/src/organizer/filters/qorganizeritemdetailrangefilter.cpp +++ b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemdetailrangefilter.h> -#include <private/qorganizeritemdetailrangefilter_p.h> +#include "qorganizeritemdetailrangefilter.h" +#include "qorganizeritemdetailrangefilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter.h b/src/organizer/filters/qorganizeritemdetailrangefilter.h index 2c9e68630..1d35e385a 100644 --- a/src/organizer/filters/qorganizeritemdetailrangefilter.h +++ b/src/organizer/filters/qorganizeritemdetailrangefilter.h @@ -42,8 +42,8 @@ #ifndef QORGANIZERITEMDETAILRANGEFILTER_H #define QORGANIZERITEMDETAILRANGEFILTER_H -#include <qorganizeritemfilter.h> -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemfilter.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h index ad094113b..fb9066642 100644 --- a/src/organizer/filters/qorganizeritemdetailrangefilter_p.h +++ b/src/organizer/filters/qorganizeritemdetailrangefilter_p.h @@ -53,7 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" +#include <QtOrganizer/qorganizeritemdetailrangefilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemfilters.h b/src/organizer/filters/qorganizeritemfilters.h index 45c3c646a..4f0674c7b 100644 --- a/src/organizer/filters/qorganizeritemfilters.h +++ b/src/organizer/filters/qorganizeritemfilters.h @@ -45,14 +45,14 @@ // this file includes all of the leaf filter classes // provided by the Qt Organizer API. -#include <qorganizeritemunionfilter.h> -#include <qorganizeritemdetailfilter.h> -#include <qorganizeritemdetailfieldfilter.h> -#include <qorganizeritemdetailrangefilter.h> -#include <qorganizeritemintersectionfilter.h> -#include <qorganizeriteminvalidfilter.h> -#include <qorganizeritemidfilter.h> -#include <qorganizeritemcollectionfilter.h> +#include <QtOrganizer/qorganizeritemunionfilter.h> +#include <QtOrganizer/qorganizeritemdetailfilter.h> +#include <QtOrganizer/qorganizeritemdetailfieldfilter.h> +#include <QtOrganizer/qorganizeritemdetailrangefilter.h> +#include <QtOrganizer/qorganizeritemintersectionfilter.h> +#include <QtOrganizer/qorganizeriteminvalidfilter.h> +#include <QtOrganizer/qorganizeritemidfilter.h> +#include <QtOrganizer/qorganizeritemcollectionfilter.h> QT_BEGIN_NAMESPACE_ORGANIZER QT_END_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemidfilter.cpp b/src/organizer/filters/qorganizeritemidfilter.cpp index 15d59bb14..24523bb95 100644 --- a/src/organizer/filters/qorganizeritemidfilter.cpp +++ b/src/organizer/filters/qorganizeritemidfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemidfilter.h> -#include <private/qorganizeritemidfilter_p.h> +#include "qorganizeritemidfilter.h" +#include "qorganizeritemidfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemidfilter.h b/src/organizer/filters/qorganizeritemidfilter.h index a0f5cbf8e..989fea56e 100644 --- a/src/organizer/filters/qorganizeritemidfilter.h +++ b/src/organizer/filters/qorganizeritemidfilter.h @@ -42,8 +42,10 @@ #ifndef QORGANIZERITEMIDFILTER_H #define QORGANIZERITEMIDFILTER_H -#include <qorganizeritemfilter.h> -#include <qorganizeritemid.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizeritemfilter.h> +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemidfilter_p.h b/src/organizer/filters/qorganizeritemidfilter_p.h index 49077b371..2ae5f586f 100644 --- a/src/organizer/filters/qorganizeritemidfilter_p.h +++ b/src/organizer/filters/qorganizeritemidfilter_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemidfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemintersectionfilter.cpp b/src/organizer/filters/qorganizeritemintersectionfilter.cpp index c15003206..5593884f6 100644 --- a/src/organizer/filters/qorganizeritemintersectionfilter.cpp +++ b/src/organizer/filters/qorganizeritemintersectionfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemintersectionfilter.h> -#include <private/qorganizeritemintersectionfilter_p.h> +#include "qorganizeritemintersectionfilter.h" +#include "qorganizeritemintersectionfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemintersectionfilter.h b/src/organizer/filters/qorganizeritemintersectionfilter.h index c38cc066d..16f6c0b11 100644 --- a/src/organizer/filters/qorganizeritemintersectionfilter.h +++ b/src/organizer/filters/qorganizeritemintersectionfilter.h @@ -42,9 +42,10 @@ #ifndef QORGANIZERITEMINTERSECTIONFILTER_H #define QORGANIZERITEMINTERSECTIONFILTER_H -#include <qorganizeritemfilter.h> #include <QtCore/qlist.h> +#include <QtOrganizer/qorganizeritemfilter.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemIntersectionFilterPrivate; diff --git a/src/organizer/filters/qorganizeritemintersectionfilter_p.h b/src/organizer/filters/qorganizeritemintersectionfilter_p.h index 6ca716ed5..e05d6cf6b 100644 --- a/src/organizer/filters/qorganizeritemintersectionfilter_p.h +++ b/src/organizer/filters/qorganizeritemintersectionfilter_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <QtCore/qlist.h> +#include <QtOrganizer/qorganizeritemintersectionfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeriteminvalidfilter.cpp b/src/organizer/filters/qorganizeriteminvalidfilter.cpp index 92f46ceca..47f7174a8 100644 --- a/src/organizer/filters/qorganizeriteminvalidfilter.cpp +++ b/src/organizer/filters/qorganizeriteminvalidfilter.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeriteminvalidfilter.h> -#include <private/qorganizeritemfilter_p.h> +#include "qorganizeriteminvalidfilter.h" + +#include "qorganizeritemfilter_p.h" /*! \class QOrganizerItemInvalidFilter diff --git a/src/organizer/filters/qorganizeriteminvalidfilter.h b/src/organizer/filters/qorganizeriteminvalidfilter.h index b98adb3ba..c7e25185b 100644 --- a/src/organizer/filters/qorganizeriteminvalidfilter.h +++ b/src/organizer/filters/qorganizeriteminvalidfilter.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERITEMINVALIDFILTER_H #define QORGANIZERITEMINVALIDFILTER_H -#include <qorganizeritemfilter.h> +#include <QtOrganizer/qorganizeritemfilter.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemunionfilter.cpp b/src/organizer/filters/qorganizeritemunionfilter.cpp index bebc58872..efc4485ea 100644 --- a/src/organizer/filters/qorganizeritemunionfilter.cpp +++ b/src/organizer/filters/qorganizeritemunionfilter.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qorganizeritemunionfilter.h> -#include <private/qorganizeritemunionfilter_p.h> +#include "qorganizeritemunionfilter.h" +#include "qorganizeritemunionfilter_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/filters/qorganizeritemunionfilter.h b/src/organizer/filters/qorganizeritemunionfilter.h index 3b2e07f77..c66d5be74 100644 --- a/src/organizer/filters/qorganizeritemunionfilter.h +++ b/src/organizer/filters/qorganizeritemunionfilter.h @@ -42,9 +42,10 @@ #ifndef QORGANIZERITEMUNIONFILTER_H #define QORGANIZERITEMUNIONFILTER_H -#include <qorganizeritemfilter.h> #include <QtCore/qlist.h> +#include <QtOrganizer/qorganizeritemfilter.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemUnionFilterPrivate; diff --git a/src/organizer/filters/qorganizeritemunionfilter_p.h b/src/organizer/filters/qorganizeritemunionfilter_p.h index 94baf4499..e8610cb81 100644 --- a/src/organizer/filters/qorganizeritemunionfilter_p.h +++ b/src/organizer/filters/qorganizeritemunionfilter_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qorganizeritemfilter_p.h" -#include <QtCore/qlist.h> +#include <QtOrganizer/qorganizeritemunionfilter.h> +#include <QtOrganizer/private/qorganizeritemfilter_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizerevent.cpp b/src/organizer/items/qorganizerevent.cpp index 1ecfb2927..8c843a437 100644 --- a/src/organizer/items/qorganizerevent.cpp +++ b/src/organizer/items/qorganizerevent.cpp @@ -39,10 +39,11 @@ ** ****************************************************************************/ -#include <qorganizerevent.h> -#include <qorganizereventtime.h> -#include <qorganizeritemlocation.h> -#include <qorganizeritemrecurrence.h> +#include "qorganizerevent.h" + +#include "qorganizereventtime.h" +#include "qorganizeritemlocation.h" +#include "qorganizeritemrecurrence.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizerevent.h b/src/organizer/items/qorganizerevent.h index da4a9a452..cea38d276 100644 --- a/src/organizer/items/qorganizerevent.h +++ b/src/organizer/items/qorganizerevent.h @@ -42,9 +42,12 @@ #ifndef QORGANIZEREVENT_H #define QORGANIZEREVENT_H -#include <qorganizeritem.h> -#include <qorganizeritempriority.h> -#include <qorganizerrecurrencerule.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritempriority.h> +#include <QtOrganizer/qorganizerrecurrencerule.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizereventoccurrence.cpp b/src/organizer/items/qorganizereventoccurrence.cpp index 1980229b6..dc41be5c8 100644 --- a/src/organizer/items/qorganizereventoccurrence.cpp +++ b/src/organizer/items/qorganizereventoccurrence.cpp @@ -39,11 +39,13 @@ ** ****************************************************************************/ -#include <qorganizereventoccurrence.h> -#include <qorganizereventtime.h> -#include <qorganizeritemlocation.h> -#include <qorganizeritemparent.h> -#include <qorganizeritemid.h> +#include "qorganizereventoccurrence.h" + +#include <QtCore/qdatetime.h> + +#include "qorganizereventtime.h" +#include "qorganizeritemlocation.h" +#include "qorganizeritemparent.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizereventoccurrence.h b/src/organizer/items/qorganizereventoccurrence.h index e67952fa1..1ae233e47 100644 --- a/src/organizer/items/qorganizereventoccurrence.h +++ b/src/organizer/items/qorganizereventoccurrence.h @@ -42,8 +42,11 @@ #ifndef QORGANIZEREVENTOCCURRENCE_H #define QORGANIZEREVENTOCCURRENCE_H -#include <qorganizeritem.h> -#include <qorganizeritempriority.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritempriority.h> + +QT_FORWARD_DECLARE_CLASS(QDate) +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizeritems.h b/src/organizer/items/qorganizeritems.h index 52faabc60..cf3427d0d 100644 --- a/src/organizer/items/qorganizeritems.h +++ b/src/organizer/items/qorganizeritems.h @@ -45,12 +45,12 @@ // this file includes all of the organizer item // leaf classes that are included in the public API -#include <qorganizerevent.h> -#include <qorganizereventoccurrence.h> -#include <qorganizerjournal.h> -#include <qorganizertodo.h> -#include <qorganizertodooccurrence.h> -#include <qorganizernote.h> +#include <QtOrganizer/qorganizerevent.h> +#include <QtOrganizer/qorganizereventoccurrence.h> +#include <QtOrganizer/qorganizerjournal.h> +#include <QtOrganizer/qorganizernote.h> +#include <QtOrganizer/qorganizertodo.h> +#include <QtOrganizer/qorganizertodooccurrence.h> QT_BEGIN_NAMESPACE_ORGANIZER QT_END_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizerjournal.cpp b/src/organizer/items/qorganizerjournal.cpp index 9a85e4a34..4039edf7f 100644 --- a/src/organizer/items/qorganizerjournal.cpp +++ b/src/organizer/items/qorganizerjournal.cpp @@ -39,8 +39,11 @@ ** ****************************************************************************/ -#include <qorganizerjournal.h> -#include <qorganizerjournaltime.h> +#include "qorganizerjournal.h" + +#include <QtCore/qdatetime.h> + +#include "qorganizerjournaltime.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizerjournal.h b/src/organizer/items/qorganizerjournal.h index c1592e4fe..01f2f32cc 100644 --- a/src/organizer/items/qorganizerjournal.h +++ b/src/organizer/items/qorganizerjournal.h @@ -42,7 +42,9 @@ #ifndef QORGANIZERJOURNAL_H #define QORGANIZERJOURNAL_H -#include <qorganizeritem.h> +#include <QtOrganizer/qorganizeritem.h> + +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizernote.cpp b/src/organizer/items/qorganizernote.cpp index 5a65393f9..7fbc3b16a 100644 --- a/src/organizer/items/qorganizernote.cpp +++ b/src/organizer/items/qorganizernote.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qorganizernote.h> +#include "qorganizernote.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizernote.h b/src/organizer/items/qorganizernote.h index 050cebc12..077c87635 100644 --- a/src/organizer/items/qorganizernote.h +++ b/src/organizer/items/qorganizernote.h @@ -42,7 +42,7 @@ #ifndef QORGANIZERNOTE_H #define QORGANIZERNOTE_H -#include <qorganizeritem.h> +#include <QtOrganizer/qorganizeritem.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizertodo.cpp b/src/organizer/items/qorganizertodo.cpp index fb0400e28..2efb0a18d 100644 --- a/src/organizer/items/qorganizertodo.cpp +++ b/src/organizer/items/qorganizertodo.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizertodo.h> -#include <qorganizertodotime.h> +#include "qorganizertodo.h" + +#include "qorganizertodotime.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizertodo.h b/src/organizer/items/qorganizertodo.h index c6b513c49..da486d4d7 100644 --- a/src/organizer/items/qorganizertodo.h +++ b/src/organizer/items/qorganizertodo.h @@ -42,10 +42,13 @@ #ifndef QORGANIZERTODO_H #define QORGANIZERTODO_H -#include <qorganizeritem.h> -#include <qorganizeritempriority.h> -#include <qorganizeritemrecurrence.h> -#include <qorganizertodoprogress.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritempriority.h> +#include <QtOrganizer/qorganizeritemrecurrence.h> +#include <QtOrganizer/qorganizertodoprogress.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizertodooccurrence.cpp b/src/organizer/items/qorganizertodooccurrence.cpp index 2c356677e..19059b97b 100644 --- a/src/organizer/items/qorganizertodooccurrence.cpp +++ b/src/organizer/items/qorganizertodooccurrence.cpp @@ -39,10 +39,13 @@ ** ****************************************************************************/ -#include <qorganizertodooccurrence.h> -#include <qorganizertodotime.h> -#include <qorganizeritemparent.h> -#include <qorganizeritemid.h> +#include "qorganizertodooccurrence.h" + +#include <QtCore/qdatetime.h> + +#include "qorganizeritemid.h" +#include "qorganizeritemparent.h" +#include "qorganizertodotime.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/items/qorganizertodooccurrence.h b/src/organizer/items/qorganizertodooccurrence.h index c30250fa5..156eb9852 100644 --- a/src/organizer/items/qorganizertodooccurrence.h +++ b/src/organizer/items/qorganizertodooccurrence.h @@ -42,12 +42,17 @@ #ifndef QORGANIZERTODOOCCURRENCE_H #define QORGANIZERTODOOCCURRENCE_H -#include <qorganizeritem.h> -#include <qorganizeritempriority.h> -#include <qorganizertodoprogress.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritempriority.h> +#include <QtOrganizer/qorganizertodoprogress.h> + +QT_FORWARD_DECLARE_CLASS(QDate) +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemId; + /* Leaf class */ class Q_ORGANIZER_EXPORT QOrganizerTodoOccurrence : public QOrganizerItem diff --git a/src/organizer/qorganizer.h b/src/organizer/qorganizer.h index 2ae80a74b..4f54c1707 100644 --- a/src/organizer/qorganizer.h +++ b/src/organizer/qorganizer.h @@ -45,35 +45,35 @@ // this file includes all of the public header files // provided by the Qt Organizer API -#include "qorganizerglobal.h" // global exports +#include <QtOrganizer/qorganizerglobal.h> // global exports -#include "qorganizerabstractrequest.h" // asynchronous request -#include "qorganizeritemdetail.h" // organizer item detail -#include "qorganizeritemfetchhint.h" // fetch hint class -#include "qorganizeritemfilter.h" // organizer item filter -#include "qorganizeritem.h" // organizer item -#include "qorganizeritemid.h" // organizer item identifier -#include "qorganizeritemobserver.h" // organizer item observer -#include "qorganizermanager.h" // manager -#include "qorganizermanagerengine.h" // manager backend -#include "qorganizermanagerenginefactory.h" // manage backend instantiator -#include "qorganizerrecurrencerule.h" // a single recurrence rule -#include "qorganizeritemsortorder.h" // organizer item sorting +#include <QtOrganizer/qorganizerabstractrequest.h> // asynchronous request +#include <QtOrganizer/qorganizeritemdetail.h> // organizer item detail +#include <QtOrganizer/qorganizeritemfetchhint.h> // fetch hint class +#include <QtOrganizer/qorganizeritemfilter.h> // organizer item filter +#include <QtOrganizer/qorganizeritem.h> // organizer item +#include <QtOrganizer/qorganizeritemid.h> // organizer item identifier +#include <QtOrganizer/qorganizeritemobserver.h> // organizer item observer +#include <QtOrganizer/qorganizermanager.h> // manager +#include <QtOrganizer/qorganizermanagerengine.h> // manager backend +#include <QtOrganizer/qorganizermanagerenginefactory.h> // manage backend instantiator +#include <QtOrganizer/qorganizerrecurrencerule.h> // a single recurrence rule +#include <QtOrganizer/qorganizeritemsortorder.h> // organizer item sorting -#include "qorganizercollection.h" // collection of items -#include "qorganizercollectionid.h" // collection identifier +#include <QtOrganizer/qorganizercollection.h> // collection of items +#include <QtOrganizer/qorganizercollectionid.h> // collection identifier -#include "qorganizercollectionchangeset.h" // engine-specific collection changeset -#include "qorganizeritemchangeset.h" // engine-specific item changeset -#include "qorganizercollectionengineid.h" // engine-specific collection id -#include "qorganizeritemengineid.h" // engine specific item id +#include <QtOrganizer/qorganizercollectionchangeset.h> // engine-specific collection changeset +#include <QtOrganizer/qorganizeritemchangeset.h> // engine-specific item changeset +#include <QtOrganizer/qorganizercollectionengineid.h> // engine-specific collection id +#include <QtOrganizer/qorganizeritemengineid.h> // engine specific item id -#include "qorganizeritems.h" // item derived classes -#include "qorganizeritemdetails.h" // detail derived classes -#include "qorganizeritemrequests.h" // request derived classes -#include "qorganizeritemfilters.h" // detail derived classes +#include <QtOrganizer/qorganizeritems.h> // item derived classes +#include <QtOrganizer/qorganizeritemdetails.h> // detail derived classes +#include <QtOrganizer/qorganizeritemrequests.h> // request derived classes +#include <QtOrganizer/qorganizeritemfilters.h> // detail derived classes QT_BEGIN_NAMESPACE_ORGANIZER QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QTORGANIZER_H diff --git a/src/organizer/qorganizerabstractrequest.cpp b/src/organizer/qorganizerabstractrequest.cpp index 8144eb1be..a744d3325 100644 --- a/src/organizer/qorganizerabstractrequest.cpp +++ b/src/organizer/qorganizerabstractrequest.cpp @@ -39,7 +39,12 @@ ** ****************************************************************************/ -#include <private/qorganizerabstractrequest_p.h> +#include "qorganizerabstractrequest.h" +#include "qorganizerabstractrequest_p.h" + +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizerabstractrequest.h b/src/organizer/qorganizerabstractrequest.h index 3fe9e3039..05076c437 100644 --- a/src/organizer/qorganizerabstractrequest.h +++ b/src/organizer/qorganizerabstractrequest.h @@ -42,11 +42,12 @@ #ifndef QORGANIZERABSTRACTREQUEST_H #define QORGANIZERABSTRACTREQUEST_H -#include <qorganizermanager.h> +#include <QtOrganizer/qorganizermanager.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerEngine; + class QOrganizerAbstractRequestPrivate; class Q_ORGANIZER_EXPORT QOrganizerAbstractRequest : public QObject { @@ -114,6 +115,10 @@ private: #endif }; +#ifndef QT_NO_DEBUG_STREAM +Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerAbstractRequest &request); +#endif + QT_END_NAMESPACE_ORGANIZER #endif // QORGANIZERABSTRACTREQUEST_H diff --git a/src/organizer/qorganizerabstractrequest_p.h b/src/organizer/qorganizerabstractrequest_p.h index c9006f377..a70001a78 100644 --- a/src/organizer/qorganizerabstractrequest_p.h +++ b/src/organizer/qorganizerabstractrequest_p.h @@ -53,15 +53,12 @@ // We mean it. // -#include <qorganizerabstractrequest.h> -#include <private/qorganizermanager_p.h> - #include <QtCore/qmutex.h> #include <QtCore/qpointer.h> -#ifndef QT_NO_DEBUG_STREAM -#include <QtCore/qdebug.h> -#endif +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizermanagerengine.h> +#include <QtOrganizer/private/qorganizermanager_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollection.cpp b/src/organizer/qorganizercollection.cpp index 03abd0bb8..6ff8834ec 100644 --- a/src/organizer/qorganizercollection.cpp +++ b/src/organizer/qorganizercollection.cpp @@ -39,12 +39,15 @@ ** ****************************************************************************/ -#include <private/qorganizercollection_p.h> +#include "qorganizercollection.h" +#include "qorganizercollection_p.h" -#include <QtCore/QDataStream> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> -#endif // QT_NO_DEBUG_STREAM +#endif QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollection.h b/src/organizer/qorganizercollection.h index 1913fddf3..fcf45cbe0 100644 --- a/src/organizer/qorganizercollection.h +++ b/src/organizer/qorganizercollection.h @@ -42,15 +42,19 @@ #ifndef QORGANIZERCOLLECTION_H #define QORGANIZERCOLLECTION_H -#include <qorganizercollectionid.h> +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE_ORGANIZER +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemtype.h> -// MSVC needs the function declared before the friend declaration -class QOrganizerCollection; -Q_ORGANIZER_EXPORT uint qHash(const QOrganizerCollection &key); +QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerEngine; + class QOrganizerCollectionData; class Q_ORGANIZER_EXPORT QOrganizerCollection { @@ -90,6 +94,8 @@ private: QSharedDataPointer<QOrganizerCollectionData> d; }; +Q_ORGANIZER_EXPORT uint qHash(const QOrganizerCollection &key); + #ifndef QT_NO_DEBUG_STREAM Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerCollection &collection); #endif // QT_NO_DEBUG_STREAM diff --git a/src/organizer/qorganizercollection_p.h b/src/organizer/qorganizercollection_p.h index dfc9773e5..2b80be206 100644 --- a/src/organizer/qorganizercollection_p.h +++ b/src/organizer/qorganizercollection_p.h @@ -53,11 +53,13 @@ // We mean it. // -#include <qorganizercollection.h> -#include <qorganizercollectionid.h> - +#include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> #include <QtCore/qvariant.h> +#include <QtOrganizer/qorganizercollection.h> +#include <QtOrganizer/qorganizercollectionid.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerCollectionData : public QSharedData diff --git a/src/organizer/qorganizercollectionchangeset.cpp b/src/organizer/qorganizercollectionchangeset.cpp index 472ac482b..a8be13c86 100644 --- a/src/organizer/qorganizercollectionchangeset.cpp +++ b/src/organizer/qorganizercollectionchangeset.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <qorganizercollectionchangeset.h> -#include <private/qorganizercollectionchangeset_p.h> -#include <qorganizermanagerengine.h> +#include "qorganizercollectionchangeset.h" +#include "qorganizercollectionchangeset_p.h" + +#include "qorganizermanagerengine.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollectionchangeset.h b/src/organizer/qorganizercollectionchangeset.h index c9429c542..213d2be12 100644 --- a/src/organizer/qorganizercollectionchangeset.h +++ b/src/organizer/qorganizercollectionchangeset.h @@ -42,14 +42,17 @@ #ifndef QORGANIZERCOLLECTIONCHANGESET_H #define QORGANIZERCOLLECTIONCHANGESET_H -#include <qorganizercollectionid.h> -#include <qorganizermanager.h> - +#include <QtCore/qlist.h> #include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizermanager.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerEngine; + class QOrganizerCollectionChangeSetData; class Q_ORGANIZER_EXPORT QOrganizerCollectionChangeSet { diff --git a/src/organizer/qorganizercollectionchangeset_p.h b/src/organizer/qorganizercollectionchangeset_p.h index 920438826..8b77452cb 100644 --- a/src/organizer/qorganizercollectionchangeset_p.h +++ b/src/organizer/qorganizercollectionchangeset_p.h @@ -53,8 +53,11 @@ // We mean it. // -#include <qorganizercollectionid.h> +#include <QtCore/qlist.h> #include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizercollectionid.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollectionengineid.cpp b/src/organizer/qorganizercollectionengineid.cpp index 3669525c3..eba7204b0 100644 --- a/src/organizer/qorganizercollectionengineid.cpp +++ b/src/organizer/qorganizercollectionengineid.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qorganizercollectionengineid.h> +#include "qorganizercollectionengineid.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollectionengineid.h b/src/organizer/qorganizercollectionengineid.h index 5028609fb..bac1d2b1b 100644 --- a/src/organizer/qorganizercollectionengineid.h +++ b/src/organizer/qorganizercollectionengineid.h @@ -42,10 +42,10 @@ #ifndef QORGANIZERCOLLECTIONENGINEID_H #define QORGANIZERCOLLECTIONENGINEID_H -#include <qorganizerglobal.h> -#include <qorganizerabstractrequest.h> - #include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> + +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizercollectionid.cpp b/src/organizer/qorganizercollectionid.cpp index 02a75adbb..a49de3292 100644 --- a/src/organizer/qorganizercollectionid.cpp +++ b/src/organizer/qorganizercollectionid.cpp @@ -39,15 +39,18 @@ ** ****************************************************************************/ -#include <qorganizercollectionid.h> -#include <qorganizercollectionengineid.h> -#include <private/qorganizermanager_p.h> - -#include <QtCore/qstringlist.h> +#include "qorganizercollectionid.h" +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> -#endif // QT_NO_DEBUG_STREAM +#endif +#include <QtCore/qstringlist.h> + +#include "qorganizercollectionengineid.h" +#include "qorganizermanager_p.h" #if !defined(Q_CC_MWERKS) QT_BEGIN_NAMESPACE diff --git a/src/organizer/qorganizercollectionid.h b/src/organizer/qorganizercollectionid.h index aaedb6e9e..e30b2823a 100644 --- a/src/organizer/qorganizercollectionid.h +++ b/src/organizer/qorganizercollectionid.h @@ -42,26 +42,16 @@ #ifndef QORGANIZERCOLLECTIONID_H #define QORGANIZERCOLLECTIONID_H -#include <qorganizerglobal.h> - -#include <QtCore/qmetatype.h> #include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE_ORGANIZER +#include <QtOrganizer/qorganizerglobal.h> -// MSVC needs the function declared before the friend declaration -class QOrganizerCollectionId; -#ifndef QT_NO_DATASTREAM -Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerCollectionId &collectionId); -Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerCollectionId &collectionId); -#endif // QT_NO_DATASTREAM -#ifndef QT_NO_DEBUG_STREAM -Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerCollectionId &id); -#endif // QT_NO_DEBUG_STREAM +QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerEngine; -class QOrganizerCollectionEngineId; +class QOrganizerCollectionEngineId; class Q_ORGANIZER_EXPORT QOrganizerCollectionId { public: @@ -96,6 +86,15 @@ private: Q_ORGANIZER_EXPORT uint qHash(const QOrganizerCollectionId &key); +#ifndef QT_NO_DATASTREAM +Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerCollectionId &collectionId); +Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerCollectionId &collectionId); +#endif // QT_NO_DATASTREAM + +#ifndef QT_NO_DEBUG_STREAM +Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerCollectionId &id); +#endif // QT_NO_DEBUG_STREAM + QT_END_NAMESPACE_ORGANIZER QT_BEGIN_NAMESPACE diff --git a/src/organizer/qorganizerglobal.h b/src/organizer/qorganizerglobal.h index 20cff162a..0297034c3 100644 --- a/src/organizer/qorganizerglobal.h +++ b/src/organizer/qorganizerglobal.h @@ -68,4 +68,7 @@ #define QTORGANIZER_BACKEND_VERSION QString(QStringLiteral("org.qt-project.Qt.organizer.backendVersion")) +QT_BEGIN_NAMESPACE_ORGANIZER +QT_END_NAMESPACE_ORGANIZER + #endif // QTORGANIZERGLOBAL_H diff --git a/src/organizer/qorganizeritem.cpp b/src/organizer/qorganizeritem.cpp index a1f8ce003..91ed26c92 100644 --- a/src/organizer/qorganizeritem.cpp +++ b/src/organizer/qorganizeritem.cpp @@ -39,13 +39,18 @@ ** ****************************************************************************/ -#include <qorganizeritem.h> -#include <private/qorganizeritem_p.h> -#include <private/qorganizeritemdetail_p.h> -#include <qorganizeritemdetails.h> +#include "qorganizeritem.h" +#include "qorganizeritem_p.h" -#include <qdebug.h> -#include <qdatastream.h> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + +#include "qorganizeritemdetail_p.h" +#include "qorganizeritemdetails.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritem.h b/src/organizer/qorganizeritem.h index 20c0682d8..1b76e525d 100644 --- a/src/organizer/qorganizeritem.h +++ b/src/organizer/qorganizeritem.h @@ -42,22 +42,18 @@ #ifndef QORGANIZERITEM_H #define QORGANIZERITEM_H -#include <qorganizeritemid.h> -#include <qorganizeritemdetail.h> -#include <qorganizeritemtype.h> -#include <qorganizercollectionid.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> + +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemtype.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemData; - -// MSVC needs the function declared before the friend declaration -#ifndef QT_NO_DATASTREAM -class QOrganizerItem; -Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItem &item); -Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItem &item); -#endif // QT_NO_DATASTREAM - class Q_ORGANIZER_EXPORT QOrganizerItem { public: @@ -131,6 +127,10 @@ protected: Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItem &key); +#ifndef QT_NO_DATASTREAM +Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItem &item); +Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItem &item); +#endif // QT_NO_DATASTREAM #ifndef QT_NO_DEBUG_STREAM Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItem &item); #endif // QT_NO_DEBUG_STREAM diff --git a/src/organizer/qorganizeritem_p.h b/src/organizer/qorganizeritem_p.h index 4fa5c6683..cb39cbc4e 100644 --- a/src/organizer/qorganizeritem_p.h +++ b/src/organizer/qorganizeritem_p.h @@ -53,7 +53,13 @@ // We mean it. // -#include <qorganizeritem.h> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizercollectionid.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemchangeset.cpp b/src/organizer/qorganizeritemchangeset.cpp index 507ac7a7b..f57871daa 100644 --- a/src/organizer/qorganizeritemchangeset.cpp +++ b/src/organizer/qorganizeritemchangeset.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <qorganizeritemchangeset.h> -#include <private/qorganizeritemchangeset_p.h> -#include <qorganizermanagerengine.h> +#include "qorganizeritemchangeset.h" +#include "qorganizeritemchangeset_p.h" + +#include "qorganizermanagerengine.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemchangeset.h b/src/organizer/qorganizeritemchangeset.h index d3648d8e3..b1df9edcb 100644 --- a/src/organizer/qorganizeritemchangeset.h +++ b/src/organizer/qorganizeritemchangeset.h @@ -42,14 +42,17 @@ #ifndef QORGANIZERITEMCHANGESET_H #define QORGANIZERITEMCHANGESET_H -#include <qorganizeritemid.h> -#include <qorganizermanager.h> - +#include <QtCore/qlist.h> #include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizermanager.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerEngine; + class QOrganizerItemChangeSetData; class Q_ORGANIZER_EXPORT QOrganizerItemChangeSet { diff --git a/src/organizer/qorganizeritemchangeset_p.h b/src/organizer/qorganizeritemchangeset_p.h index 73ae56a4b..ce8fdaf38 100644 --- a/src/organizer/qorganizeritemchangeset_p.h +++ b/src/organizer/qorganizeritemchangeset_p.h @@ -53,8 +53,11 @@ // We mean it. // -#include <qorganizeritemid.h> +#include <QtCore/qlist.h> #include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemdetail.cpp b/src/organizer/qorganizeritemdetail.cpp index d1a407a0c..402287d81 100644 --- a/src/organizer/qorganizeritemdetail.cpp +++ b/src/organizer/qorganizeritemdetail.cpp @@ -39,12 +39,17 @@ ** ****************************************************************************/ -#include <qorganizeritemdetail.h> -#include <private/qorganizeritemdetail_p.h> -#include <qorganizeritemrecurrence.h> +#include "qorganizeritemdetail.h" +#include "qorganizeritemdetail_p.h" -#include <qdebug.h> -#include <qdatastream.h> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + +#include "qorganizeritemrecurrence.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemdetail.h b/src/organizer/qorganizeritemdetail.h index 016f8c845..6cb4ebda2 100644 --- a/src/organizer/qorganizeritemdetail.h +++ b/src/organizer/qorganizeritemdetail.h @@ -42,23 +42,16 @@ #ifndef QORGANIZERITEMDETAIL_H #define QORGANIZERITEMDETAIL_H -#include <qorganizerglobal.h> - +#include <QtCore/qmap.h> #include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> #include <QtCore/qvariant.h> +#include <QtOrganizer/qorganizerglobal.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemDetailPrivate; - -// MSVC needs the function declared before the friend declaration -class QOrganizerItemDetail; -Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemDetail &key); -#ifndef QT_NO_DATASTREAM -Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemDetail &detail); -Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemDetail &detail); -#endif // QT_NO_DATASTREAM - class Q_ORGANIZER_EXPORT QOrganizerItemDetail { public: @@ -132,6 +125,11 @@ private: QSharedDataPointer<QOrganizerItemDetailPrivate> d; }; +Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemDetail &key); +#ifndef QT_NO_DATASTREAM +Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemDetail &detail); +Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemDetail &detail); +#endif // QT_NO_DATASTREAM #ifndef QT_NO_DEBUG_STREAM Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemDetail &detail); #endif // QT_NO_DEBUG_STREAM diff --git a/src/organizer/qorganizeritemdetail_p.h b/src/organizer/qorganizeritemdetail_p.h index 3118457f7..2604d079b 100644 --- a/src/organizer/qorganizeritemdetail_p.h +++ b/src/organizer/qorganizeritemdetail_p.h @@ -53,9 +53,10 @@ // We mean it. // -#include <qorganizeritemdetail.h> - #include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemengineid.h b/src/organizer/qorganizeritemengineid.h index b61edd537..51b880887 100644 --- a/src/organizer/qorganizeritemengineid.h +++ b/src/organizer/qorganizeritemengineid.h @@ -42,10 +42,10 @@ #ifndef QORGANIZERITEMENGINEID_H #define QORGANIZERITEMENGINEID_H -#include <qorganizerglobal.h> -#include <qorganizerabstractrequest.h> - #include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> + +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemfetchhint.cpp b/src/organizer/qorganizeritemfetchhint.cpp index f9be0a804..b9edaeed2 100644 --- a/src/organizer/qorganizeritemfetchhint.cpp +++ b/src/organizer/qorganizeritemfetchhint.cpp @@ -41,10 +41,12 @@ #include "qorganizeritemfetchhint_p.h" -#include <QtCore/QDataStream> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> -#endif // QT_NO_DEBUG_STREAM +#endif QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemfetchhint.h b/src/organizer/qorganizeritemfetchhint.h index aa0c89493..f5f2e502d 100644 --- a/src/organizer/qorganizeritemfetchhint.h +++ b/src/organizer/qorganizeritemfetchhint.h @@ -42,13 +42,10 @@ #ifndef QORGANIZERITEMFETCHHINT_H #define QORGANIZERITEMFETCHHINT_H -#include <qorganizeritemdetail.h> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -#ifndef QT_NO_DATASTREAM -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE -#endif // QT_NO_DATASTREAM +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemfetchhint_p.h b/src/organizer/qorganizeritemfetchhint_p.h index 0df737300..971da85d6 100644 --- a/src/organizer/qorganizeritemfetchhint_p.h +++ b/src/organizer/qorganizeritemfetchhint_p.h @@ -53,7 +53,11 @@ // We mean it. // -#include <qorganizeritemfetchhint.h> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemfetchhint.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemfilter.cpp b/src/organizer/qorganizeritemfilter.cpp index 2749cb5d1..4452bf44d 100644 --- a/src/organizer/qorganizeritemfilter.cpp +++ b/src/organizer/qorganizeritemfilter.cpp @@ -39,8 +39,17 @@ ** ****************************************************************************/ -#include <qorganizeritemfilters.h> -#include <private/qorganizeritemfilter_p.h> +#include "qorganizeritemfilter.h" +#include "qorganizeritemfilter_p.h" + +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + +#include "qorganizeritemfilters.h" /*! \class QOrganizerItemFilter diff --git a/src/organizer/qorganizeritemfilter.h b/src/organizer/qorganizeritemfilter.h index 99d350a71..d8251f7d8 100644 --- a/src/organizer/qorganizeritemfilter.h +++ b/src/organizer/qorganizeritemfilter.h @@ -42,29 +42,14 @@ #ifndef QORGANIZERITEMFILTER_H #define QORGANIZERITEMFILTER_H -#include <qorganizerglobal.h> - #include <QtCore/qnamespace.h> #include <QtCore/qshareddata.h> -QT_BEGIN_NAMESPACE -#ifndef QT_NO_DATASTREAM -class QDataStream; -#endif // QT_NO_DATASTREAM -QT_END_NAMESPACE +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerItemFilterPrivate; - -#ifndef QT_NO_DATASTREAM -// MSVC needs the function declared before the friend declaration -class QOrganizerItemFilter; - -Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemFilter &filter); -Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemFilter &filter); -#endif // QT_NO_DATASTREAM - class Q_ORGANIZER_EXPORT QOrganizerItemFilter { public: @@ -127,6 +112,14 @@ protected: const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator&(const QOrganizerItemFilter &left, const QOrganizerItemFilter &right); const Q_ORGANIZER_EXPORT QOrganizerItemFilter operator|(const QOrganizerItemFilter &left, const QOrganizerItemFilter &right); +#ifndef QT_NO_DATASTREAM +Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemFilter &filter); +Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemFilter &filter); +#endif // QT_NO_DATASTREAM +#ifndef QT_NO_DEBUG_STREAM +Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemFilter &filter); +#endif // QT_NO_DEBUG_STREAM + QT_END_NAMESPACE_ORGANIZER QT_BEGIN_NAMESPACE diff --git a/src/organizer/qorganizeritemfilter_p.h b/src/organizer/qorganizeritemfilter_p.h index ad34fb84d..3bda9d2f3 100644 --- a/src/organizer/qorganizeritemfilter_p.h +++ b/src/organizer/qorganizeritemfilter_p.h @@ -53,16 +53,17 @@ // We mean it. // -#include <qorganizeritemfilter.h> -#include <QtCore/qshareddata.h> - #ifndef QT_NO_DATASTREAM #include <QtCore/qdatastream.h> -#endif // QT_NO_DATASTREAM - +#endif #ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> -#endif // QT_NO_DEBUG_STREAM +#endif +#include <QtCore/qlist.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemfilter.h> /* Boiler plate code */ #define Q_IMPLEMENT_ORGANIZERITEMFILTER_PRIVATE(Class) \ diff --git a/src/organizer/qorganizeritemid.cpp b/src/organizer/qorganizeritemid.cpp index f11355fba..7a2f34991 100644 --- a/src/organizer/qorganizeritemid.cpp +++ b/src/organizer/qorganizeritemid.cpp @@ -39,15 +39,19 @@ ** ****************************************************************************/ -#include <qorganizeritemid.h> -#include <qorganizeritemengineid.h> -#include <private/qorganizermanager_p.h> +#include "qorganizeritemid.h" #ifndef QT_NO_DATASTREAM #include <QtCore/qdatastream.h> #endif +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif #include <QtCore/qstringlist.h> +#include "qorganizeritemengineid.h" +#include "qorganizermanager_p.h" + #if !defined(Q_CC_MWERKS) QT_BEGIN_NAMESPACE template<> QTORGANIZER_PREPEND_NAMESPACE(QOrganizerItemEngineId) *QSharedDataPointer<QTORGANIZER_PREPEND_NAMESPACE(QOrganizerItemEngineId)>::clone() diff --git a/src/organizer/qorganizeritemid.h b/src/organizer/qorganizeritemid.h index 083ac2413..cf419cb4b 100644 --- a/src/organizer/qorganizeritemid.h +++ b/src/organizer/qorganizeritemid.h @@ -42,37 +42,16 @@ #ifndef QORGANIZERITEMID_H #define QORGANIZERITEMID_H -#include <qorganizerglobal.h> - -#ifndef QT_NO_DEBUG_STREAM -#include <QtCore/qdebug.h> -#endif #include <QtCore/qshareddata.h> +#include <QtCore/qvariant.h> -#ifndef QT_NO_DATASTREAM -QT_BEGIN_NAMESPACE -class QDataStream; -QT_END_NAMESPACE -#endif +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER -// MSVC needs the function declared before the friend declaration -class QOrganizerItemId; -class QOrganizerItemEngineId; -Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemId &key); - -#ifndef QT_NO_DATASTREAM -Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemId &itemId); -Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemId &itemId); -#endif - -#ifndef QT_NO_DEBUG_STREAM -Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemId &itemId); -#endif - class QOrganizerManagerEngine; +class QOrganizerItemEngineId; class Q_ORGANIZER_EXPORT QOrganizerItemId { public: @@ -104,6 +83,17 @@ private: friend class QOrganizerManagerEngine; }; +Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemId &key); + +#ifndef QT_NO_DATASTREAM +Q_ORGANIZER_EXPORT QDataStream &operator<<(QDataStream &out, const QOrganizerItemId &itemId); +Q_ORGANIZER_EXPORT QDataStream &operator>>(QDataStream &in, QOrganizerItemId &itemId); +#endif + +#ifndef QT_NO_DEBUG_STREAM +Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerItemId &itemId); +#endif + QT_END_NAMESPACE_ORGANIZER QT_BEGIN_NAMESPACE diff --git a/src/organizer/qorganizeritemobserver.cpp b/src/organizer/qorganizeritemobserver.cpp index 766a7155a..003422fcb 100644 --- a/src/organizer/qorganizeritemobserver.cpp +++ b/src/organizer/qorganizeritemobserver.cpp @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include <qorganizeritemobserver.h> -#include <private/qorganizermanager_p.h> +#include "qorganizeritemobserver.h" -#include <QtCore/QPointer> +#include <QtCore/qpointer.h> + +#include "qorganizermanager.h" +#include "qorganizermanager_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemobserver.h b/src/organizer/qorganizeritemobserver.h index 22228ec6f..1380ef4c2 100644 --- a/src/organizer/qorganizeritemobserver.h +++ b/src/organizer/qorganizeritemobserver.h @@ -42,12 +42,15 @@ #ifndef QORGANIZERITEMOBSERVER_H #define QORGANIZERITEMOBSERVER_H -#include <qorganizermanager.h> +#include <QtCore/qobject.h> + +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER -class QOrganizerItemObserverPrivate; +class QOrganizerManager; +class QOrganizerItemObserverPrivate; class Q_ORGANIZER_EXPORT QOrganizerItemObserver : public QObject { Q_OBJECT diff --git a/src/organizer/qorganizeritemsortorder.cpp b/src/organizer/qorganizeritemsortorder.cpp index 3490baea2..9c0c3225a 100644 --- a/src/organizer/qorganizeritemsortorder.cpp +++ b/src/organizer/qorganizeritemsortorder.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <qorganizeritemsortorder.h> -#include <private/qorganizeritemsortorder_p.h> +#include "qorganizeritemsortorder.h" +#include "qorganizeritemsortorder_p.h" -#include <QtCore/QDataStream> +#ifndef QT_NO_DATASTREAM +#include <QtCore/qdatastream.h> +#endif #ifndef QT_NO_DEBUG_STREAM -#include <QDebug> +#include <QtCore/qdebug.h> #endif QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemsortorder.h b/src/organizer/qorganizeritemsortorder.h index 49520686e..62125dbe7 100644 --- a/src/organizer/qorganizeritemsortorder.h +++ b/src/organizer/qorganizeritemsortorder.h @@ -42,10 +42,10 @@ #ifndef QORGANIZERITEMSORTORDER_H #define QORGANIZERITEMSORTORDER_H -#include <qorganizeritemdetail.h> #include <QtCore/qlist.h> #include <QtCore/qshareddata.h> -#include <QtCore/qstring.h> + +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizeritemsortorder_p.h b/src/organizer/qorganizeritemsortorder_p.h index 63035c0d7..c5ee93583 100644 --- a/src/organizer/qorganizeritemsortorder_p.h +++ b/src/organizer/qorganizeritemsortorder_p.h @@ -53,7 +53,10 @@ // We mean it. // -#include <qorganizeritemsortorder.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemsortorder.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizermanager.cpp b/src/organizer/qorganizermanager.cpp index eeedb959e..e39f478bf 100644 --- a/src/organizer/qorganizermanager.cpp +++ b/src/organizer/qorganizermanager.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qorganizermanager_p.h> +#include "qorganizermanager.h" +#include "qorganizermanager_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizermanager.h b/src/organizer/qorganizermanager.h index 4d1e79342..9848cf208 100644 --- a/src/organizer/qorganizermanager.h +++ b/src/organizer/qorganizermanager.h @@ -42,15 +42,19 @@ #ifndef QORGANIZERMANAGER_H #define QORGANIZERMANAGER_H -#include <qorganizercollection.h> -#include <qorganizeritem.h> -#include <qorganizeritemfilter.h> -#include <qorganizeritemfetchhint.h> -#include <qorganizeritemsortorder.h> - #include <QtCore/qdatetime.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qpair.h> #include <QtCore/qstringlist.h> +#include <QtOrganizer/qorganizercollection.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemfilter.h> +#include <QtOrganizer/qorganizeritemfetchhint.h> +#include <QtOrganizer/qorganizeritemsortorder.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerManagerData; diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp index 5a46e7127..a450b00ab 100644 --- a/src/organizer/qorganizermanager_p.cpp +++ b/src/organizer/qorganizermanager_p.cpp @@ -39,14 +39,18 @@ ** ****************************************************************************/ -#include <private/qorganizermanager_p.h> -#include <qorganizeritemobserver.h> -#include <qorganizermanagerenginefactory.h> +#include "qorganizermanager_p.h" #include <QtCore/qcoreapplication.h> +#if !defined(QT_NO_DEBUG) +#include <QtCore/qdebug.h> +#endif #include <QtCore/qpluginloader.h> #include <QtCore/private/qfactoryloader_p.h> +#include "qorganizeritemobserver.h" +#include "qorganizermanagerenginefactory.h" + QT_BEGIN_NAMESPACE_ORGANIZER QHash<QString, QOrganizerManagerEngineFactory *> QOrganizerManagerData::m_engines; @@ -134,11 +138,11 @@ void QOrganizerManagerData::loadStaticFactories() if (name != QStringLiteral("invalid") && !name.isEmpty()) { // we also need to ensure that we haven't already loaded this factory. if (m_engines.keys().contains(name)) - qWarning() << "Static organizeritems plugin" << name << "has the same name as a currently loaded plugin; ignored"; + qWarning("Static organizeritems plugin %s has the same name as a currently loaded plugin; ignored", qPrintable(name)); else m_engines.insertMulti(name, f); } else { - qWarning() << "Static organizeritems plugin with reserved name" << name << "ignored"; + qWarning("Static organizeritems plugin with reserved name %s ignored", qPrintable(name)); } } } @@ -172,11 +176,11 @@ void QOrganizerManagerData::loadFactories() if (name != QStringLiteral("invalid") && !name.isEmpty()) { // we also need to ensure that we haven't already loaded this factory. if (m_engines.keys().contains(name)) - qWarning() << "Organizer plugin" << m_pluginPaths.at(i) << "has the same name as currently loaded plugin" << name << "; ignored"; + qWarning("Organizer plugin %s has the same name as currently loaded plugin %s; ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name)); else m_engines.insertMulti(name, f); } else { - qWarning() << "Organizer plugin" << m_pluginPaths.at(i) << "with reserved name" << name << "ignored"; + qWarning("Organizer plugin %s with reserved name %s ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name)); } } diff --git a/src/organizer/qorganizermanager_p.h b/src/organizer/qorganizermanager_p.h index d3d4421f0..e1b45a10c 100644 --- a/src/organizer/qorganizermanager_p.h +++ b/src/organizer/qorganizermanager_p.h @@ -53,11 +53,17 @@ // We mean it. // -#include <qorganizermanager.h> -#include <qorganizermanagerengine.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qstringlist.h> + +#include <QtOrganizer/qorganizermanager.h> +#include <QtOrganizer/qorganizermanagerengine.h> QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerCollectionEngineId; class QOrganizerItemObserver; class QOrganizerManagerEngineFactory; class QOrganizerItemEngineId; diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp index 9647ded66..63f7f845d 100644 --- a/src/organizer/qorganizermanagerengine.cpp +++ b/src/organizer/qorganizermanagerengine.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include <qorganizermanagerengine.h> -#include <qorganizeritems.h> -#include <qorganizeritemdetails.h> -#include <qorganizeritemfilters.h> -#include <qorganizeritemrequests.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizermanagerengine.h" +#include "qorganizeritems.h" +#include "qorganizeritemdetails.h" +#include "qorganizeritemfilters.h" +#include "qorganizeritemrequests.h" +#include "qorganizeritemrequests_p.h" #include <QtCore/qmutex.h> diff --git a/src/organizer/qorganizermanagerengine.h b/src/organizer/qorganizermanagerengine.h index f7a726b2e..7c09d5923 100644 --- a/src/organizer/qorganizermanagerengine.h +++ b/src/organizer/qorganizermanagerengine.h @@ -42,9 +42,9 @@ #ifndef QORGANIZERMANAGERENGINE_H #define QORGANIZERMANAGERENGINE_H -#include <qorganizermanager.h> -#include <qorganizerabstractrequest.h> -#include <qorganizerrecurrencerule.h> +#include <QtOrganizer/qorganizermanager.h> +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizerrecurrencerule.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizermanagerenginefactory.cpp b/src/organizer/qorganizermanagerenginefactory.cpp index a77bf32ee..21d087c01 100644 --- a/src/organizer/qorganizermanagerenginefactory.cpp +++ b/src/organizer/qorganizermanagerenginefactory.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qorganizermanagerenginefactory.h> +#include "qorganizermanagerenginefactory.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizermanagerenginefactory.h b/src/organizer/qorganizermanagerenginefactory.h index 4d54247cc..6781c915d 100644 --- a/src/organizer/qorganizermanagerenginefactory.h +++ b/src/organizer/qorganizermanagerenginefactory.h @@ -42,10 +42,11 @@ #ifndef QORGANIZERMANAGERENGINEFACTORY_H #define QORGANIZERMANAGERENGINEFACTORY_H -#include <qorganizermanager.h> #include <QtCore/qfactoryinterface.h> #include <QtCore/qplugin.h> +#include <QtOrganizer/qorganizermanager.h> + QT_BEGIN_NAMESPACE_ORGANIZER struct Q_ORGANIZER_EXPORT QOrganizerManagerEngineFactoryInterface : public QFactoryInterface { diff --git a/src/organizer/qorganizerrecurrencerule.cpp b/src/organizer/qorganizerrecurrencerule.cpp index 0e53a8a95..7be6698dc 100644 --- a/src/organizer/qorganizerrecurrencerule.cpp +++ b/src/organizer/qorganizerrecurrencerule.cpp @@ -39,8 +39,12 @@ ** ****************************************************************************/ -#include <qorganizerrecurrencerule.h> -#include <private/qorganizerrecurrencerule_p.h> +#include "qorganizerrecurrencerule.h" +#include "qorganizerrecurrencerule_p.h" + +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizerrecurrencerule.h b/src/organizer/qorganizerrecurrencerule.h index f241934f4..bcf804806 100644 --- a/src/organizer/qorganizerrecurrencerule.h +++ b/src/organizer/qorganizerrecurrencerule.h @@ -42,13 +42,11 @@ #ifndef QORGANIZERRECURRENCERULE_H #define QORGANIZERRECURRENCERULE_H -#include <qorganizerglobal.h> - #include <QtCore/qdatetime.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> -#ifndef QT_NO_DEBUG_STREAM -#include <QtCore/qdebug.h> -#endif // QT_NO_DEBUG_STREAM +#include <QtOrganizer/qorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/qorganizerrecurrencerule_p.h b/src/organizer/qorganizerrecurrencerule_p.h index 2e5066176..dc19b7c57 100644 --- a/src/organizer/qorganizerrecurrencerule_p.h +++ b/src/organizer/qorganizerrecurrencerule_p.h @@ -53,7 +53,11 @@ // We mean it. // -#include <qorganizerrecurrencerule.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> + +#include <QtOrganizer/qorganizerrecurrencerule.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionfetchrequest.cpp b/src/organizer/requests/qorganizercollectionfetchrequest.cpp index 59c9ef613..6b8bbcbc7 100644 --- a/src/organizer/requests/qorganizercollectionfetchrequest.cpp +++ b/src/organizer/requests/qorganizercollectionfetchrequest.cpp @@ -39,10 +39,9 @@ ** ****************************************************************************/ -#include <qorganizercollectionfetchrequest.h> -#include <private/qorganizeritemrequests_p.h> -#include <qorganizercollectionengineid.h> -#include <qorganizeritemengineid.h> +#include "qorganizercollectionfetchrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionfetchrequest.h b/src/organizer/requests/qorganizercollectionfetchrequest.h index 1a17a4a72..8b7bd59d3 100644 --- a/src/organizer/requests/qorganizercollectionfetchrequest.h +++ b/src/organizer/requests/qorganizercollectionfetchrequest.h @@ -42,8 +42,10 @@ #ifndef QORGANIZERCOLLECTIONFETCHREQUEST_H #define QORGANIZERCOLLECTIONFETCHREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizercollection.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionremoverequest.cpp b/src/organizer/requests/qorganizercollectionremoverequest.cpp index 3999b697e..8df3d96f7 100644 --- a/src/organizer/requests/qorganizercollectionremoverequest.cpp +++ b/src/organizer/requests/qorganizercollectionremoverequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizercollectionremoverequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizercollectionremoverequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionremoverequest.h b/src/organizer/requests/qorganizercollectionremoverequest.h index 4283f9b5d..7d40549e4 100644 --- a/src/organizer/requests/qorganizercollectionremoverequest.h +++ b/src/organizer/requests/qorganizercollectionremoverequest.h @@ -42,8 +42,11 @@ #ifndef QORGANIZERCOLLECTIONREMOVEREQUEST_H #define QORGANIZERCOLLECTIONREMOVEREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizercollection.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizercollectionid.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionsaverequest.cpp b/src/organizer/requests/qorganizercollectionsaverequest.cpp index ced3059ce..38e10e836 100644 --- a/src/organizer/requests/qorganizercollectionsaverequest.cpp +++ b/src/organizer/requests/qorganizercollectionsaverequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizercollectionsaverequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizercollectionsaverequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizercollectionsaverequest.h b/src/organizer/requests/qorganizercollectionsaverequest.h index 70bed7c4a..4f16ee2d9 100644 --- a/src/organizer/requests/qorganizercollectionsaverequest.h +++ b/src/organizer/requests/qorganizercollectionsaverequest.h @@ -42,8 +42,11 @@ #ifndef QORGANIZERCOLLECTIONSAVEREQUEST_H #define QORGANIZERCOLLECTIONSAVEREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizercollection.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizercollection.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp b/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp index 474d17455..0d80ed877 100644 --- a/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp +++ b/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemfetchbyidrequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemfetchbyidrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemfetchbyidrequest.h b/src/organizer/requests/qorganizeritemfetchbyidrequest.h index f195ae8bb..5f09f40fe 100644 --- a/src/organizer/requests/qorganizeritemfetchbyidrequest.h +++ b/src/organizer/requests/qorganizeritemfetchbyidrequest.h @@ -42,11 +42,17 @@ #ifndef QORGANIZERITEMFETCHBYIDREQUEST_H #define QORGANIZERITEMFETCHBYIDREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritem.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemFetchHint; + class QOrganizerItemFetchByIdRequestPrivate; /* Leaf class */ diff --git a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp index 449be808b..f8892fffd 100644 --- a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp +++ b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemfetchforexportrequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemfetchforexportrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemfetchforexportrequest.h b/src/organizer/requests/qorganizeritemfetchforexportrequest.h index b20ca2e4a..f88d9d551 100644 --- a/src/organizer/requests/qorganizeritemfetchforexportrequest.h +++ b/src/organizer/requests/qorganizeritemfetchforexportrequest.h @@ -42,11 +42,19 @@ #ifndef QORGANIZERITEMFETCHFOREXPORTREQUEST_H #define QORGANIZERITEMFETCHFOREXPORTREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritem.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemsortorder.h> + +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemFetchHint; +class QOrganizerItemFilter; + class QOrganizerItemFetchForExportRequestPrivate; /* Leaf class */ diff --git a/src/organizer/requests/qorganizeritemfetchrequest.cpp b/src/organizer/requests/qorganizeritemfetchrequest.cpp index c5a5abcf9..5f3d522b8 100644 --- a/src/organizer/requests/qorganizeritemfetchrequest.cpp +++ b/src/organizer/requests/qorganizeritemfetchrequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemfetchrequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemfetchrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemfetchrequest.h b/src/organizer/requests/qorganizeritemfetchrequest.h index 8e5d541e2..60faeb287 100644 --- a/src/organizer/requests/qorganizeritemfetchrequest.h +++ b/src/organizer/requests/qorganizeritemfetchrequest.h @@ -42,11 +42,19 @@ #ifndef QORGANIZERITEMFETCHREQUEST_H #define QORGANIZERITEMFETCHREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritem.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemsortorder.h> + +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemFetchHint; +class QOrganizerItemFilter; + class QOrganizerItemFetchRequestPrivate; /* Leaf class */ diff --git a/src/organizer/requests/qorganizeritemidfetchrequest.cpp b/src/organizer/requests/qorganizeritemidfetchrequest.cpp index 9423f039b..0e9d03250 100644 --- a/src/organizer/requests/qorganizeritemidfetchrequest.cpp +++ b/src/organizer/requests/qorganizeritemidfetchrequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemidfetchrequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemidfetchrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemidfetchrequest.h b/src/organizer/requests/qorganizeritemidfetchrequest.h index 9ad2db0c5..bd48d2a74 100644 --- a/src/organizer/requests/qorganizeritemidfetchrequest.h +++ b/src/organizer/requests/qorganizeritemidfetchrequest.h @@ -42,11 +42,18 @@ #ifndef QORGANIZERITEMIDFETCHREQUEST_H #define QORGANIZERITEMIDFETCHREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritemid.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemsortorder.h> + +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemFilter; + class QOrganizerItemIdFetchRequestPrivate; /* Leaf class */ diff --git a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp index 34188ad45..3a763d8f3 100644 --- a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp +++ b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemoccurrencefetchrequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemoccurrencefetchrequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.h b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.h index 09ff376f1..3cb827564 100644 --- a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.h +++ b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.h @@ -42,11 +42,17 @@ #ifndef QORGANIZERITEMOCCURRENCEFETCHREQUEST_H #define QORGANIZERITEMOCCURRENCEFETCHREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritem.h> +#include <QtCore/qlist.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> + +QT_FORWARD_DECLARE_CLASS(QDateTime) QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItemFetchHint; + class QOrganizerItemOccurrenceFetchRequestPrivate; /* Leaf class */ diff --git a/src/organizer/requests/qorganizeritemremovebyidrequest.cpp b/src/organizer/requests/qorganizeritemremovebyidrequest.cpp index d11351d54..261bc3c08 100644 --- a/src/organizer/requests/qorganizeritemremovebyidrequest.cpp +++ b/src/organizer/requests/qorganizeritemremovebyidrequest.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ - #include "qorganizeritemremovebyidrequest.h" + #include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemremovebyidrequest.h b/src/organizer/requests/qorganizeritemremovebyidrequest.h index 54c1dd3c3..8b0b00d66 100644 --- a/src/organizer/requests/qorganizeritemremovebyidrequest.h +++ b/src/organizer/requests/qorganizeritemremovebyidrequest.h @@ -39,15 +39,14 @@ ** ****************************************************************************/ - #ifndef QORGANIZERITEMREMOVEBYIDREQUEST_H #define QORGANIZERITEMREMOVEBYIDREQUEST_H -#include "qorganizerglobal.h" -#include "qorganizerabstractrequest.h" -#include "qorganizeritemfilter.h" +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QList> +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritemid.h> QT_BEGIN_NAMESPACE_ORGANIZER @@ -79,5 +78,4 @@ private: QT_END_NAMESPACE_ORGANIZER -#endif - +#endif // QORGANIZERITEMREMOVEBYIDREQUEST_H diff --git a/src/organizer/requests/qorganizeritemremoverequest.cpp b/src/organizer/requests/qorganizeritemremoverequest.cpp index 871d0c4ab..a238a791b 100644 --- a/src/organizer/requests/qorganizeritemremoverequest.cpp +++ b/src/organizer/requests/qorganizeritemremoverequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemremoverequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemremoverequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemremoverequest.h b/src/organizer/requests/qorganizeritemremoverequest.h index 867fc9432..aff695be3 100644 --- a/src/organizer/requests/qorganizeritemremoverequest.h +++ b/src/organizer/requests/qorganizeritemremoverequest.h @@ -42,8 +42,11 @@ #ifndef QORGANIZERITEMREMOVEREQUEST_H #define QORGANIZERITEMREMOVEREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritemid.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemrequests.h b/src/organizer/requests/qorganizeritemrequests.h index f816129fd..f372ccad6 100644 --- a/src/organizer/requests/qorganizeritemrequests.h +++ b/src/organizer/requests/qorganizeritemrequests.h @@ -42,20 +42,19 @@ #ifndef QORGANIZERITEMREQUESTS_H #define QORGANIZERITEMREQUESTS_H -#include <qorganizeritemoccurrencefetchrequest.h> -#include <qorganizeritemfetchrequest.h> -#include <qorganizeritemfetchbyidrequest.h> -#include <qorganizeritemfetchforexportrequest.h> -#include <qorganizeritemidfetchrequest.h> -#include <qorganizeritemremoverequest.h> -#include <qorganizeritemremovebyidrequest.h> -#include <qorganizeritemsaverequest.h> -#include <qorganizercollectionfetchrequest.h> -#include <qorganizercollectionremoverequest.h> -#include <qorganizercollectionsaverequest.h> +#include <QtOrganizer/qorganizercollectionfetchrequest.h> +#include <QtOrganizer/qorganizercollectionremoverequest.h> +#include <QtOrganizer/qorganizercollectionsaverequest.h> +#include <QtOrganizer/qorganizeritemfetchrequest.h> +#include <QtOrganizer/qorganizeritemfetchbyidrequest.h> +#include <QtOrganizer/qorganizeritemfetchforexportrequest.h> +#include <QtOrganizer/qorganizeritemidfetchrequest.h> +#include <QtOrganizer/qorganizeritemoccurrencefetchrequest.h> +#include <QtOrganizer/qorganizeritemremoverequest.h> +#include <QtOrganizer/qorganizeritemremovebyidrequest.h> +#include <QtOrganizer/qorganizeritemsaverequest.h> QT_BEGIN_NAMESPACE_ORGANIZER QT_END_NAMESPACE_ORGANIZER #endif // QORGANIZERITEMREQUESTS_H - diff --git a/src/organizer/requests/qorganizeritemrequests_p.h b/src/organizer/requests/qorganizeritemrequests_p.h index fb28e3d28..e705dd8ea 100644 --- a/src/organizer/requests/qorganizeritemrequests_p.h +++ b/src/organizer/requests/qorganizeritemrequests_p.h @@ -53,7 +53,20 @@ // We mean it. // -#include <private/qorganizerabstractrequest_p.h> +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qdatetime.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemfetchhint.h> +#include <QtOrganizer/qorganizeritemfilter.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemsortorder.h> +#include <QtOrganizer/private/qorganizerabstractrequest_p.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemsaverequest.cpp b/src/organizer/requests/qorganizeritemsaverequest.cpp index 519c11ea3..9be237392 100644 --- a/src/organizer/requests/qorganizeritemsaverequest.cpp +++ b/src/organizer/requests/qorganizeritemsaverequest.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <qorganizeritemsaverequest.h> -#include <private/qorganizeritemrequests_p.h> +#include "qorganizeritemsaverequest.h" + +#include "qorganizeritemrequests_p.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/organizer/requests/qorganizeritemsaverequest.h b/src/organizer/requests/qorganizeritemsaverequest.h index 518ef8e36..42f8377f9 100644 --- a/src/organizer/requests/qorganizeritemsaverequest.h +++ b/src/organizer/requests/qorganizeritemsaverequest.h @@ -42,8 +42,12 @@ #ifndef QORGANIZERITEMSAVEREQUEST_H #define QORGANIZERITEMSAVEREQUEST_H -#include <qorganizerabstractrequest.h> -#include <qorganizeritem.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> + +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemdetail.h> QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/contacts/jsondb/qcontactjsondbconverter.cpp b/src/plugins/contacts/jsondb/qcontactjsondbconverter.cpp index 197b27202..8a89f7ce7 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbconverter.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbconverter.cpp @@ -39,37 +39,38 @@ ** ****************************************************************************/ -#include <QList> -#include <QDebug> -#include <QCryptographicHash> -#include <QUuid> -#include <QtCore/qjsonarray.h> +#include "qcontactjsondbconverter.h" -#include "qcontactdetail.h" -#include "qcontacttype.h" -#include "qcontactid.h" -#include "qcontactname.h" -#include "qcontactaddress.h" -#include "qcontactnickname.h" -#include "qcontactemailaddress.h" -#include "qcontactphonenumber.h" -#include "qcontactmanager.h" -#include "qcontactmanagerengine.h" -#include "qcontactid.h" -#include "qcontacturl.h" -#include "qcontactabstractrequest.h" - -#include "qcontactdetailfilter.h" -#include "qcontactchangelogfilter.h" -#include "qcontactactionfilter.h" -#include "qcontactrelationshipfilter.h" -#include "qcontactintersectionfilter.h" -#include "qcontactidfilter.h" +#include <QtCore/qcryptographichash.h> +#include <QtCore/qdebug.h> +#include <QtCore/qjsonarray.h> +#include <QtCore/qlist.h> +#include <QtCore/quuid.h> + +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontacttype.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontactname.h> +#include <QtContacts/qcontactaddress.h> +#include <QtContacts/qcontactnickname.h> +#include <QtContacts/qcontactemailaddress.h> +#include <QtContacts/qcontactphonenumber.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactid.h> +#include <QtContacts/qcontacturl.h> +#include <QtContacts/qcontactabstractrequest.h> + +#include <QtContacts/qcontactactionfilter.h> +#include <QtContacts/qcontactchangelogfilter.h> +#include <QtContacts/qcontactdetailfilter.h> +#include <QtContacts/qcontactidfilter.h> +#include <QtContacts/qcontactintersectionfilter.h> +#include <QtContacts/qcontactrelationshipfilter.h> -#include "qcontactjsondbconverter.h" #include "qcontactjsondbglobal.h" -#include "qcontactjsondbstring.h" #include "qcontactjsondbid.h" +#include "qcontactjsondbstring.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/plugins/contacts/jsondb/qcontactjsondbconverter.h b/src/plugins/contacts/jsondb/qcontactjsondbconverter.h index 13f3d2340..88ebb404e 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbconverter.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbconverter.h @@ -42,13 +42,15 @@ #ifndef QCONTACTJSONDBCONVERTER_H #define QCONTACTJSONDBCONVERTER_H -#include <QHash> +#include <QtCore/qhash.h> + #include <QtJsonDb/qjsondbrequest.h> -#include "qcontact.h" +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactfilter.h> + #include "qcontactjsondbengine.h" -#include "qcontactabstractrequest.h" -#include "qcontactfilter.h" QT_USE_NAMESPACE_JSONDB diff --git a/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp b/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp index 5a2989637..ef5f482a0 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp @@ -38,18 +38,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QVariantMap> -#include <QEventLoop> #include "qcontactjsondbengine.h" + +#include <QtCore/qdebug.h> +#include <QtCore/qeventloop.h> +#include <QtCore/qthread.h> + #include "qcontactjsondbconverter.h" #include "qcontactjsondbglobal.h" #include "qcontactjsondbstring.h" #include "qcontactjsondbrequesthandler.h" -#include <QDebug> -#include <QEventLoop> - QT_BEGIN_NAMESPACE_CONTACTS /* diff --git a/src/plugins/contacts/jsondb/qcontactjsondbengine.h b/src/plugins/contacts/jsondb/qcontactjsondbengine.h index 9e1cbeda6..c70db93fe 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbengine.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbengine.h @@ -53,18 +53,19 @@ // We mean it. // -#include <QMap> -#include <QString> -#include <QList> -#include <QQueue> -#include <QDebug> -#include <QVariantList> - -#include <qcontacts.h> -#include <qcontactmanager.h> -#include <private/qcontactmanager_p.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qqueue.h> +#include <QtCore/qvariant.h> + +#include <QtContacts/qcontacts.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/private/qcontactmanager_p.h> + #include "qcontactjsondbstring.h" +QT_FORWARD_DECLARE_CLASS(QThread) + QT_BEGIN_NAMESPACE_CONTACTS class QContactJsonDbRequestHandler; diff --git a/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.cpp b/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.cpp index 3b9d35aea..48b8d639b 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.cpp @@ -38,7 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include "qcontactjsondbengine.h" + #include "qcontactjsondbenginefactory.h" #include "qcontactjsondbid.h" diff --git a/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.h b/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.h index 0317adecd..1c26a79bf 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbenginefactory.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTJSONDBENGINEFACTORY_H #define QCONTACTJSONDBENGINEFACTORY_H @@ -54,8 +53,9 @@ // We mean it. // -#include "qcontact.h" -#include "qcontactmanagerenginefactory.h" +#include <QtContacts/qcontactengineid.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerenginefactory.h> QT_BEGIN_NAMESPACE_CONTACTS @@ -75,5 +75,4 @@ class Q_DECL_EXPORT QContactJsonDbEngineFactory : public QContactManagerEngineFa QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTJSONDBENGINEFACTORY_H diff --git a/src/plugins/contacts/jsondb/qcontactjsondbid.cpp b/src/plugins/contacts/jsondb/qcontactjsondbid.cpp index 6fd534998..f97d5e560 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbid.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbid.cpp @@ -38,8 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QUuid> + #include "qcontactjsondbid.h" + +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + #include "qcontactjsondbstring.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/plugins/contacts/jsondb/qcontactjsondbid.h b/src/plugins/contacts/jsondb/qcontactjsondbid.h index 0923ee606..14032e9c4 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbid.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbid.h @@ -53,13 +53,12 @@ // We mean it. // -#include <qcontactengineid.h> -#include <qcontactid.h> -#include <qcontactabstractrequest.h> - -#include <QtCore/qdebug.h> #include <QtCore/quuid.h> +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactengineid.h> +#include <QtContacts/qcontactid.h> + QT_BEGIN_NAMESPACE_CONTACTS class QContactJsonDbId : public QContactEngineId @@ -95,4 +94,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif +#endif // QCONTACTJSONDBID_H diff --git a/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.cpp b/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.cpp index 22d61a512..da35e70a3 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.cpp @@ -38,24 +38,24 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QCoreApplication> -#include "qcontact.h" #include "qcontactjsondbrequesthandler.h" -#include "qcontactjsondbengine.h" -#include "qcontactjsondbrequestmanager.h" -#include "qcontactjsondbconverter.h" -#include "qcontactjsondbid.h" -#include "qcontactjsondbglobal.h" -#include "qcontactjsondbstring.h" + +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdebug.h> +#include <QtCore/qtimer.h> #include <QtJsonDb/qjsondbreadrequest.h> #include <QtJsonDb/qjsondbwriterequest.h> -#include <QDebug> -#include <QString> -#include <QMap> -#include <QTimer> +#include <QtContacts/qcontact.h> + +#include "qcontactjsondbconverter.h" +#include "qcontactjsondbengine.h" +#include "qcontactjsondbglobal.h" +#include "qcontactjsondbid.h" +#include "qcontactjsondbrequestmanager.h" +#include "qcontactjsondbstring.h" QT_BEGIN_NAMESPACE_CONTACTS @@ -347,7 +347,7 @@ void QContactJsonDbRequestHandler::handleContactFetchRequest(QContactFetchReques void QContactJsonDbRequestHandler::handleContactFetchByIdRequest(QContactFetchByIdRequest* req) { QContactManager::Error error = QContactManager::NoError; - QMap<int, QtContacts::QContactManager::Error> errorMap; + QMap<int, QContactManager::Error> errorMap; QList<QContact> emptyContactList; QString newJsonDbQuery; m_requestMgr->addRequest(req); @@ -1085,10 +1085,6 @@ void QContactJsonDbPartitionWatcher::onJsonDbWatcherError(QtJsonDb::QJsonDbWatch qCritical()<<Q_FUNC_INFO<<"error"<<error<<"message"<<message; } - - - - #include "moc_qcontactjsondbrequesthandler.cpp" QT_END_NAMESPACE_CONTACTS diff --git a/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.h b/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.h index 6865b9f12..e2e8a09a2 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbrequesthandler.h @@ -42,26 +42,27 @@ #ifndef QCONTACTJSONDBREQUESTHANDLER_H #define QCONTACTJSONDBREQUESTHANDLER_H -#include <QThread> -#include <QMutex> -#include <QWaitCondition> +#include <QtCore/qmap.h> +#include <QtCore/qmutex.h> +#include <QtCore/qthread.h> +#include <QtCore/qwaitcondition.h> + #include <QtJsonDb/qjsondbconnection.h> #include <QtJsonDb/qjsondbwatcher.h> #include <QtJsonDb/qjsondbrequest.h> -#include <qcontactabstractrequest.h> -#include <qcontactsaverequest.h> -#include <qcontactfetchrequest.h> -#include <qcontactidfetchrequest.h> -#include <qcontactremoverequest.h> -#include <qcontact.h> -#include <qcontactchangeset.h> -#include <qcontactmanager.h> -#include "qcontactjsondbrequestmanager.h" -QT_BEGIN_NAMESPACE -class QTimer; -QT_END_NAMESPACE +#include <QtContacts/qcontactabstractrequest.h> +#include <QtContacts/qcontactsaverequest.h> +#include <QtContacts/qcontactfetchrequest.h> +#include <QtContacts/qcontactidfetchrequest.h> +#include <QtContacts/qcontactremoverequest.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactchangeset.h> +#include <QtContacts/qcontactmanager.h> + +#include "qcontactjsondbrequestmanager.h" +QT_FORWARD_DECLARE_CLASS(QTimer) QT_USE_NAMESPACE_JSONDB diff --git a/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.cpp b/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.cpp index 0aca7592c..955a93ae4 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.cpp @@ -39,13 +39,11 @@ ** ****************************************************************************/ -#include <QDebug> -#include <QMutexLocker> - -#include <QThread> - #include "qcontactjsondbrequestmanager.h" +#include <QtCore/qdebug.h> +#include <QtCore/qthread.h> + QT_BEGIN_NAMESPACE_CONTACTS QContactJsonDbRequestManager::QContactJsonDbRequestManager() diff --git a/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.h b/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.h index aff02a815..134495b82 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbrequestmanager.h @@ -52,16 +52,17 @@ // We mean it. // -#include <QObject> -#include <QMap> -#include <QMutex> -#include <QWaitCondition> +#include <QtCore/qmap.h> +#include <QtCore/qmutex.h> +#include <QtCore/qobject.h> +#include <QtCore/qwaitcondition.h> + #include <QtJsonDb/qjsondbconnection.h> #include <QtJsonDb/qjsondbwatcher.h> #include <QtJsonDb/qjsondbrequest.h> -#include "qcontact.h" -#include "qcontactrequests.h" +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactrequests.h> QT_USE_NAMESPACE_JSONDB diff --git a/src/plugins/contacts/jsondb/qcontactjsondbstring.cpp b/src/plugins/contacts/jsondb/qcontactjsondbstring.cpp index 24975bf14..0c18483a0 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbstring.cpp +++ b/src/plugins/contacts/jsondb/qcontactjsondbstring.cpp @@ -39,4 +39,4 @@ ** ****************************************************************************/ -#include <qcontactjsondbstring.h> +#include "qcontactjsondbstring.h" diff --git a/src/plugins/contacts/jsondb/qcontactjsondbstring.h b/src/plugins/contacts/jsondb/qcontactjsondbstring.h index 0071dc962..2e3bb7c92 100644 --- a/src/plugins/contacts/jsondb/qcontactjsondbstring.h +++ b/src/plugins/contacts/jsondb/qcontactjsondbstring.h @@ -42,8 +42,9 @@ #ifndef QCONTACTJSONDBSTRING_H #define QCONTACTJSONDBSTRING_H +#include <QtCore/qstring.h> + #include <QtContacts/qcontactsglobal.h> -#include <QString> QT_BEGIN_NAMESPACE_CONTACTS diff --git a/src/plugins/contacts/memory/qcontactmemorybackend.cpp b/src/plugins/contacts/memory/qcontactmemorybackend.cpp index ec961a4e5..5a8705e54 100644 --- a/src/plugins/contacts/memory/qcontactmemorybackend.cpp +++ b/src/plugins/contacts/memory/qcontactmemorybackend.cpp @@ -39,20 +39,19 @@ ** ****************************************************************************/ -#include "qcontactmanager.h" - -#include <QContactManagerEngine> -#include <QContactAbstractRequest> -#include <QContactChangeSet> -#include <QContactTimestamp> -#include <QContactIdFilter> -#include <qcontactrequests.h> #include "qcontactmemorybackend_p.h" +#ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> +#endif +#include <QtCore/qpointer.h> #include <QtCore/qstringbuilder.h> #include <QtCore/quuid.h> +#include <QtContacts/qcontactidfilter.h> +#include <QtContacts/qcontactrequests.h> +#include <QtContacts/qcontacttimestamp.h> + QT_BEGIN_NAMESPACE_CONTACTS QContactManagerEngine* QContactMemoryEngineFactory::engine(const QMap<QString, QString> ¶meters, QContactManager::Error *error) @@ -1012,8 +1011,6 @@ uint QContactMemoryEngineId::hash() const return m_contactId; } - #include "moc_qcontactmemorybackend_p.cpp" QT_END_NAMESPACE_CONTACTS - diff --git a/src/plugins/contacts/memory/qcontactmemorybackend_p.h b/src/plugins/contacts/memory/qcontactmemorybackend_p.h index 9940d4cdd..680deb9fe 100644 --- a/src/plugins/contacts/memory/qcontactmemorybackend_p.h +++ b/src/plugins/contacts/memory/qcontactmemorybackend_p.h @@ -54,19 +54,15 @@ // We mean it. // -#include <QContact> -#include <QContactManager> -#include <QContactManagerEngine> -#include <QContactAbstractRequest> -#include <QContactChangeSet> -#include <qcontactengineid.h> -#include <qcontactmanagerenginefactory.h> - +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactchangeset.h> +#include <QtContacts/qcontactengineid.h> +#include <QtContacts/qcontactmanagerenginefactory.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContactAbstractRequest; -class QContactManagerEngine; class QContactMemoryEngine; class QContactMemoryEngineFactory : public QContactManagerEngineFactory @@ -243,5 +239,4 @@ private: QT_END_NAMESPACE_CONTACTS -#endif - +#endif // QCONTACTMEMORYBACKEND_P_H diff --git a/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.cpp b/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.cpp index 66c3f32f2..86600aaae 100644 --- a/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.cpp +++ b/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.cpp @@ -39,17 +39,15 @@ ** ****************************************************************************/ - #include "qcontactactionservicemanager_p.h" -#include "qcontactaction.h" -#include "qcontactactiondescriptor.h" -#include "qcontactactionfactory.h" +#include <QtContacts/qcontactaction.h> +#include <QtContacts/qcontactactiondescriptor.h> +#include <QtContacts/qcontactactionfactory.h> +#include "qservice.h" #include "qservicemanager.h" -#include <QMutexLocker> - QTM_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QContactActionServiceManager, contactActionServiceManagerInstance) diff --git a/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.h b/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.h index 5c3b43558..8fdae96ae 100644 --- a/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.h +++ b/src/plugins/contacts/serviceactionmanager/qcontactactionservicemanager_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QCONTACTACTIONSERVICEMANAGER_P_H #define QCONTACTACTIONSERVICEMANAGER_P_H @@ -54,14 +53,12 @@ // We mean it. // -#include <QMultiHash> -#include <QHash> -#include <QMutex> +#include <QtCore/qhash.h> +#include <QtCore/qmutex.h> -#include "qservice.h" -#include "qservicemanager.h" +#include <QtContacts/private/qcontactactionmanager_p.h> -#include "qcontactactionmanager_p.h" +#include "qservicemanager.h" QTM_BEGIN_NAMESPACE @@ -99,5 +96,4 @@ private: QTM_END_NAMESPACE -#endif - +#endif // QCONTACTACTIONSERVICEMANAGER_P_H diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbconverter.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbconverter.cpp index 752f1de5c..035505c68 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbconverter.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbconverter.cpp @@ -40,13 +40,15 @@ ****************************************************************************/ #include "qorganizerjsondbconverter.h" -#include "qorganizerjsondbid.h" -#include "qorganizerjsondbstring.h" -#include "qorganizerjsondbengine.h" + +#include <QtCore/qjsonarray.h> + #include <QtOrganizer/qorganizermanagerengine.h> #include <QtOrganizer/qorganizeritemfilters.h> -#include <QtCore/qjsonarray.h> +#include "qorganizerjsondbengine.h" +#include "qorganizerjsondbid.h" +#include "qorganizerjsondbstring.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbconverter.h b/src/plugins/organizer/jsondb/qorganizerjsondbconverter.h index 28db326e3..f99b1b628 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbconverter.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbconverter.h @@ -53,8 +53,6 @@ // We mean it. // -#include "qorganizerjsondbengine.h" - #include <QtOrganizer/qorganizerabstractrequest.h> #include <QtOrganizer/qorganizermanager.h> #include <QtOrganizer/qorganizeritemdetails.h> @@ -65,6 +63,8 @@ #include <QtJsonDb/qjsondbreadrequest.h> #include <QtJsonDb/qjsondbwriterequest.h> +#include "qorganizerjsondbengine.h" + QT_USE_NAMESPACE_JSONDB QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.cpp index 048ebf6a9..9094dfdee 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.cpp @@ -40,13 +40,15 @@ ****************************************************************************/ #include "qorganizerjsondbdatastorage.h" -#include "qorganizerjsondbid.h" -#include "qorganizerjsondbstring.h" + +#include <QtCore/qdebug.h> +#include <QtCore/qmutex.h> #include <QtOrganizer/qorganizeritemcollectionfilter.h> #include <QtOrganizer/qorganizermanagerengine.h> -#include <QtCore/qmutex.h> +#include "qorganizerjsondbid.h" +#include "qorganizerjsondbstring.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.h b/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.h index 05692d743..0e9161741 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbdatastorage.h @@ -53,13 +53,13 @@ // We mean it. // -#include "qorganizerjsondbconverter.h" +#include <QtCore/qthread.h> +#include <QtCore/qwaitcondition.h> #include <QtJsonDb/qjsondbconnection.h> #include <QtJsonDb/qjsondbwatcher.h> -#include <QtCore/qthread.h> -#include <QtCore/qwaitcondition.h> +#include "qorganizerjsondbconverter.h" QT_USE_NAMESPACE_JSONDB diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp index fabe2b34d..5cd1d86e8 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp @@ -40,14 +40,16 @@ ****************************************************************************/ #include "qorganizerjsondbengine.h" -#include "qorganizerjsondbrequestthread.h" -#include "qorganizerjsondbstring.h" - -#include <QtOrganizer/qorganizeritemdetails.h> #include <QtCore/qeventloop.h> + #include <QtNetwork/qabstractsocket.h> +#include <QtOrganizer/qorganizeritemdetails.h> + +#include "qorganizerjsondbrequestthread.h" +#include "qorganizerjsondbstring.h" + QT_BEGIN_NAMESPACE_ORGANIZER QOrganizerJsonDbEngine::QOrganizerJsonDbEngine(QOrganizerManager::Error *error) diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbengine.h b/src/plugins/organizer/jsondb/qorganizerjsondbengine.h index 6da2228eb..d124b941e 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbengine.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbengine.h @@ -183,4 +183,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QOrganizerJsonDbEngine::StorageLocations) QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QORGANIZERJSONDBENGINE_H diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.cpp index f31eaaded..cff391daf 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qorganizerjsondbenginefactory.h" + #include "qorganizerjsondbengine.h" #include "qorganizerjsondbid.h" #include "qorganizerjsondbstring.h" diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.h b/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.h index 6d013e87f..07daff854 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbenginefactory.h @@ -71,4 +71,4 @@ public: QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QORGANIZERJSONDBENGINEFACTORY_H diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbid.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbid.cpp index 7b23e93b8..b3c0a2ac8 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbid.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbid.cpp @@ -40,6 +40,11 @@ ****************************************************************************/ #include "qorganizerjsondbid.h" + +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + #include "qorganizerjsondbstring.h" QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbid.h b/src/plugins/organizer/jsondb/qorganizerjsondbid.h index 065267a81..9552e6f82 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbid.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbid.h @@ -53,13 +53,11 @@ // We mean it. // -#include "qorganizerjsondbengine.h" - #include <QtOrganizer/qorganizerabstractrequest.h> #include <QtOrganizer/qorganizeritemengineid.h> #include <QtOrganizer/qorganizercollectionengineid.h> -#include <QtCore/qdebug.h> +#include "qorganizerjsondbengine.h" QT_BEGIN_NAMESPACE_ORGANIZER @@ -142,4 +140,4 @@ private: QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QORGANIZERJSONDBID_H diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbrequestmanager.h b/src/plugins/organizer/jsondb/qorganizerjsondbrequestmanager.h index a260cf38c..a79acc46a 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbrequestmanager.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbrequestmanager.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtOrganizer/qorganizerabstractrequest.h> - #include <QtCore/qwaitcondition.h> +#include <QtOrganizer/qorganizerabstractrequest.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerJsonDbRequestData; diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.cpp index d02465edc..8a342ff5f 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.cpp +++ b/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.cpp @@ -40,14 +40,6 @@ ****************************************************************************/ #include "qorganizerjsondbrequestthread.h" -#include "qorganizerjsondbrequestmanager.h" -#include "qorganizerjsondbdatastorage.h" -#include "qorganizerjsondbstring.h" -#include "qorganizerjsondbid.h" - -#include <QtOrganizer/qorganizeritems.h> -#include <QtOrganizer/qorganizeritemcollectionfilter.h> -#include <QtOrganizer/qorganizeritemunionfilter.h> #include <QtCore/qdebug.h> #include <QtCore/qeventloop.h> @@ -55,6 +47,15 @@ #include <QtCore/qtimer.h> #include <QtCore/quuid.h> +#include <QtOrganizer/qorganizeritems.h> +#include <QtOrganizer/qorganizeritemcollectionfilter.h> +#include <QtOrganizer/qorganizeritemunionfilter.h> + +#include "qorganizerjsondbdatastorage.h" +#include "qorganizerjsondbid.h" +#include "qorganizerjsondbrequestmanager.h" +#include "qorganizerjsondbstring.h" + QT_BEGIN_NAMESPACE_ORGANIZER const int QOrganizerJsonDbRequestThread::TIMEOUT_INTERVAL(100); diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.h b/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.h index f1f2a3c9a..477d98ae5 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbrequestthread.h @@ -53,18 +53,16 @@ // We mean it. // -#include "qorganizerjsondbengine.h" +#include <QtCore/qthread.h> #include <QtOrganizer/qorganizercollectionchangeset.h> #include <QtOrganizer/qorganizeritemchangeset.h> #include <QtOrganizer/qorganizeritemrequests.h> -#include <QtCore/qthread.h> +#include "qorganizerjsondbengine.h" -QT_BEGIN_NAMESPACE -class QMutex; -class QTimer; -QT_END_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QMutex) +QT_FORWARD_DECLARE_CLASS(QTimer) QT_BEGIN_NAMESPACE_ORGANIZER diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbstring.h b/src/plugins/organizer/jsondb/qorganizerjsondbstring.h index ef4552a4a..c9cb262d1 100644 --- a/src/plugins/organizer/jsondb/qorganizerjsondbstring.h +++ b/src/plugins/organizer/jsondb/qorganizerjsondbstring.h @@ -53,10 +53,10 @@ // We mean it. // -#include <QtOrganizer/qorganizerglobal.h> - #include <QtCore/qstring.h> +#include <QtOrganizer/qorganizerglobal.h> + QT_BEGIN_NAMESPACE_ORGANIZER class QOrganizerJsonDbStr diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp index 2d5e467bd..aa3744056 100644 --- a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp +++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp @@ -40,13 +40,16 @@ ****************************************************************************/ #include "qorganizeritemmemorybackend_p.h" -#include <qorganizeritemrecurrence.h> -#include <qorganizeritems.h> -#include <qorganizeritemdetails.h> -#include <qorganizeritemfilters.h> -#include <qorganizeritemrequests.h> +#include <QtOrganizer/qorganizeritemrecurrence.h> +#include <QtOrganizer/qorganizeritems.h> +#include <QtOrganizer/qorganizeritemdetails.h> +#include <QtOrganizer/qorganizeritemfilters.h> +#include <QtOrganizer/qorganizeritemrequests.h> + +#ifndef QT_NO_DEBUG_STREAM #include <QtCore/qdebug.h> +#endif #include <QtCore/qstringbuilder.h> #include <QtCore/quuid.h> diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend_p.h b/src/plugins/organizer/memory/qorganizeritemmemorybackend_p.h index 7c162f350..bcca8f84a 100644 --- a/src/plugins/organizer/memory/qorganizeritemmemorybackend_p.h +++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include <qorganizeritemengineid.h> -#include <qorganizercollectionengineid.h> -#include <qorganizermanagerengine.h> -#include <qorganizermanagerenginefactory.h> -#include <qorganizercollectionchangeset.h> -#include <qorganizeritemchangeset.h> -#include <qorganizerrecurrencerule.h> +#include <QtOrganizer/qorganizeritemengineid.h> +#include <QtOrganizer/qorganizercollectionengineid.h> +#include <QtOrganizer/qorganizermanagerengine.h> +#include <QtOrganizer/qorganizermanagerenginefactory.h> +#include <QtOrganizer/qorganizercollectionchangeset.h> +#include <QtOrganizer/qorganizeritemchangeset.h> +#include <QtOrganizer/qorganizerrecurrencerule.h> QT_BEGIN_NAMESPACE_ORGANIZER @@ -290,4 +290,4 @@ private: QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QCONTACTMEMORYBACKEND_P_H diff --git a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp index 216c8f8c4..16787c9a0 100644 --- a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp +++ b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp @@ -41,6 +41,10 @@ #include "qorganizerskeleton_p.h" +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif + QT_BEGIN_NAMESPACE_ORGANIZER QOrganizerManagerEngine* QOrganizerItemSkeletonFactory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error) diff --git a/src/plugins/organizer/skeleton/qorganizerskeleton_p.h b/src/plugins/organizer/skeleton/qorganizerskeleton_p.h index 1cc9fa9d8..58a264249 100644 --- a/src/plugins/organizer/skeleton/qorganizerskeleton_p.h +++ b/src/plugins/organizer/skeleton/qorganizerskeleton_p.h @@ -53,24 +53,23 @@ // We mean it. // -#include <QSharedData> -#include <QMap> -#include <QMultiMap> -#include <QList> -#include <QQueue> -#include <QPair> -#include <QSet> -#include <QDateTime> -#include <QString> -#include <QObject> - -#include <qorganizeritem.h> -#include <qorganizermanager.h> -#include <qorganizermanagerengine.h> -#include <qorganizermanagerenginefactory.h> -#include <qorganizerabstractrequest.h> -#include <qorganizeritemengineid.h> -#include <qorganizercollectionengineid.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qpair.h> +#include <QtCore/qqueue.h> +#include <QtCore/qset.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstring.h> + +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizermanager.h> +#include <QtOrganizer/qorganizermanagerengine.h> +#include <QtOrganizer/qorganizermanagerenginefactory.h> +#include <QtOrganizer/qorganizerabstractrequest.h> +#include <QtOrganizer/qorganizeritemengineid.h> +#include <QtOrganizer/qorganizercollectionengineid.h> QT_BEGIN_NAMESPACE_ORGANIZER @@ -228,4 +227,4 @@ private: QT_END_NAMESPACE_ORGANIZER -#endif +#endif // QORGANIZERSKELETON_P_H diff --git a/src/plugins/versit/backuphandler/backupvcardhandler.cpp b/src/plugins/versit/backuphandler/backupvcardhandler.cpp index a8888c72e..f301a039e 100644 --- a/src/plugins/versit/backuphandler/backupvcardhandler.cpp +++ b/src/plugins/versit/backuphandler/backupvcardhandler.cpp @@ -39,15 +39,20 @@ ** ****************************************************************************/ -#include <QList> -#include <QString> -#include <QTextStream> -#include <QUrl> #include "backupvcardhandler.h" -#include <qcontact.h> -#include <qcontactdetail.h> -#include <qversitdocument.h> -#include <qversitproperty.h> + +#include <QtCore/qdatastream.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qvariant.h> +#include <QtCore/qurl.h> + +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactextendeddetail.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/private/qvcardrestorehandler_p.h> /* When these conditions are satisfied, QStringLiteral is implemented by @@ -62,8 +67,9 @@ # define QStringLiteral QLatin1String #endif -QT_BEGIN_NAMESPACE_VERSIT +QTCONTACTS_USE_NAMESPACE +QT_BEGIN_NAMESPACE_VERSIT /* See QVersitContactImporter::createBackupHandler() */ class BackupVCardHandler : public QVersitContactHandler @@ -266,4 +272,6 @@ void BackupVCardHandler::contactProcessed( mDetailNumber = 0; } +#include "moc_backupvcardhandler.cpp" + QT_END_NAMESPACE_VERSIT diff --git a/src/plugins/versit/backuphandler/backupvcardhandler.h b/src/plugins/versit/backuphandler/backupvcardhandler.h index dbf62fec7..2f9aec719 100644 --- a/src/plugins/versit/backuphandler/backupvcardhandler.h +++ b/src/plugins/versit/backuphandler/backupvcardhandler.h @@ -42,10 +42,9 @@ #ifndef TESTVCARDHANDLER_H #define TESTVCARDHANDLER_H -#include <QObject> -#include <QtPlugin> -#include <qversitcontacthandler.h> -#include <private/qvcardrestorehandler_p.h> +#include <QtCore/qplugin.h> + +#include <QtVersit/qversitcontacthandler.h> QT_BEGIN_NAMESPACE_VERSIT @@ -62,8 +61,6 @@ public: virtual QStringList keys() const; }; -#include "moc_backupvcardhandler.cpp" - QT_END_NAMESPACE_VERSIT -#endif +#endif // TESTVCARDHANDLER_H diff --git a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp index e8cead63b..e711e5a11 100644 --- a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp +++ b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp @@ -40,8 +40,17 @@ ****************************************************************************/ #include "vcardpreserver.h" -#include <qversitproperty.h> -#include <QContactExtendedDetail> + +#include <QtCore/qdatetime.h> +#include <QtCore/qvariant.h> +#include <QtCore/qurl.h> + +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> +#include <QtContacts/qcontactextendeddetail.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> /* When these conditions are satisfied, QStringLiteral is implemented by @@ -56,6 +65,8 @@ # define QStringLiteral QLatin1String #endif +QTCONTACTS_USE_NAMESPACE + QT_BEGIN_NAMESPACE_VERSIT class VCardPreserver : public QVersitContactHandler diff --git a/src/plugins/versit/vcardpreserver/vcardpreserver.h b/src/plugins/versit/vcardpreserver/vcardpreserver.h index 66ffc9330..5d5a5a5ba 100644 --- a/src/plugins/versit/vcardpreserver/vcardpreserver.h +++ b/src/plugins/versit/vcardpreserver/vcardpreserver.h @@ -42,9 +42,9 @@ #ifndef VCARDPRESERVER_H #define VCARDPRESERVER_H -#include <QObject> -#include <QtPlugin> -#include <qversitcontacthandler.h> +#include <QtCore/qplugin.h> + +#include <QtVersit/qversitcontacthandler.h> QT_BEGIN_NAMESPACE_VERSIT @@ -63,4 +63,4 @@ public: QT_END_NAMESPACE_VERSIT -#endif +#endif // VCARDPRESERVER_H diff --git a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp index 7e87a45c3..6b8e675d9 100644 --- a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp +++ b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp @@ -39,20 +39,23 @@ ** ****************************************************************************/ -#include "qtcontacts.h" -#include "qcontacttag.h" -#include "qversitreader.h" -#include "qversitcontactimporter.h" -#include "qversitwriter.h" -#include "qversitcontactexporter.h" -#include "qversitdocument.h" -#include "qversitproperty.h" -#include "qversitresourcehandler.h" -#include <QCoreApplication> -#include <QBuffer> -#include <QList> -#include <QFile> +#include <QtCore/qbuffer.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qfile.h> +#include <QtCore/qlist.h> +#include <QtContacts/qtcontacts.h> +#include <QtContacts/qcontacttag.h> + +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitwriter.h> +#include <QtVersit/qversitcontactexporter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/qversitresourcehandler.h> + +QCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE void completeExample(); diff --git a/src/versit/qvcard21writer.cpp b/src/versit/qvcard21writer.cpp index 8a16e484b..47af3bf27 100644 --- a/src/versit/qvcard21writer.cpp +++ b/src/versit/qvcard21writer.cpp @@ -41,7 +41,10 @@ #include "qvcard21writer_p.h" -#include <QTextCodec> +#include <QtCore/qtextcodec.h> +#include <QtCore/qvariant.h> + +#include "qversitproperty.h" QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qvcard21writer_p.h b/src/versit/qvcard21writer_p.h index 48159630f..b10cd21b8 100644 --- a/src/versit/qvcard21writer_p.h +++ b/src/versit/qvcard21writer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qversitdocumentwriter_p.h" +#include <QtVersit/private/qversitdocumentwriter_p.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qvcard30writer.cpp b/src/versit/qvcard30writer.cpp index 3f0ca7bd4..924ef69d2 100644 --- a/src/versit/qvcard30writer.cpp +++ b/src/versit/qvcard30writer.cpp @@ -40,9 +40,13 @@ ****************************************************************************/ #include "qvcard30writer_p.h" + +#include <QtCore/qbuffer.h> +#include <QtCore/qtextcodec.h> +#include <QtCore/qvariant.h> + +#include "qversitproperty.h" #include "qversitutils_p.h" -#include <QTextCodec> -#include <QBuffer> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qvcard30writer_p.h b/src/versit/qvcard30writer_p.h index 399b553d1..173d0bab8 100644 --- a/src/versit/qvcard30writer_p.h +++ b/src/versit/qvcard30writer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qversitdocumentwriter_p.h" +#include <QtVersit/private/qversitdocumentwriter_p.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qvcardrestorehandler_p.cpp b/src/versit/qvcardrestorehandler_p.cpp index 229c0f30a..b66ff2a7d 100644 --- a/src/versit/qvcardrestorehandler_p.cpp +++ b/src/versit/qvcardrestorehandler_p.cpp @@ -40,11 +40,12 @@ ****************************************************************************/ #include "qvcardrestorehandler_p.h" -#include <qcontactdetail.h> + +#include <QtCore/qdatastream.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qurl.h> + #include "qversitproperty.h" -#include <QList> -#include <QDateTime> -#include <QUrl> /* When these conditions are satisfied, QStringLiteral is implemented by diff --git a/src/versit/qvcardrestorehandler_p.h b/src/versit/qvcardrestorehandler_p.h index 6e600995b..fda3a5cd2 100644 --- a/src/versit/qvcardrestorehandler_p.h +++ b/src/versit/qvcardrestorehandler_p.h @@ -42,12 +42,28 @@ #ifndef QVCARDRESTOREHANDLER_P_H #define QVCARDRESTOREHANDLER_P_H -#include <qversitglobal.h> -#include <qcontactdetail.h> -#include <qcontact.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> + +#include <QtVersit/qversitglobal.h> + +#include <QtContacts/qcontactdetail.h> + QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT + class QVersitProperty; // This is a map from Versit group names to the details that were generated from properties with the @@ -93,4 +109,4 @@ private: QT_END_NAMESPACE_VERSIT -#endif +#endif // QVCARDRESTOREHANDLER_P_H diff --git a/src/versit/qversitcontactexporter.cpp b/src/versit/qversitcontactexporter.cpp index fa798a46f..6465e5ad6 100644 --- a/src/versit/qversitcontactexporter.cpp +++ b/src/versit/qversitcontactexporter.cpp @@ -39,13 +39,9 @@ ** ****************************************************************************/ - -#include <qversitcontactexporter.h> +#include "qversitcontactexporter.h" #include "qversitcontactexporter_p.h" -#include <qcontact.h> -#include <qcontactdetail.h> - QT_BEGIN_NAMESPACE_VERSIT /*! diff --git a/src/versit/qversitcontactexporter.h b/src/versit/qversitcontactexporter.h index a5e6fd503..fc0833762 100644 --- a/src/versit/qversitcontactexporter.h +++ b/src/versit/qversitcontactexporter.h @@ -42,10 +42,17 @@ #ifndef QVERSITCONTACTEXPORTER_H #define QVERSITCONTACTEXPORTER_H -#include <qversitresourcehandler.h> -#include <qversitdocument.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <qcontact.h> +#include <QtContacts/qcontact.h> + +#include <QtVersit/qversitresourcehandler.h> +#include <QtVersit/qversitdocument.h> + +QT_BEGIN_NAMESPACE_CONTACTS +class QContactDetail; +QT_END_NAMESPACE_CONTACTS QTCONTACTS_USE_NAMESPACE diff --git a/src/versit/qversitcontactexporter_p.cpp b/src/versit/qversitcontactexporter_p.cpp index 6c36cd3aa..85458d6b9 100644 --- a/src/versit/qversitcontactexporter_p.cpp +++ b/src/versit/qversitcontactexporter_p.cpp @@ -39,19 +39,21 @@ ** ****************************************************************************/ -#include <qversitcontactexporter.h> +#include "qversitcontactexporter.h" #include "qversitcontactexporter_p.h" + +#include <QtCore/qdebug.h> +#include <QtCore/qurl.h> + +#include <QtContacts/qcontactdetail.h> + #include "qversitcontactimporter_p.h" #include "qversitcontactsdefs_p.h" #include "qversitutils_p.h" - -#include <qcontact.h> -#include <qcontactdetails.h> #include "qversitcontacthandler.h" #include "qversitcontactpluginloader_p.h" -#include <QUrl> -#include <QBuffer> +QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitcontactexporter_p.h b/src/versit/qversitcontactexporter_p.h index 1fe015e6a..b735d404e 100644 --- a/src/versit/qversitcontactexporter_p.h +++ b/src/versit/qversitcontactexporter_p.h @@ -53,11 +53,12 @@ // We mean it. // -#include <qversitdocument.h> -#include <qversitproperty.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <QHash> -#include <QObject> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_CONTACTS class QContact; @@ -67,6 +68,7 @@ QT_END_NAMESPACE_CONTACTS QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT + class QVersitContactHandler; class QVersitContactExporterPrivate diff --git a/src/versit/qversitcontacthandler.h b/src/versit/qversitcontacthandler.h index e84d493f5..3e02f6244 100644 --- a/src/versit/qversitcontacthandler.h +++ b/src/versit/qversitcontacthandler.h @@ -42,9 +42,11 @@ #ifndef QVERSITCONTACTHANDLER_H #define QVERSITCONTACTHANDLER_H -#include <QFactoryInterface> -#include <qversitcontactimporter.h> -#include <qversitcontactexporter.h> +#include <QtCore/qfactoryinterface.h> +#include <QtCore/qset.h> + +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitcontactexporter.h> QT_BEGIN_NAMESPACE_VERSIT @@ -91,4 +93,4 @@ public: }; QT_END_NAMESPACE_VERSIT -#endif +#endif // QVERSITCONTACTHANDLER_H diff --git a/src/versit/qversitcontactimporter.cpp b/src/versit/qversitcontactimporter.cpp index 63e99eeb0..16f24a39c 100644 --- a/src/versit/qversitcontactimporter.cpp +++ b/src/versit/qversitcontactimporter.cpp @@ -39,11 +39,8 @@ ** ****************************************************************************/ -#include <qcontactmanagerengine.h> -#include <qversitcontactimporter.h> +#include "qversitcontactimporter.h" #include "qversitcontactimporter_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitcontactimporter.h b/src/versit/qversitcontactimporter.h index 19175c2d9..2206b896d 100644 --- a/src/versit/qversitcontactimporter.h +++ b/src/versit/qversitcontactimporter.h @@ -42,20 +42,23 @@ #ifndef QVERSITCONTACTIMPORTER_H #define QVERSITCONTACTIMPORTER_H -#include <qversitresourcehandler.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <qcontact.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> -#include <QList> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitresourcehandler.h> QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT -class QVersitDocument; -class QVersitContactImporterPrivate; class QVersitProperty; +class QVersitContactImporterPrivate; + class Q_VERSIT_EXPORT QVersitContactImporterPropertyHandler { public: diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp index 6e2628eda..023e549de 100644 --- a/src/versit/qversitcontactimporter_p.cpp +++ b/src/versit/qversitcontactimporter_p.cpp @@ -39,41 +39,19 @@ ** ****************************************************************************/ -#include "qversitcontactsdefs_p.h" #include "qversitcontactimporter_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> -#include "qversitpluginsearch_p.h" -#include "qversitutils_p.h" -#include <qcontactmanagerengine.h> -#include <qcontact.h> -#include <qcontactdetail.h> -#include <qcontactname.h> -#include <qcontactphonenumber.h> -#include <qcontactaddress.h> -#include <qcontactemailaddress.h> -#include <qcontactorganization.h> -#include <qcontacturl.h> -#include <qcontactguid.h> -#include <qcontacttimestamp.h> -#include <qcontactanniversary.h> -#include <qcontactbirthday.h> -#include <qcontactdisplaylabel.h> -#include <qcontactgender.h> -#include <qcontactnickname.h> -#include <qcontactavatar.h> -#include <qcontactgeolocation.h> -#include <qcontactnote.h> -#include <qcontactonlineaccount.h> -#include <qcontactfamily.h> -#include <qcontactdisplaylabel.h> -#include <qcontactringtone.h> -#include <qversitcontacthandler.h> +#include <QtContacts/qcontactdetails.h> + +#include "qversitcontacthandler.h" #include "qversitcontactpluginloader_p.h" +#include "qversitcontactsdefs_p.h" +#include "qversitdocument.h" +#include "qversitpluginsearch_p.h" +#include "qversitproperty.h" +#include "qversitutils_p.h" -#include <QHash> -#include <QFile> +QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitcontactimporter_p.h b/src/versit/qversitcontactimporter_p.h index e8fa1d901..ae79ee65a 100644 --- a/src/versit/qversitcontactimporter_p.h +++ b/src/versit/qversitcontactimporter_p.h @@ -53,25 +53,26 @@ // We mean it. // -#include <qversitcontactimporter.h> -#include "qvcardrestorehandler_p.h" +#include <QtCore/qdatetime.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qpair.h> -#include <QList> -#include <QDateTime> -#include <QHash> -#include <QPair> -#include <QMap> -#include <QSet> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> + +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/private/qvcardrestorehandler_p.h> QT_BEGIN_NAMESPACE_CONTACTS -class QContact; -class QContactDetail; class QContactOrganization; QT_END_NAMESPACE_CONTACTS QTCONTACTS_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSIT + class QVersitProperty; class QVersitDocument; class QVersitContactHandler; diff --git a/src/versit/qversitcontactpluginloader_p.cpp b/src/versit/qversitcontactpluginloader_p.cpp index b1e48c061..5a65396cb 100644 --- a/src/versit/qversitcontactpluginloader_p.cpp +++ b/src/versit/qversitcontactpluginloader_p.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <QPluginLoader> - #include "qversitcontactpluginloader_p.h" + +#include <QtCore/qpluginloader.h> + #include "qversitpluginsearch_p.h" QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitcontactpluginloader_p.h b/src/versit/qversitcontactpluginloader_p.h index d497823b9..784ebbec4 100644 --- a/src/versit/qversitcontactpluginloader_p.h +++ b/src/versit/qversitcontactpluginloader_p.h @@ -42,11 +42,21 @@ #ifndef QVERSITCONTACTPLUGINLOADER_P_H #define QVERSITCONTACTPLUGINLOADER_P_H -#include <QMap> -#include <QStringList> -#include <QList> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// -#include <qversitcontacthandler.h> +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> + +#include <QtVersit/qversitcontacthandler.h> QT_BEGIN_NAMESPACE_VERSIT @@ -70,4 +80,4 @@ class QVersitContactPluginLoader QT_END_NAMESPACE_VERSIT -#endif +#endif // QVERSITCONTACTPLUGINLOADER_P_H diff --git a/src/versit/qversitcontactsdefs_p.h b/src/versit/qversitcontactsdefs_p.h index afbb59090..2b9f541fa 100644 --- a/src/versit/qversitcontactsdefs_p.h +++ b/src/versit/qversitcontactsdefs_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QVERSITCONTACTSDEFS_P_H #define QVERSITCONTACTSDEFS_P_H @@ -54,32 +53,9 @@ // We mean it. // -#include <qcontacts.h> -#include <qcontactdetail.h> -#include "qversitdefs_p.h" +#include <QtContacts/qcontactdetails.h> -QT_BEGIN_NAMESPACE_CONTACTS -class QContactAddress; -class QContactAnniversary; -class QContactBirthday; -class QContactDisplayLabel; -class QContactEmailAddress; -class QContactFamily; -class QContactGender; -class QContactGeoLocation; -class QContactGuid; -class QContactName; -class QContactNickname; -class QContactNote; -class QContactOnlineAccount; -class QContactOrganization; -class QContactPhoneNumber; -class QContactRingtone; -class QContactTag; -class QContactTimestamp; -class QContactUrl; -class QContactVersion; -QT_END_NAMESPACE_CONTACTS +#include <QtVersit/private/qversitdefs_p.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/versit/qversitdefs_p.h b/src/versit/qversitdefs_p.h index 650f1e7cf..75175c9a6 100644 --- a/src/versit/qversitdefs_p.h +++ b/src/versit/qversitdefs_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QVERSITDEFS_P_H #define QVERSITDEFS_P_H @@ -54,9 +53,9 @@ // We mean it. // -#include <qversitglobal.h> -#include <qcontactdetail.h> -#include <QString> +#include <QtContacts/qcontactdetail.h> + +#include <QtVersit/qversitglobal.h> QTCONTACTS_USE_NAMESPACE diff --git a/src/versit/qversitdocument.cpp b/src/versit/qversitdocument.cpp index 86af43b6d..eaa3328e8 100644 --- a/src/versit/qversitdocument.cpp +++ b/src/versit/qversitdocument.cpp @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include <qversitdocument.h> +#include "qversitdocument.h" #include "qversitdocument_p.h" -#include <QTextCodec> +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitdocument.h b/src/versit/qversitdocument.h index 4deb6bcb6..65a4b9cf1 100644 --- a/src/versit/qversitdocument.h +++ b/src/versit/qversitdocument.h @@ -42,21 +42,17 @@ #ifndef QVERSITDOCUMENT_H #define QVERSITDOCUMENT_H -#include <qversitglobal.h> -#include <QList> -#include <QSharedDataPointer> -#include <QVariant> -#include <QDebug> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -QT_BEGIN_NAMESPACE -class QTextCodec; -QT_END_NAMESPACE +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT -class QVersitDocumentPrivate; class QVersitProperty; +class QVersitDocumentPrivate; class Q_VERSIT_EXPORT QVersitDocument { public: diff --git a/src/versit/qversitdocument_p.h b/src/versit/qversitdocument_p.h index 9e51828e9..f34e5b841 100644 --- a/src/versit/qversitdocument_p.h +++ b/src/versit/qversitdocument_p.h @@ -53,15 +53,11 @@ // We mean it. // -#include <qversitdocument.h> -#include <qversitproperty.h> +#include <QtCore/qlist.h> +#include <QtCore/qshareddata.h> -#include <QSharedData> -#include <QList> - -QT_BEGIN_NAMESPACE -class QTextCodec; -QT_END_NAMESPACE +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitdocumentwriter_p.cpp b/src/versit/qversitdocumentwriter_p.cpp index 7eaf159c5..20f5503f1 100644 --- a/src/versit/qversitdocumentwriter_p.cpp +++ b/src/versit/qversitdocumentwriter_p.cpp @@ -40,8 +40,10 @@ ****************************************************************************/ #include "qversitdocumentwriter_p.h" + +#include <QtCore/qtextcodec.h> + #include "qversitutils_p.h" -#include <QTextCodec> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitdocumentwriter_p.h b/src/versit/qversitdocumentwriter_p.h index dae3ca8fd..a6ac6961b 100644 --- a/src/versit/qversitdocumentwriter_p.h +++ b/src/versit/qversitdocumentwriter_p.h @@ -53,18 +53,20 @@ // We mean it. // -#include <qversitproperty.h> -#include <QByteArray> -#include <QMultiHash> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE -class QIODevice; -class QTextCodec; -class QTextEncoder; -QT_END_NAMESPACE +#include <QtVersit/qversitdocument.h> + +QT_FORWARD_DECLARE_CLASS(QByteArray) +QT_FORWARD_DECLARE_CLASS(QIODevice) +QT_FORWARD_DECLARE_CLASS(QTextCodec) +QT_FORWARD_DECLARE_CLASS(QTextEncoder) QT_BEGIN_NAMESPACE_VERSIT +class QVersitProperty; + class Q_VERSIT_EXPORT QVersitDocumentWriter { public: diff --git a/src/versit/qversitglobal.h b/src/versit/qversitglobal.h index 31ee078ad..09f652d57 100644 --- a/src/versit/qversitglobal.h +++ b/src/versit/qversitglobal.h @@ -66,4 +66,7 @@ # define Q_VERSIT_EXPORT #endif +QT_BEGIN_NAMESPACE_VERSIT +QT_END_NAMESPACE_VERSIT + #endif // QVERSITGLOBAL_H diff --git a/src/versit/qversitpluginsearch_p.h b/src/versit/qversitpluginsearch_p.h index 79df4a5ba..59ffae4c6 100644 --- a/src/versit/qversitpluginsearch_p.h +++ b/src/versit/qversitpluginsearch_p.h @@ -41,13 +41,25 @@ #ifndef QVERSITPLUGINSEARCH_H #define QVERSITPLUGINSEARCH_H -#include <qversitglobal.h> - -#include <QCoreApplication> -#include <QStringList> -#include <QDir> -#include <QDebug> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qcoreapplication.h> +#if !defined QT_NO_DEBUG +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qdir.h> +#include <QtCore/qstringlist.h> +#include <QtVersit/qversitglobal.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitproperty.cpp b/src/versit/qversitproperty.cpp index 6c571e5f4..7e4ee6ab7 100644 --- a/src/versit/qversitproperty.cpp +++ b/src/versit/qversitproperty.cpp @@ -39,11 +39,15 @@ ** ****************************************************************************/ -#include <qversitproperty.h> +#include "qversitproperty.h" #include "qversitproperty_p.h" -#include <QStringList> -#include <QTextCodec> +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qtextcodec.h> + +#include "qversitdocument.h" QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitproperty.h b/src/versit/qversitproperty.h index 1b8fce043..8fa0c2ae8 100644 --- a/src/versit/qversitproperty.h +++ b/src/versit/qversitproperty.h @@ -42,21 +42,16 @@ #ifndef QVERSITPROPERTY_H #define QVERSITPROPERTY_H -#include <qversitdocument.h> +#include <QtCore/qhash.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <QString> -#include <QStringList> -#include <QMultiHash> -#include <QByteArray> -#include <QSharedDataPointer> - -QT_BEGIN_NAMESPACE -class QVariant; -QT_END_NAMESPACE +#include <QtVersit/qversitglobal.h> QT_BEGIN_NAMESPACE_VERSIT -class QVersitPropertyPrivate; +class QVersitPropertyPrivate; class Q_VERSIT_EXPORT QVersitProperty { public: diff --git a/src/versit/qversitproperty_p.h b/src/versit/qversitproperty_p.h index 43bede28a..11b05b01d 100644 --- a/src/versit/qversitproperty_p.h +++ b/src/versit/qversitproperty_p.h @@ -53,15 +53,12 @@ // We mean it. // -#include <qversitdocument.h> -#include <qversitproperty.h> +#include <QtCore/qhash.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvariant.h> -#include <QSharedData> -#include <QString> -#include <QStringList> -#include <QMultiHash> -#include <QByteArray> -#include <QVariant> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitreader.cpp b/src/versit/qversitreader.cpp index b44c6ca1f..7ef32fd91 100644 --- a/src/versit/qversitreader.cpp +++ b/src/versit/qversitreader.cpp @@ -39,14 +39,11 @@ ** ****************************************************************************/ - -#include <qversitreader.h> +#include "qversitreader.h" #include "qversitreader_p.h" -#include "qversitutils_p.h" -#include <QTextCodec> -#include <QMutexLocker> -#include <QBuffer> +#include <QtCore/qbuffer.h> +#include <QtCore/qtextcodec.h> QT_BEGIN_NAMESPACE_VERSIT @@ -281,4 +278,5 @@ QList<QVersitDocument> QVersitReader::results() const } #include "moc_qversitreader.cpp" + QT_END_NAMESPACE_VERSIT diff --git a/src/versit/qversitreader.h b/src/versit/qversitreader.h index c0a74847f..36a24b9c1 100644 --- a/src/versit/qversitreader.h +++ b/src/versit/qversitreader.h @@ -42,14 +42,14 @@ #ifndef QVERSITREADER_H #define QVERSITREADER_H -#include <qversitdocument.h> +#include <QtCore/qlist.h> +#include <QtCore/qobject.h> -#include <QObject> +#include <QtVersit/qversitdocument.h> -QT_BEGIN_NAMESPACE -class QIODevice; -class QTextCodec; -QT_END_NAMESPACE +QT_FORWARD_DECLARE_CLASS(QByteArray) +QT_FORWARD_DECLARE_CLASS(QIODevice) +QT_FORWARD_DECLARE_CLASS(QTextCodec) QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitreader_p.cpp b/src/versit/qversitreader_p.cpp index 17db4d24a..89617dc69 100644 --- a/src/versit/qversitreader_p.cpp +++ b/src/versit/qversitreader_p.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "qversitreader_p.h" -#include <qversitdocument.h> + +#include <QtCore/qbuffer.h> +#include <QtCore/qtextcodec.h> +#include <QtCore/qvariant.h> + #include "qversitutils_p.h" -#include <QTextCodec> -#include <QMutexLocker> -#include <QVariant> -#include <QBuffer> QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitreader_p.h b/src/versit/qversitreader_p.h index f99eac94f..1a8d4b55a 100644 --- a/src/versit/qversitreader_p.h +++ b/src/versit/qversitreader_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QVERSITREADER_P_H #define QVERSITREADER_P_H @@ -54,28 +53,24 @@ // We mean it. // -#include <qversitreader.h> -#include <qversitdocument.h> -#include <qversitproperty.h> -#include "qversitutils_p.h" - -#include <QObject> -#include <QThread> -#include <QByteArray> -#include <QIODevice> -#include <QList> -#include <QStack> -#include <QPointer> -#include <QScopedPointer> -#include <QByteArray> -#include <QMutex> -#include <QWaitCondition> -#include <QPair> -#include <QHash> - -QT_BEGIN_NAMESPACE -class QBuffer; -QT_END_NAMESPACE +#include <QtCore/qbytearray.h> +#include <QtCore/qbytearraymatcher.h> +#include <QtCore/qhash.h> +#include <QtCore/qlist.h> +#include <QtCore/qmutex.h> +#include <QtCore/qpair.h> +#include <QtCore/qpointer.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qstack.h> +#include <QtCore/qthread.h> + +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> + +QT_FORWARD_DECLARE_CLASS(QBuffer) +QT_FORWARD_DECLARE_CLASS(QIODevice) +QT_FORWARD_DECLARE_CLASS(QTextCodec) QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitresourcehandler.cpp b/src/versit/qversitresourcehandler.cpp index d21255f9a..9f8c4f52a 100644 --- a/src/versit/qversitresourcehandler.cpp +++ b/src/versit/qversitresourcehandler.cpp @@ -40,9 +40,13 @@ ****************************************************************************/ #include "qversitresourcehandler.h" -#include "qversitproperty.h" + +#include <QtCore/qbytearray.h> +#include <QtCore/qfile.h> +#include <QtCore/qstring.h> + #include "qversitdefs_p.h" -#include <QFile> +#include "qversitproperty.h" QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitresourcehandler.h b/src/versit/qversitresourcehandler.h index 9d3559df9..694d19a3f 100644 --- a/src/versit/qversitresourcehandler.h +++ b/src/versit/qversitresourcehandler.h @@ -42,10 +42,10 @@ #ifndef QVERSITRESOURCEHANDLER_H #define QVERSITRESOURCEHANDLER_H -#include <qversitglobal.h> +#include <QtVersit/qversitglobal.h> -#include <QString> -#include <QByteArray> +QT_FORWARD_DECLARE_CLASS(QByteArray) +QT_FORWARD_DECLARE_CLASS(QString) QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitutils.cpp b/src/versit/qversitutils.cpp index 6cf92d4b9..e398c32dd 100644 --- a/src/versit/qversitutils.cpp +++ b/src/versit/qversitutils.cpp @@ -40,16 +40,18 @@ ****************************************************************************/ #include "qversitutils_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> -#include <QMap> -#include <QTextCodec> -#include <QScopedPointer> +#include <QtCore/QTextCodec> +#include <QtCore/qstring.h> +#include <QtCore/qtextcodec.h> +#include <QtCore/qvariant.h> + #include <QtCore/QJsonArray> #include <QtCore/QJsonDocument> #include <QtCore/QJsonValue> +#include "qversitdocument.h" + QT_BEGIN_NAMESPACE_VERSIT QTextCodec* VersitUtils::m_previousCodec = 0; diff --git a/src/versit/qversitutils_p.h b/src/versit/qversitutils_p.h index 601fe0c72..4e7db16f7 100644 --- a/src/versit/qversitutils_p.h +++ b/src/versit/qversitutils_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QVERSITUTILS_P_H #define QVERSITUTILS_P_H @@ -54,18 +53,19 @@ // We mean it. // -#include <qversitglobal.h> +#include <QtCore/qbytearray.h> +#include <QtCore/qbytearraymatcher.h> +#include <QtCore/qlist.h> + +#include <QtVersit/qversitproperty.h> -#include <QByteArray> -#include <QByteArrayMatcher> -#include <QPair> -#include <QString> -#include <QStringList> -#include <QMultiHash> +QT_FORWARD_DECLARE_CLASS(QString) +QT_FORWARD_DECLARE_CLASS(QTextCodec) +QT_FORWARD_DECLARE_CLASS(QVariant) QT_BEGIN_NAMESPACE_VERSIT + class QVersitDocument; -class QVersitProperty; class Q_VERSIT_EXPORT VersitUtils { diff --git a/src/versit/qversitwriter.cpp b/src/versit/qversitwriter.cpp index 18aa5f5ad..3a8938ff6 100644 --- a/src/versit/qversitwriter.cpp +++ b/src/versit/qversitwriter.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include <qversitwriter.h> +#include "qversitwriter.h" #include "qversitwriter_p.h" -#include "qversitutils_p.h" -#include <QStringList> -#include <QTextCodec> -#include <QBuffer> +#include <QtCore/qbuffer.h> +#include <QtCore/qtextcodec.h> + +#include "qversitutils_p.h" QT_BEGIN_NAMESPACE_VERSIT @@ -298,4 +298,5 @@ bool QVersitWriter::waitForFinished(int msec) } #include "moc_qversitwriter.cpp" + QT_END_NAMESPACE_VERSIT diff --git a/src/versit/qversitwriter.h b/src/versit/qversitwriter.h index 2151b9269..82a79df31 100644 --- a/src/versit/qversitwriter.h +++ b/src/versit/qversitwriter.h @@ -42,10 +42,14 @@ #ifndef QVERSITWRITER_H #define QVERSITWRITER_H -#include <qversitdocument.h> +#include <QtCore/qlist.h> +#include <QtCore/qobject.h> -#include <QObject> -#include <QIODevice> +#include <QtVersit/qversitdocument.h> + +QT_FORWARD_DECLARE_CLASS(QByteArray) +QT_FORWARD_DECLARE_CLASS(QIODevice) +QT_FORWARD_DECLARE_CLASS(QTextCodec) QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versit/qversitwriter_p.cpp b/src/versit/qversitwriter_p.cpp index c27acd97b..caa843635 100644 --- a/src/versit/qversitwriter_p.cpp +++ b/src/versit/qversitwriter_p.cpp @@ -40,17 +40,16 @@ ****************************************************************************/ #include "qversitwriter_p.h" -#include "qversitdocumentwriter_p.h" + +#include <QtCore/qbuffer.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qtextcodec.h> + #include "qvcard21writer_p.h" #include "qvcard30writer_p.h" +#include "qversitdocumentwriter_p.h" #include "qversitutils_p.h" -#include <QStringList> -#include <QMutexLocker> -#include <QScopedPointer> -#include <QTextCodec> -#include <QBuffer> - QT_BEGIN_NAMESPACE_VERSIT /*! Constructs a writer. */ diff --git a/src/versit/qversitwriter_p.h b/src/versit/qversitwriter_p.h index aaf940b2d..35dcc799c 100644 --- a/src/versit/qversitwriter_p.h +++ b/src/versit/qversitwriter_p.h @@ -53,18 +53,14 @@ // We mean it. // -#include <qversitwriter.h> -#include <qversitdocument.h> -#include <qversitproperty.h> - -#include <QThread> -#include <QIODevice> -#include <QMutex> -#include <QWaitCondition> - -QT_BEGIN_NAMESPACE -class QBuffer; -QT_END_NAMESPACE +#include <QtCore/qmutex.h> +#include <QtCore/qscopedpointer.h> +#include <QtCore/qthread.h> + +#include <QtVersit/qversitwriter.h> +#include <QtVersit/qversitdocument.h> + +QT_FORWARD_DECLARE_CLASS(QBuffer) QT_BEGIN_NAMESPACE_VERSIT diff --git a/src/versitorganizer/qtimezones_p.cpp b/src/versitorganizer/qtimezones_p.cpp index 0c917cc5f..56b9c529c 100644 --- a/src/versitorganizer/qtimezones_p.cpp +++ b/src/versitorganizer/qtimezones_p.cpp @@ -40,8 +40,10 @@ ****************************************************************************/ #include "qtimezones_p.h" -#include <qorganizer.h> -#include <QDateTime> + +#include <QtOrganizer/qorganizer.h> + +QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qtimezones_p.h b/src/versitorganizer/qtimezones_p.h index 87e7cc430..1f5c92bed 100644 --- a/src/versitorganizer/qtimezones_p.h +++ b/src/versitorganizer/qtimezones_p.h @@ -42,19 +42,6 @@ #ifndef QTIMEZONES_P_H #define QTIMEZONES_P_H -#include <QDateTime> -#include <QHash> -#include <qorganizerrecurrencerule.h> -#include <qversitorganizerglobal.h> - -QT_BEGIN_NAMESPACE_ORGANIZER -class QOrganizerManager; -QT_END_NAMESPACE_ORGANIZER - -QTORGANIZER_USE_NAMESPACE - -QT_BEGIN_NAMESPACE_VERSITORGANIZER - // // W A R N I N G // ------------- @@ -64,6 +51,23 @@ QT_BEGIN_NAMESPACE_VERSITORGANIZER // version without notice, or even be removed. // // We mean it. +// + +#include <QtCore/qdatetime.h> +#include <QtCore/qlist.h> +#include <QtCore/qhash.h> + +#include <QtOrganizer/qorganizerrecurrencerule.h> + +#include <QtVersitOrganizer/qversitorganizerglobal.h> + +QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerManager; +QT_END_NAMESPACE_ORGANIZER + +QTORGANIZER_USE_NAMESPACE + +QT_BEGIN_NAMESPACE_VERSITORGANIZER class TimeZonePhase { public: @@ -122,4 +126,4 @@ class TimeZones { QT_END_NAMESPACE_VERSITORGANIZER -#endif +#endif // QTIMEZONES_P_H diff --git a/src/versitorganizer/qversitorganizerdefs_p.h b/src/versitorganizer/qversitorganizerdefs_p.h index f20bd905c..21d126f40 100644 --- a/src/versitorganizer/qversitorganizerdefs_p.h +++ b/src/versitorganizer/qversitorganizerdefs_p.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef QVERSITORGANIZERDEFS_P_H #define QVERSITORGANIZERDEFS_P_H @@ -53,16 +52,10 @@ // // We mean it. // -// -#include <qversitorganizerglobal.h> -#include <qorganizeritemdetail.h> +#include <QtOrganizer/qorganizeritemdetails.h> -QT_BEGIN_NAMESPACE_ORGANIZER -class QOrganizerItemDisplayLabel; -class QOrganizerItemDescription; -class QOrganizerItemGuid; -QT_END_NAMESPACE_ORGANIZER +#include <QtVersitOrganizer/qversitorganizerglobal.h> QTORGANIZER_USE_NAMESPACE @@ -87,4 +80,4 @@ const VersitOrganizerDetailMapping versitOrganizerDetailMappings[] = { QT_END_NAMESPACE_VERSITORGANIZER -#endif +#endif // QVERSITORGANIZERDEFS_P_H diff --git a/src/versitorganizer/qversitorganizerexporter.cpp b/src/versitorganizer/qversitorganizerexporter.cpp index 11cb2b068..1febcdaf3 100644 --- a/src/versitorganizer/qversitorganizerexporter.cpp +++ b/src/versitorganizer/qversitorganizerexporter.cpp @@ -39,11 +39,15 @@ ** ****************************************************************************/ - -#include <qversitorganizerexporter.h> +#include "qversitorganizerexporter.h" #include "qversitorganizerexporter_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> + +#include <QtOrganizer/qorganizer.h> + +#include <QtVersit/qversitproperty.h> + +QTORGANIZER_USE_NAMESPACE +QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER @@ -160,7 +164,7 @@ QVersitOrganizerExporter::~QVersitOrganizerExporter() */ bool QVersitOrganizerExporter::exportItems( const QList<QOrganizerItem>& items, - QtVersit::QVersitDocument::VersitType versitType) + QVersitDocument::VersitType versitType) { int itemIndex = 0; d->mErrors.clear(); @@ -191,7 +195,7 @@ bool QVersitOrganizerExporter::exportItems( * * \sa exportItems() */ -QtVersit::QVersitDocument QVersitOrganizerExporter::document() const +QVersitDocument QVersitOrganizerExporter::document() const { return d->mResult; } diff --git a/src/versitorganizer/qversitorganizerexporter.h b/src/versitorganizer/qversitorganizerexporter.h index b57d52313..22d59c84b 100644 --- a/src/versitorganizer/qversitorganizerexporter.h +++ b/src/versitorganizer/qversitorganizerexporter.h @@ -42,21 +42,21 @@ #ifndef QVERSITORGANIZEREXPORTER_H #define QVERSITORGANIZEREXPORTER_H -#include <qversitorganizerglobal.h> -#include <qversitdocument.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> -#include <qorganizeritem.h> +#include <QtOrganizer/qorganizeritem.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> + +#include <QtVersitOrganizer/qversitorganizerglobal.h> QT_BEGIN_NAMESPACE_ORGANIZER -class QOrganizerItem; class QOrganizerItemDetail; QT_END_NAMESPACE_ORGANIZER -QT_BEGIN_NAMESPACE_VERSIT -class QVersitDocument; -class QVersitProperty; -QT_END_NAMESPACE_VERSIT - QTORGANIZER_USE_NAMESPACE QTVERSIT_USE_NAMESPACE diff --git a/src/versitorganizer/qversitorganizerexporter_p.cpp b/src/versitorganizer/qversitorganizerexporter_p.cpp index b2eb31957..2600bffda 100644 --- a/src/versitorganizer/qversitorganizerexporter_p.cpp +++ b/src/versitorganizer/qversitorganizerexporter_p.cpp @@ -39,14 +39,22 @@ ** ****************************************************************************/ -#include <qversitorganizerexporter.h> +#include "qversitorganizerexporter.h" #include "qversitorganizerexporter_p.h" -#include <qorganizer.h> + +#include <QtCore/qdebug.h> + +#include <QtOrganizer/qorganizer.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/private/qversitutils_p.h> + #include "qversitorganizerdefs_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> #include "qversitorganizerpluginloader_p.h" -#include <private/qversitutils_p.h> + +QTORGANIZER_USE_NAMESPACE +QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerexporter_p.h b/src/versitorganizer/qversitorganizerexporter_p.h index 62dc14cac..e9005dbb4 100644 --- a/src/versitorganizer/qversitorganizerexporter_p.h +++ b/src/versitorganizer/qversitorganizerexporter_p.h @@ -42,20 +42,35 @@ #ifndef QVERSITORGANIZEREXPORTER_P_H #define QVERSITORGANIZEREXPORTER_P_H -#include <qversitorganizerexporter.h> -#include <qorganizerrecurrencerule.h> -#include <qversitorganizerhandler.h> -#include <qversittimezonehandler.h> -#include <qversitdocument.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// -QT_BEGIN_NAMESPACE_VERSIT -class QVersitDocument; -QT_END_NAMESPACE_VERSIT +#include <QtCore/qpair.h> + +#include <QtOrganizer/qorganizeritemdetail.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> + +#include <QtVersitOrganizer/qversitorganizerexporter.h> +#include <QtVersitOrganizer/qversitorganizerhandler.h> +#include <QtVersitOrganizer/qversittimezonehandler.h> QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerItem; class QOrganizerItemReminder; +class QOrganizerRecurrenceRule; QT_END_NAMESPACE_ORGANIZER +QTORGANIZER_USE_NAMESPACE QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerglobal.h b/src/versitorganizer/qversitorganizerglobal.h index 6848843d0..71f3f20d3 100644 --- a/src/versitorganizer/qversitorganizerglobal.h +++ b/src/versitorganizer/qversitorganizerglobal.h @@ -56,7 +56,6 @@ # define QTVERSITORGANIZER_USE_NAMESPACE using namespace QtVersitOrganizer; #endif - #ifndef QT_STATIC # if defined(QT_BUILD_VERSITORGANIZER_LIB) # define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT @@ -67,4 +66,7 @@ # define Q_VERSIT_ORGANIZER_EXPORT #endif +QT_BEGIN_NAMESPACE_VERSITORGANIZER +QT_END_NAMESPACE_VERSITORGANIZER + #endif // QVERSITORGANIZERGLOBAL_H diff --git a/src/versitorganizer/qversitorganizerhandler.cpp b/src/versitorganizer/qversitorganizerhandler.cpp index b251e742f..c6dad15f1 100644 --- a/src/versitorganizer/qversitorganizerhandler.cpp +++ b/src/versitorganizer/qversitorganizerhandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qversitorganizerhandler.h> +#include "qversitorganizerhandler.h" QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerhandler.h b/src/versitorganizer/qversitorganizerhandler.h index b476718a4..d8f225bbd 100644 --- a/src/versitorganizer/qversitorganizerhandler.h +++ b/src/versitorganizer/qversitorganizerhandler.h @@ -42,8 +42,8 @@ #ifndef QVERSITORGANIZERHANDLER_H #define QVERSITORGANIZERHANDLER_H -#include <qversitorganizerimporter.h> -#include <qversitorganizerexporter.h> +#include <QtVersitOrganizer/qversitorganizerimporter.h> +#include <QtVersitOrganizer/qversitorganizerexporter.h> QT_BEGIN_NAMESPACE_VERSITORGANIZER @@ -77,4 +77,5 @@ QT_END_NAMESPACE_VERSITORGANIZER QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(QtVersitOrganizer::QVersitOrganizerHandlerFactory, QT_VERSIT_ORGANIZER_HANDLER_INTERFACE) QT_END_NAMESPACE -#endif + +#endif // QVERSITORGANIZERHANDLER_H diff --git a/src/versitorganizer/qversitorganizerimporter.cpp b/src/versitorganizer/qversitorganizerimporter.cpp index 7c8dc2509..e6d4a8d1f 100644 --- a/src/versitorganizer/qversitorganizerimporter.cpp +++ b/src/versitorganizer/qversitorganizerimporter.cpp @@ -39,10 +39,13 @@ ** ****************************************************************************/ -#include <qversitorganizerimporter.h> +#include "qversitorganizerimporter.h" #include "qversitorganizerimporter_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> + +QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerimporter.h b/src/versitorganizer/qversitorganizerimporter.h index f6bd73b9b..de3fcff26 100644 --- a/src/versitorganizer/qversitorganizerimporter.h +++ b/src/versitorganizer/qversitorganizerimporter.h @@ -42,24 +42,23 @@ #ifndef QVERSITORGANIZERIMPORTER_H #define QVERSITORGANIZERIMPORTER_H -#include <qversitorganizerglobal.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> -#include <qorganizeritem.h> -#include <qversitdocument.h> +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemdetail.h> -#include <QList> +#include <QtVersit/qversitglobal.h> -QT_BEGIN_NAMESPACE_ORGANIZER -class QOrganizerItem; -QT_END_NAMESPACE_ORGANIZER +#include <QtVersitOrganizer/qversitorganizerglobal.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitDocument; class QVersitProperty; QT_END_NAMESPACE_VERSIT -QTVERSIT_USE_NAMESPACE QTORGANIZER_USE_NAMESPACE +QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerimporter_p.cpp b/src/versitorganizer/qversitorganizerimporter_p.cpp index f25fd9f62..30801f383 100644 --- a/src/versitorganizer/qversitorganizerimporter_p.cpp +++ b/src/versitorganizer/qversitorganizerimporter_p.cpp @@ -40,13 +40,20 @@ ****************************************************************************/ #include "qversitorganizerimporter_p.h" -#include <qversitdocument.h> -#include <qversitproperty.h> -#include <qorganizer.h> + +#include <QtOrganizer/qorganizer.h> + +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/private/qversitutils_p.h> + #include "qversitorganizerdefs_p.h" +#include "qversitorganizerhandler.h" #include "qversitorganizerpluginloader_p.h" -#include <private/qversitutils_p.h> +#include "qversittimezonehandler.h" +QTORGANIZER_USE_NAMESPACE +QTVERSIT_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversitorganizerimporter_p.h b/src/versitorganizer/qversitorganizerimporter_p.h index 49d3af0ec..35632304d 100644 --- a/src/versitorganizer/qversitorganizerimporter_p.h +++ b/src/versitorganizer/qversitorganizerimporter_p.h @@ -38,6 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QVERSITORGANIZERIMPORTER_P_H #define QVERSITORGANIZERIMPORTER_P_H @@ -52,15 +53,26 @@ // We mean it. // -#include <qversitorganizerglobal.h> -#include <qversitorganizerimporter.h> -#include <qorganizeritemrecurrence.h> -#include <qversitorganizerhandler.h> -#include <qversittimezonehandler.h> -#include "qtimezones_p.h" +#include <QtCore/qpair.h> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizeritem.h> +#include <QtOrganizer/qorganizeritemdetail.h> + +#include <QtVersitOrganizer/qversitorganizerimporter.h> +#include <QtVersitOrganizer/private/qtimezones_p.h> + +QT_BEGIN_NAMESPACE_ORGANIZER +class QOrganizerRecurrenceRule; +QT_END_NAMESPACE_ORGANIZER + +QTORGANIZER_USE_NAMESPACE QT_BEGIN_NAMESPACE_VERSITORGANIZER +class QVersitOrganizerHandler; +class QVersitTimeZoneHandler; + class Duration { public: @@ -231,4 +243,4 @@ private: QT_END_NAMESPACE_VERSITORGANIZER -#endif +#endif // QVERSITORGANIZERIMPORTER_P_H diff --git a/src/versitorganizer/qversitorganizerpluginloader_p.cpp b/src/versitorganizer/qversitorganizerpluginloader_p.cpp index 0973a4000..9cb3142bb 100644 --- a/src/versitorganizer/qversitorganizerpluginloader_p.cpp +++ b/src/versitorganizer/qversitorganizerpluginloader_p.cpp @@ -39,11 +39,14 @@ ** ****************************************************************************/ -#include <QPluginLoader> - #include "qversitorganizerpluginloader_p.h" #include "qversitorganizerpluginsearch_p.h" +#include <QtCore/qpluginloader.h> + +#include "qversitorganizerhandler.h" +#include "qversittimezonehandler.h" + QT_BEGIN_NAMESPACE_VERSITORGANIZER /*! diff --git a/src/versitorganizer/qversitorganizerpluginloader_p.h b/src/versitorganizer/qversitorganizerpluginloader_p.h index b903e3791..c3b6740d9 100644 --- a/src/versitorganizer/qversitorganizerpluginloader_p.h +++ b/src/versitorganizer/qversitorganizerpluginloader_p.h @@ -1,4 +1,3 @@ - /**************************************************************************** ** ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -43,16 +42,28 @@ #ifndef QVERSITORGANIZERPLUGINLOADER_P_H #define QVERSITORGANIZERPLUGINLOADER_P_H -#include <QMap> -#include <QStringList> -#include <QList> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qset.h> +#include <QtCore/qstringlist.h> -#include <qversitorganizerglobal.h> -#include <qversitorganizerhandler.h> -#include <qversittimezonehandler.h> +#include <QtVersitOrganizer/qversitorganizerglobal.h> QT_BEGIN_NAMESPACE_VERSITORGANIZER +class QVersitOrganizerHandler; +class QVersitOrganizerHandlerFactory; +class QVersitTimeZoneHandler; + class QVersitOrganizerPluginLoader { private: @@ -75,4 +86,4 @@ class QVersitOrganizerPluginLoader QT_END_NAMESPACE_VERSITORGANIZER -#endif +#endif // QVERSITORGANIZERPLUGINLOADER_P_H diff --git a/src/versitorganizer/qversitorganizerpluginsearch_p.h b/src/versitorganizer/qversitorganizerpluginsearch_p.h index eaccf0bb0..6abce93a8 100644 --- a/src/versitorganizer/qversitorganizerpluginsearch_p.h +++ b/src/versitorganizer/qversitorganizerpluginsearch_p.h @@ -38,15 +38,29 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QVERSITORGANIZERPLUGINSEARCH_H #define QVERSITORGANIZERPLUGINSEARCH_H -#include <qversitorganizerglobal.h> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qcoreapplication.h> +#if !defined QT_NO_DEBUG +#include <QtCore/qdebug.h> +#endif +#include <QtCore/qdir.h> +#include <QtCore/qstringlist.h> -#include <QCoreApplication> -#include <QStringList> -#include <QDir> -#include <QDebug> +#include <QtVersitOrganizer/qversitorganizerglobal.h> QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/src/versitorganizer/qversittimezonehandler.h b/src/versitorganizer/qversittimezonehandler.h index 70fbb8c8e..9115fb6f5 100644 --- a/src/versitorganizer/qversittimezonehandler.h +++ b/src/versitorganizer/qversittimezonehandler.h @@ -42,8 +42,9 @@ #ifndef QVERSITTIMEZONEHANDLER_H #define QVERSITTIMEZONEHANDLER_H -#include <qversitorganizerglobal.h> -#include <QDateTime> +#include <QtCore/qdatetime.h> + +#include <QtVersitOrganizer/qversitorganizerglobal.h> QT_BEGIN_NAMESPACE_VERSITORGANIZER diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp index 7765e4a0c..7e5c1d38a 100644 --- a/tests/auto/cmake/test_modules/main.cpp +++ b/tests/auto/cmake/test_modules/main.cpp @@ -39,14 +39,17 @@ ** ****************************************************************************/ -#include <QContact> -#include <QOrganizerCollection> +#include <QtContacts/QContact> +#include <QtOrganizer/QOrganizerCollection> + +QTCONTACTS_USE_NAMESPACE +QTORGANIZER_USE_NAMESPACE int main(int argc, char **argv) { - QtContacts::QContact contact; + QContact contact; - QtOrganizer::QOrganizerCollection organizerCollection; + QOrganizerCollection organizerCollection; return 0; } diff --git a/tests/auto/contacts/qcontact/tst_qcontact.cpp b/tests/auto/contacts/qcontact/tst_qcontact.cpp index d92a0ffe9..282ec35e1 100644 --- a/tests/auto/contacts/qcontact/tst_qcontact.cpp +++ b/tests/auto/contacts/qcontact/tst_qcontact.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> #include <QSet> #include "../qcontactidmock.h" diff --git a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp index b2f6f3c3a..2011e2db8 100644 --- a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp +++ b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp @@ -48,13 +48,15 @@ #include "multiaction_p.h" -#include "qcontactphonenumber.h" -#include "qcontactemailaddress.h" -#include "qcontactfilters.h" +#include <QtContacts/qcontactphonenumber.h> +#include <QtContacts/qcontactemailaddress.h> +#include <QtContacts/qcontactfilters.h> #include <QMessageBox> #include <QTimer> +QTCONTACTS_USE_NAMESPACE + //! [Example Contact Action Plugin Implementation] QObject* QContactMultiActionPlugin::createInstance(const QServiceInterfaceDescriptor& descriptor, diff --git a/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h b/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h index 26d2989d1..c785a6f0f 100644 --- a/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h +++ b/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qcontactaction.h" -#include "qcontactactionfactory.h" +#include <QtContacts/qcontactaction.h> +#include <QtContacts/qcontactactionfactory.h> #include "qserviceinterfacedescriptor.h" #include "qserviceplugininterface.h" diff --git a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp index d818df8f8..ca09ad415 100644 --- a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp +++ b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp @@ -48,8 +48,8 @@ #include "sendemailaction_p.h" -#include "qcontactemailaddress.h" -#include "qcontactfilters.h" +#include <QtContacts/qcontactemailaddress.h> +#include <QtContacts/qcontactfilters.h> #include <QDebug> #include <QMessageBox> @@ -58,6 +58,8 @@ #define makestr(x) (#x) #define makename(x) makestr(x) +QTCONTACTS_USE_NAMESPACE + QObject* QContactSendEmailActionPlugin::createInstance(const QServiceInterfaceDescriptor& descriptor, QServiceContext* context, QAbstractSecuritySession* session) diff --git a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h index 877bc57ae..5941575a3 100644 --- a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h +++ b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qcontactaction.h" -#include "qcontactactionfactory.h" +#include <QtContacts/qcontactaction.h> +#include <QtContacts/qcontactactionfactory.h> #include "qserviceinterfacedescriptor.h" #include "qserviceplugininterface.h" diff --git a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp index 64a116575..4b331d990 100644 --- a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp +++ b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp @@ -44,9 +44,9 @@ #include <QtTest/QtTest> #include <QApplication> -#include "qtcontacts.h" -#include "qcontactaction.h" -#include "qcontactactiondescriptor.h" +#include <QtContacts/qtcontacts.h> +#include <QtContacts/qcontactaction.h> +#include <QtContacts/qcontactactiondescriptor.h> #include "qservicemanager.h" diff --git a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin.cpp b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin.cpp index e33f6e10b..fcab33f38 100644 --- a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin.cpp +++ b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin.cpp @@ -51,13 +51,15 @@ #define makename(x) makestr(x) #include "maliciousplugin_p.h" -#include "qcontactmanager.h" +#include <QtContacts/qcontactmanager.h> #include <QThread> #include <QMutex> #include <QSet> #include <QDebug> +QTCONTACTS_USE_NAMESPACE + class MaliciousThreadObject : public QObject { Q_OBJECT diff --git a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h index ba46752d1..fa26b879f 100644 --- a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h +++ b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qcontactmanager.h" -#include "qcontactmanagerengine.h" -#include "qcontactmanagerenginefactory.h" +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactmanagerenginefactory.h> #include <QObject> #include <QString> diff --git a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp index 264c3ab16..0ac4b7a59 100644 --- a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp +++ b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp @@ -44,26 +44,26 @@ #include <QCoreApplication> #include <QScopedPointer> -#include <QContact> -#include <QContactAbstractRequest> -#include <QContactTimestamp> -#include <QContactFetchRequest> -#include <QContactDetailFilter> -#include <QContactUrl> -#include <QContactPhoneNumber> -#include <QContactFetchByIdRequest> -#include <QContactIdFetchRequest> -#include <QContactRemoveRequest> -#include <QContactSaveRequest> -#include <QContactEmailAddress> -#include <QContactOnlineAccount> -#include <QContactTag> -#include <QContactOrganization> -#include <QContactRelationshipFetchRequest> -#include <QContactRelationshipRemoveRequest> -#include <QContactRelationshipSaveRequest> -#include <QContactName> -#include <QContactIdFilter> +#include <QtContacts/QContact> +#include <QtContacts/QContactAbstractRequest> +#include <QtContacts/QContactTimestamp> +#include <QtContacts/QContactFetchRequest> +#include <QtContacts/QContactDetailFilter> +#include <QtContacts/QContactUrl> +#include <QtContacts/QContactPhoneNumber> +#include <QtContacts/QContactFetchByIdRequest> +#include <QtContacts/QContactIdFetchRequest> +#include <QtContacts/QContactRemoveRequest> +#include <QtContacts/QContactSaveRequest> +#include <QtContacts/QContactEmailAddress> +#include <QtContacts/QContactOnlineAccount> +#include <QtContacts/QContactTag> +#include <QtContacts/QContactOrganization> +#include <QtContacts/QContactRelationshipFetchRequest> +#include <QtContacts/QContactRelationshipRemoveRequest> +#include <QtContacts/QContactRelationshipSaveRequest> +#include <QtContacts/QContactName> +#include <QtContacts/QContactIdFilter> #include "jsondbprocess.h" #include "qcontactidmock.h" diff --git a/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp b/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp index 5490c6351..a7035d96e 100644 --- a/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp +++ b/tests/auto/contacts/qcontactdetail/tst_qcontactdetail.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QContactDetail> -#include <qcontacts.h> +#include <QtContacts/QContactDetail> +#include <QtContacts/qcontacts.h> #include <QSet> diff --git a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp index 828ab864d..995e6b1af 100644 --- a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp +++ b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> -#include <qcontacts.h> -#include <QContactDetail> +#include <QtContacts/qcontacts.h> +#include <QtContacts/QContactDetail> //TESTED_COMPONENT=src/contacts diff --git a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp index 4b19fd3c4..285ef7d06 100644 --- a/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp +++ b/tests/auto/contacts/qcontactfilter/tst_qcontactfilter.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> #include <QMetaType> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> //TESTED_COMPONENT=src/contacts diff --git a/tests/auto/contacts/qcontactidmock.h b/tests/auto/contacts/qcontactidmock.h index 51903d94a..67556101b 100644 --- a/tests/auto/contacts/qcontactidmock.h +++ b/tests/auto/contacts/qcontactidmock.h @@ -43,8 +43,8 @@ #ifndef QCONTACTIDMOCK_H #define QCONTACTIDMOCK_H -#include <qcontacts.h> -#include "qcontactengineid.h" +#include <QtContacts/qcontacts.h> +#include <QtContacts/qcontactengineid.h> // // W A R N I N G diff --git a/tests/auto/contacts/qcontactjsondb/qcontactjsondbbackup.h b/tests/auto/contacts/qcontactjsondb/qcontactjsondbbackup.h index c4d414a47..7051f0a7f 100644 --- a/tests/auto/contacts/qcontactjsondb/qcontactjsondbbackup.h +++ b/tests/auto/contacts/qcontactjsondb/qcontactjsondbbackup.h @@ -43,7 +43,7 @@ #define QCONTACTJSONDBBACKUP_H #include <QList> -#include <qcontactsglobal.h> +#include <QtContacts/qcontactsglobal.h> #include "synchronizedjsondbclient.h" QT_BEGIN_NAMESPACE_CONTACTS diff --git a/tests/auto/contacts/qcontactjsondb/synchronizedjsondbclient.h b/tests/auto/contacts/qcontactjsondb/synchronizedjsondbclient.h index b6b1acef0..75c448486 100644 --- a/tests/auto/contacts/qcontactjsondb/synchronizedjsondbclient.h +++ b/tests/auto/contacts/qcontactjsondb/synchronizedjsondbclient.h @@ -46,7 +46,7 @@ #include <QString> #include <QtJsonDb/qjsondbconnection.h> #include <QtJsonDb/qjsondbrequest.h> -#include <qcontactsglobal.h> +#include <QtContacts/qcontactsglobal.h> #include "synchronizedworker.h" #include "qcontactjsondbstring.h" diff --git a/tests/auto/contacts/qcontactjsondbconverter/tst_qcontactjsondbconverter.cpp b/tests/auto/contacts/qcontactjsondbconverter/tst_qcontactjsondbconverter.cpp index 1385aee14..54f81c906 100644 --- a/tests/auto/contacts/qcontactjsondbconverter/tst_qcontactjsondbconverter.cpp +++ b/tests/auto/contacts/qcontactjsondbconverter/tst_qcontactjsondbconverter.cpp @@ -42,21 +42,21 @@ #include <QtCore/QString> #include <QtTest/QtTest> #include <QJsonObject> -#include <QContact> -#include <qcontactname.h> -#include <QContactGender> -#include <QContactOrganization> -#include <QContactBirthday> -#include <QContactAvatar> -#include <QContactRingtone> -#include <QContactNickname> -#include <QContactNote> -#include <QContactEmailAddress> -#include <QContactPhoneNumber> -#include <QContactAddress> -#include <QContactUrl> -#include <QContactIdFilter> -#include <QContactId> +#include <QtContacts/QContact> +#include <QtContacts/qcontactname.h> +#include <QtContacts/QContactGender> +#include <QtContacts/QContactOrganization> +#include <QtContacts/QContactBirthday> +#include <QtContacts/QContactAvatar> +#include <QtContacts/QContactRingtone> +#include <QtContacts/QContactNickname> +#include <QtContacts/QContactNote> +#include <QtContacts/QContactEmailAddress> +#include <QtContacts/QContactPhoneNumber> +#include <QtContacts/QContactAddress> +#include <QtContacts/QContactUrl> +#include <QtContacts/QContactIdFilter> +#include <QtContacts/QContactId> #include "qcontactjsondbconverter.h" #include "qcontactjsondbengine.h" diff --git a/tests/auto/contacts/qcontactjsondbstoragelocations/missingstoragelocations/tst_missingstorage.h b/tests/auto/contacts/qcontactjsondbstoragelocations/missingstoragelocations/tst_missingstorage.h index 7b76d4844..0f86cf6e7 100644 --- a/tests/auto/contacts/qcontactjsondbstoragelocations/missingstoragelocations/tst_missingstorage.h +++ b/tests/auto/contacts/qcontactjsondbstoragelocations/missingstoragelocations/tst_missingstorage.h @@ -45,15 +45,14 @@ #include <QtTest/QtTest> #include <QtGlobal> -#include <QContact> -#include <QContactAbstractRequest> -#include <QContactFetchRequest> -#include <QContactFetchByIdRequest> -#include <QContactIdFetchRequest> -#include <QContactRemoveRequest> -#include <QContactSaveRequest> - -#include "qcontactengineid.h" +#include <QtContacts/QContact> +#include <QtContacts/QContactAbstractRequest> +#include <QtContacts/QContactFetchRequest> +#include <QtContacts/QContactFetchByIdRequest> +#include <QtContacts/QContactIdFetchRequest> +#include <QtContacts/QContactRemoveRequest> +#include <QtContacts/QContactSaveRequest> +#include <QtContacts/qcontactengineid.h> #include "qcontactjsondbid.h" #include "jsondbprocess.h" diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp index 3e91d721d..a45bbc838 100644 --- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp +++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp @@ -47,15 +47,15 @@ #include <QtContacts> #include "qcontactmanagerdataholder.h" -#include "qcontactchangeset.h" #include "jsondbprocess.h" #include "qcontactidmock.h" #if defined(USE_VERSIT_PLZ) // This makes it easier to create specific QContacts -#include "qversitcontactimporter.h" -#include "qversitdocument.h" -#include "qversitreader.h" +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitreader.h> +QTVERSIT_USE_NAMESPACE #endif QTCONTACTS_USE_NAMESPACE diff --git a/tests/auto/contacts/qcontactmanagerdataholder.h b/tests/auto/contacts/qcontactmanagerdataholder.h index c0427ce77..e55bce02e 100644 --- a/tests/auto/contacts/qcontactmanagerdataholder.h +++ b/tests/auto/contacts/qcontactmanagerdataholder.h @@ -39,17 +39,15 @@ ** ****************************************************************************/ - #ifndef QCONTACTMANAGERDATAHOLDER_H #define QCONTACTMANAGERDATAHOLDER_H -#include <QMap> -#include <QMultiMap> -#include <QList> -#include <QString> -#include <QDebug> +#include <QtCore/qdebug.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qstring.h> -#include "qcontactmanager.h" +#include <QtContacts/qcontactmanager.h> // // W A R N I N G @@ -112,7 +110,4 @@ private: QMap<QString, QList<QContact> > savedContacts; }; - - -#endif - +#endif // QCONTACTMANAGERDATAHOLDER_H diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h index 6b5465f72..0c14be57d 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h +++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qserviceplugininterface.h" #include "qservicecontext.h" #include "qserviceinterfacedescriptor.h" diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h index 449b583b8..c844be061 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h +++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qserviceplugininterface.h" #include "qservicecontext.h" #include "qserviceinterfacedescriptor.h" diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h index 2340ecbb9..6b179be76 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h +++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qserviceplugininterface.h" #include "qservicecontext.h" #include "qserviceinterfacedescriptor.h" diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h index 6936848b7..149c3600b 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h +++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qserviceplugininterface.h" #include "qservicecontext.h" #include "qserviceinterfacedescriptor.h" diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h index ff5bfa419..ffd1601a4 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h +++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qserviceplugininterface.h" #include "qservicecontext.h" #include "qserviceinterfacedescriptor.h" diff --git a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp index f76b9a9cd..05d53a335 100644 --- a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp +++ b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include "qservicemanager.h" -#include "qtcontacts.h" +#include <QtContacts/qtcontacts.h> #include "qcontactmanagerdataholder.h" //QContactManagerDataHolder //TESTED_COMPONENT=src/contacts diff --git a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp index e80ef2ed4..236b72ced 100644 --- a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp +++ b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp @@ -48,9 +48,9 @@ #define makestr(x) (#x) #define makename(x) makestr(x) -#include "qcontactmanager.h" -#include "qcontactmanagerengine.h" -#include "qcontactmanagerenginefactory.h" +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactmanagerenginefactory.h> #include "dummyplugin.h" diff --git a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h index d60e0c749..125e6930e 100644 --- a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h +++ b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h @@ -41,10 +41,10 @@ #ifndef DUMMYPLUGIN_H #define DUMMYPLUGIN_H -#include "qcontactmanagerenginefactory.h" -#include "qcontactmanagerengine.h" -#include "qscopedpointer.h" -#include "qcontactmanager.h" +#include <QtContacts/qcontactmanager.h> +#include <QtContacts/qcontactmanagerengine.h> +#include <QtContacts/qcontactmanagerenginefactory.h> +#include <QtCore/qscopedpointer.h> QTCONTACTS_USE_NAMESPACE diff --git a/tests/auto/contacts/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp b/tests/auto/contacts/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp index 111bcb7ad..b4a9e4082 100644 --- a/tests/auto/contacts/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp +++ b/tests/auto/contacts/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp @@ -46,7 +46,7 @@ #include <QtTest/QtTest> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> #include <QApplication> QTCONTACTS_USE_NAMESPACE diff --git a/tests/auto/contacts/qcontactmemusage/tst_qcontactmemusage.cpp b/tests/auto/contacts/qcontactmemusage/tst_qcontactmemusage.cpp index 17ee4ca13..ab85277a4 100644 --- a/tests/auto/contacts/qcontactmemusage/tst_qcontactmemusage.cpp +++ b/tests/auto/contacts/qcontactmemusage/tst_qcontactmemusage.cpp @@ -42,10 +42,12 @@ #include <malloc.h> #include <QtTest/QtTest> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> //TESTED_COMPONENT=src/contacts +QTCONTACTS_USE_NAMESPACE + // Define global op new so we can track some amount of allocations static qulonglong cAllocated = 0; static qulonglong nAllocations = 0; diff --git a/tests/auto/contacts/qcontactrelationship/tst_qcontactrelationship.cpp b/tests/auto/contacts/qcontactrelationship/tst_qcontactrelationship.cpp index ee2e3e2f9..90ec5f7f2 100644 --- a/tests/auto/contacts/qcontactrelationship/tst_qcontactrelationship.cpp +++ b/tests/auto/contacts/qcontactrelationship/tst_qcontactrelationship.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> #include "../qcontactidmock.h" QTCONTACTS_USE_NAMESPACE diff --git a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp index 6d005717f..7f486957a 100644 --- a/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp +++ b/tests/auto/organizer/qorganizercollection/tst_qorganizercollection.cpp @@ -41,10 +41,11 @@ #include <QtTest/QtTest> -#include "qorganizer.h" -#include "qorganizeritemid.h" -#include "qorganizercollectionengineid.h" -#include <QSet> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizer.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizercollectionengineid.h> //TESTED_COMPONENT=src/organizer diff --git a/tests/auto/organizer/qorganizere2e/tst_qorganizere2e.cpp b/tests/auto/organizer/qorganizere2e/tst_qorganizere2e.cpp index 49fa1e6a3..63ab95e2c 100644 --- a/tests/auto/organizer/qorganizere2e/tst_qorganizere2e.cpp +++ b/tests/auto/organizer/qorganizere2e/tst_qorganizere2e.cpp @@ -41,9 +41,9 @@ #include <QtTest/QtTest> -#include <qorganizeritemdetails.h> -#include <qorganizeritems.h> -#include <qorganizermanager.h> +#include <QtOrganizer/qorganizeritemdetails.h> +#include <QtOrganizer/qorganizeritems.h> +#include <QtOrganizer/qorganizermanager.h> #include "../../jsondbprocess.h" QTORGANIZER_USE_NAMESPACE diff --git a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp index ba206f466..74ee5839b 100644 --- a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp +++ b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp @@ -41,10 +41,11 @@ #include <QtTest/QtTest> -#include "qorganizer.h" -#include "qorganizeritemid.h" -#include "qorganizeritemengineid.h" -#include <QSet> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizer.h> +#include <QtOrganizer/qorganizeritemid.h> +#include <QtOrganizer/qorganizeritemengineid.h> //TESTED_COMPONENT=src/organizer diff --git a/tests/auto/organizer/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp b/tests/auto/organizer/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp index 642e2b845..a8a8d3517 100644 --- a/tests/auto/organizer/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp +++ b/tests/auto/organizer/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp @@ -41,10 +41,10 @@ #include <QtTest/QtTest> -#include <QCoreApplication> -#include <QScopedPointer> +#include <QtCore/QCoreApplication> +#include <QtCore/QScopedPointer> -#include <qorganizer.h> +#include <QtOrganizer/qorganizer.h> #include "../../qorganizermanagerdataholder.h" //QOrganizerManagerDataHolder #include "../../../jsondbprocess.h" diff --git a/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp b/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp index 39f3d6bd5..5d51bcbf2 100644 --- a/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp +++ b/tests/auto/organizer/qorganizeritemdetail/tst_qorganizeritemdetail.cpp @@ -41,8 +41,9 @@ #include <QtTest/QtTest> -#include "qorganizer.h" -#include <QSet> +#include <QtCore/qset.h> + +#include <QtOrganizer/qorganizer.h> //TESTED_COMPONENT=src/organizer diff --git a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp index dabce05ab..fe6981e52 100644 --- a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp +++ b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include "qorganizer.h" +#include <QtOrganizer/qorganizer.h> //TESTED_COMPONENT=src/organizer diff --git a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp index 4a6fbcef5..81e2e55e0 100644 --- a/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp +++ b/tests/auto/organizer/qorganizeritemfilter/tst_qorganizeritemfilter.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ #include <QtTest/QtTest> -#include <QMetaType> +#include <QtCore/QMetaType> -#include "qorganizer.h" -#include "qorganizeritemengineid.h" +#include <QtOrganizer/qorganizer.h> +#include <QtOrganizer/qorganizeritemengineid.h> //TESTED_COMPONENT=src/organizer diff --git a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp index 927cb6363..5d0cf9e01 100644 --- a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp +++ b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp @@ -42,17 +42,17 @@ //TESTED_COMPONENT=src/organizer #include <QtTest/QtTest> -#include <QUuid> +#include <QtCore/QUuid> -#include "qorganizer.h" -#include "qorganizeritemchangeset.h" +#include <QtOrganizer/qorganizer.h> +#include <QtOrganizer/qorganizeritemchangeset.h> #include "../qorganizermanagerdataholder.h" #include "../../jsondbprocess.h" -#include "qorganizernote.h" -#include "qorganizerevent.h" +#include <QtOrganizer/qorganizernote.h> +#include <QtOrganizer/qorganizerevent.h> -#include "qorganizeritemengineid.h" +#include <QtOrganizer/qorganizeritemengineid.h> QTORGANIZER_USE_NAMESPACE diff --git a/tests/auto/organizer/qorganizermanagerdataholder.h b/tests/auto/organizer/qorganizermanagerdataholder.h index a96f321c1..22607fdf2 100644 --- a/tests/auto/organizer/qorganizermanagerdataholder.h +++ b/tests/auto/organizer/qorganizermanagerdataholder.h @@ -43,14 +43,6 @@ #ifndef QORGANIZERITEMMANAGERDATAHOLDER_H #define QORGANIZERITEMMANAGERDATAHOLDER_H -#include <QMap> -#include <QMultiMap> -#include <QList> -#include <QString> -#include <QDebug> - -#include "qorganizermanager.h" - // // W A R N I N G // ------------- @@ -62,6 +54,13 @@ // We mean it. // +#include <QtCore/qdebug.h> +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qstring.h> + +#include <QtOrganizer/qorganizermanager.h> + QTORGANIZER_USE_NAMESPACE class QOrganizerManagerDataHolder diff --git a/tests/auto/organizer/qorganizermanagerdetails/tst_qorganizermanagerdetails.cpp b/tests/auto/organizer/qorganizermanagerdetails/tst_qorganizermanagerdetails.cpp index fb84f3f53..61ad7a368 100644 --- a/tests/auto/organizer/qorganizermanagerdetails/tst_qorganizermanagerdetails.cpp +++ b/tests/auto/organizer/qorganizermanagerdetails/tst_qorganizermanagerdetails.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QDateTime> -#include "qorganizer.h" +#include <QtCore/QDateTime> +#include <QtOrganizer/qorganizer.h> #include "../qorganizermanagerdataholder.h" #include "../../jsondbprocess.h" diff --git a/tests/auto/versit/qvcard21writer/tst_qvcard21writer.cpp b/tests/auto/versit/qvcard21writer/tst_qvcard21writer.cpp index 01d89603d..071c893ce 100644 --- a/tests/auto/versit/qvcard21writer/tst_qvcard21writer.cpp +++ b/tests/auto/versit/qvcard21writer/tst_qvcard21writer.cpp @@ -43,10 +43,10 @@ #include "tst_qvcard21writer.h" #ifdef QT_BUILD_INTERNAL -#include <private/qvcard21writer_p.h> +#include <QtVersit/private/qvcard21writer_p.h> #endif -#include <qversitproperty.h> -#include <qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/qversitdocument.h> #include <QtTest/QtTest> #include <QByteArray> #include <QVariant> diff --git a/tests/auto/versit/qvcard21writer/tst_qvcard21writer.h b/tests/auto/versit/qvcard21writer/tst_qvcard21writer.h index 1e3143e98..1aee8cc2a 100644 --- a/tests/auto/versit/qvcard21writer/tst_qvcard21writer.h +++ b/tests/auto/versit/qvcard21writer/tst_qvcard21writer.h @@ -43,7 +43,7 @@ #define tst_QVCARD21WRITER_H #include <QObject> -#include <qversitglobal.h> +#include <QtVersit/qversitglobal.h> QT_BEGIN_NAMESPACE_VERSIT class QVCard21Writer; diff --git a/tests/auto/versit/qvcard30writer/tst_qvcard30writer.cpp b/tests/auto/versit/qvcard30writer/tst_qvcard30writer.cpp index 1ec391245..bd2323d71 100644 --- a/tests/auto/versit/qvcard30writer/tst_qvcard30writer.cpp +++ b/tests/auto/versit/qvcard30writer/tst_qvcard30writer.cpp @@ -43,10 +43,10 @@ #include "tst_qvcard30writer.h" #ifdef QT_BUILD_INTERNAL -#include <private/qvcard30writer_p.h> +#include <QtVersit/private/qvcard30writer_p.h> #endif -#include <qversitdocument.h> -#include <qversitproperty.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> #include <QtTest/QtTest> #include <QByteArray> #include <QVariant> diff --git a/tests/auto/versit/qvcard30writer/tst_qvcard30writer.h b/tests/auto/versit/qvcard30writer/tst_qvcard30writer.h index d6ecedd8a..01a87cdc1 100644 --- a/tests/auto/versit/qvcard30writer/tst_qvcard30writer.h +++ b/tests/auto/versit/qvcard30writer/tst_qvcard30writer.h @@ -43,7 +43,7 @@ #define tst_QVCARD30WRITER_H #include <QObject> -#include <qversitglobal.h> +#include <QtVersit/qversitglobal.h> QT_BEGIN_NAMESPACE_VERSIT class QVCard30Writer; diff --git a/tests/auto/versit/qversit/tst_qversit.cpp b/tests/auto/versit/qversit/tst_qversit.cpp index 754e282bc..636681c76 100644 --- a/tests/auto/versit/qversit/tst_qversit.cpp +++ b/tests/auto/versit/qversit/tst_qversit.cpp @@ -41,24 +41,27 @@ //TESTED_COMPONENT=src/versit -#include <private/qversitdefs_p.h> #include "tst_qversit.h" -#include "qversitwriter.h" -#include "qversitreader.h" -#include <private/qversitreader_p.h> -#include "qversitcontactexporter.h" -#include "qversitcontactimporter.h" -#include "qversitcontacthandler.h" -#include "qversitorganizerexporter.h" -#include "qversitorganizerimporter.h" -#include "qorganizer.h" -#include <qcontacts.h> +#include <QtContacts/qcontacts.h> +#include <QtOrganizer/qorganizer.h> +#include <QtVersit/qversitwriter.h> +#include <QtVersit/qversitreader.h> +#include <QtVersit/qversitcontactexporter.h> +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/private/qversitdefs_p.h> +#include <QtVersit/private/qversitreader_p.h> +#include <QtVersitOrganizer/qversitorganizerexporter.h> +#include <QtVersitOrganizer/qversitorganizerimporter.h> #include <QtTest/QtTest> #include <QDebug> #include <QDir> #include <QList> +QTCONTACTS_USE_NAMESPACE +QTORGANIZER_USE_NAMESPACE QTVERSIT_USE_NAMESPACE QTVERSITORGANIZER_USE_NAMESPACE diff --git a/tests/auto/versit/qversit/tst_qversit.h b/tests/auto/versit/qversit/tst_qversit.h index 8b5aa9031..3a8ba7041 100644 --- a/tests/auto/versit/qversit/tst_qversit.h +++ b/tests/auto/versit/qversit/tst_qversit.h @@ -43,7 +43,7 @@ #define tst_QVERSIT_H #include <QObject> -#include <qversitdocument.h> +#include <QtVersit/qversitdocument.h> QT_BEGIN_NAMESPACE_VERSIT @@ -53,4 +53,6 @@ class QVersitReader; QT_END_NAMESPACE_VERSIT +QTVERSIT_USE_NAMESPACE + #endif // tst_QVERSIT_H diff --git a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp index e80e35749..91eeb23b1 100644 --- a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp +++ b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp @@ -42,18 +42,18 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitcontactexporter.h" -#include <qversitcontactexporter.h> -#include <qversitglobal.h> -#include <qversitdocument.h> -#include <qversitproperty.h> -#include <qcontactmanagerengine.h> +#include <QtVersit/qversitcontactexporter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtContacts/qcontacts.h> +#include <QtContacts/qcontactmanagerengine.h> #include <QString> #include <QStringList> #include <QList> #include <QPixmap> #include <QtTest/QtTest> -#include <qcontacts.h> +QTCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE class MyQVersitContactExporterDetailHandler : public QVersitContactExporterDetailHandler diff --git a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.h b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.h index 3fdf31ab3..f8413bf7d 100644 --- a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.h +++ b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.h @@ -42,10 +42,10 @@ #ifndef tst_QVERSITCONTACTEXPORTER_H #define tst_QVERSITCONTACTEXPORTER_H -#include <qcontactdetail.h> #include <QObject> -#include <qcontact.h> -#include <qversitproperty.h> +#include <QtContacts/qcontact.h> +#include <QtContacts/qcontactdetail.h> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitContactExporter; diff --git a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp index 49140ecbd..04b75cee5 100644 --- a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp +++ b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp @@ -42,15 +42,17 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitcontactimporter.h" -#include <qversitcontactimporter.h> -#include <private/qversitcontactimporter_p.h> -#include <qversitproperty.h> -#include <qversitdocument.h> -#include <qcontacts.h> +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/private/qversitcontactimporter_p.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/qversitdocument.h> +#include <QtContacts/qcontacts.h> #include <QtTest/QtTest> #include <QDir> +QTCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE + class MyQVersitContactImporterPropertyHandler : public QVersitContactImporterPropertyHandler { public: diff --git a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.h b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.h index 6c5046492..2c53d097a 100644 --- a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.h +++ b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.h @@ -43,8 +43,8 @@ #define tst_QVERSITCONTACTIMPORTER_H #include <QObject> -#include <qversitcontactimporter.h> -#include <qversitdocument.h> +#include <QtVersit/qversitcontactimporter.h> +#include <QtVersit/qversitdocument.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitContactImporter; diff --git a/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.h b/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.h index 08c85ec56..2b9ed90ce 100644 --- a/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.h +++ b/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.h @@ -43,8 +43,8 @@ #define PLUGIN_H #include <QObject> -#include <qversitcontacthandler.h> -#include <qversitproperty.h> +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.h b/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.h index ec09799e0..1383d08c2 100644 --- a/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.h +++ b/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.h @@ -43,8 +43,8 @@ #define PLUGIN_H #include <QObject> -#include "qversitcontacthandler.h" -#include "qversitproperty.h" +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.h b/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.h index 954390e7c..b2005be1a 100644 --- a/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.h +++ b/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.h @@ -43,8 +43,8 @@ #define PLUGIN_H #include <QObject> -#include "qversitcontacthandler.h" -#include "qversitproperty.h" +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.h b/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.h index 2ab706773..05521491a 100644 --- a/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.h +++ b/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.h @@ -43,8 +43,8 @@ #define PLUGIN_H #include <QObject> -#include "qversitcontacthandler.h" -#include "qversitproperty.h" +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.h b/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.h index 57a5eed98..0c198b4ba 100644 --- a/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.h +++ b/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.h @@ -43,8 +43,8 @@ #define PLUGIN_H #include <QObject> -#include "qversitcontacthandler.h" -#include "qversitproperty.h" +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitcontactplugins/unittest/tst_qversitcontactplugins.cpp b/tests/auto/versit/qversitcontactplugins/unittest/tst_qversitcontactplugins.cpp index 9895659d0..f2477aae9 100644 --- a/tests/auto/versit/qversitcontactplugins/unittest/tst_qversitcontactplugins.cpp +++ b/tests/auto/versit/qversitcontactplugins/unittest/tst_qversitcontactplugins.cpp @@ -39,13 +39,14 @@ ** ****************************************************************************/ -#include "qversitcontacthandler.h" -#include "qversitproperty.h" -#include "qcontactname.h" +#include <QtVersit/qversitcontacthandler.h> +#include <QtVersit/qversitproperty.h> +#include <QtContacts/qcontactname.h> #include <QObject> #include <QtTest/QtTest> +QTCONTACTS_USE_NAMESPACE QTVERSIT_USE_NAMESPACE class TestFactory1 : public QVersitContactHandlerFactory diff --git a/tests/auto/versit/qversitdocument/tst_qversitdocument.cpp b/tests/auto/versit/qversitdocument/tst_qversitdocument.cpp index 01c28fab8..1ad27c7b0 100644 --- a/tests/auto/versit/qversitdocument/tst_qversitdocument.cpp +++ b/tests/auto/versit/qversitdocument/tst_qversitdocument.cpp @@ -42,8 +42,8 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitdocument.h" -#include "qversitdocument.h" -#include "qversitproperty.h" +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> #include <QString> #include <QtTest/QtTest> diff --git a/tests/auto/versit/qversitdocument/tst_qversitdocument.h b/tests/auto/versit/qversitdocument/tst_qversitdocument.h index 0b6c79142..650d2c0fd 100644 --- a/tests/auto/versit/qversitdocument/tst_qversitdocument.h +++ b/tests/auto/versit/qversitdocument/tst_qversitdocument.h @@ -43,7 +43,7 @@ #define tst_QVERSITDOCUMENT_H #include <QObject> -#include <qversitdocument.h> +#include <QtVersit/qversitdocument.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitDocument; diff --git a/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp b/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp index d2e2c7f5c..43db3041a 100644 --- a/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp +++ b/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp @@ -42,9 +42,9 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitproperty.h" -#include <qversitproperty.h> -#include <private/qversitproperty_p.h> -#include <qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/private/qversitproperty_p.h> +#include <QtVersit/qversitdocument.h> #include <QtTest/QtTest> QTVERSIT_USE_NAMESPACE diff --git a/tests/auto/versit/qversitproperty/tst_qversitproperty.h b/tests/auto/versit/qversitproperty/tst_qversitproperty.h index c1d3f970a..8d5e90705 100644 --- a/tests/auto/versit/qversitproperty/tst_qversitproperty.h +++ b/tests/auto/versit/qversitproperty/tst_qversitproperty.h @@ -43,7 +43,7 @@ #define tst_QVERSITPROPERTY_H #include <QObject> -#include <qversitproperty.h> +#include <QtVersit/qversitproperty.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitProperty; diff --git a/tests/auto/versit/qversitreader/tst_qversitreader.cpp b/tests/auto/versit/qversitreader/tst_qversitreader.cpp index b4da0fb14..d97aa849e 100644 --- a/tests/auto/versit/qversitreader/tst_qversitreader.cpp +++ b/tests/auto/versit/qversitreader/tst_qversitreader.cpp @@ -42,9 +42,9 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitreader.h" -#include <qversitproperty.h> -#include <private/qversitreader_p.h> -#include <private/qversitutils_p.h> +#include <QtVersit/qversitproperty.h> +#include <QtVersit/private/qversitreader_p.h> +#include <QtVersit/private/qversitutils_p.h> #include <QtTest/QtTest> #include <QSignalSpy> diff --git a/tests/auto/versit/qversitreader/tst_qversitreader.h b/tests/auto/versit/qversitreader/tst_qversitreader.h index 62e57c6f3..083f01e29 100644 --- a/tests/auto/versit/qversitreader/tst_qversitreader.h +++ b/tests/auto/versit/qversitreader/tst_qversitreader.h @@ -44,7 +44,7 @@ #include <QObject> #include <QBuffer> -#include <qversitreader.h> +#include <QtVersit/qversitreader.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitReaderPrivate; diff --git a/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp b/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp index bc8105568..0d993da4d 100644 --- a/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp +++ b/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp @@ -42,9 +42,9 @@ //TESTED_COMPONENT=src/versit #include "tst_qversitwriter.h" -#include "qversitwriter.h" -#include "qversitdocument.h" -#include "qversitproperty.h" +#include <QtVersit/qversitwriter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> #include <QtTest/QtTest> #include <QByteArray> diff --git a/tests/auto/versit/qversitwriter/tst_qversitwriter.h b/tests/auto/versit/qversitwriter/tst_qversitwriter.h index 4ddd63671..4da58c891 100644 --- a/tests/auto/versit/qversitwriter/tst_qversitwriter.h +++ b/tests/auto/versit/qversitwriter/tst_qversitwriter.h @@ -44,7 +44,7 @@ #include <QObject> #include <QBuffer> -#include <qversitwriter.h> +#include <QtVersit/qversitwriter.h> QT_BEGIN_NAMESPACE_VERSIT class QVersitWriterPrivate; diff --git a/tests/auto/versitorganizer/qversitorganizerexporter/tst_qversitorganizerexporter.h b/tests/auto/versitorganizer/qversitorganizerexporter/tst_qversitorganizerexporter.h index 651b3329d..00601f320 100644 --- a/tests/auto/versitorganizer/qversitorganizerexporter/tst_qversitorganizerexporter.h +++ b/tests/auto/versitorganizer/qversitorganizerexporter/tst_qversitorganizerexporter.h @@ -43,12 +43,14 @@ #define tst_QVERSITORGANIZEREXPORTER_H #include <QObject> -#include "qversitorganizerexporter.h" -#include "qversitdocument.h" -#include "qversitproperty.h" -#include "qorganizer.h" +#include <QtVersitOrganizer/qversitorganizerexporter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtOrganizer/qorganizer.h> +QTORGANIZER_USE_NAMESPACE QTVERSIT_USE_NAMESPACE +QTVERSITORGANIZER_USE_NAMESPACE class tst_QVersitOrganizerExporter : public QObject { diff --git a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.h b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.h index 24a3ccdc9..a45e19a65 100644 --- a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.h +++ b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.h @@ -43,10 +43,14 @@ #define tst_QVERSITORGANIZERIMPORTER_H #include <QObject> -#include "qversitorganizerimporter.h" -#include "qversitdocument.h" -#include "qversitproperty.h" -#include "qorganizer.h" +#include <QtVersitOrganizer/qversitorganizerimporter.h> +#include <QtVersit/qversitdocument.h> +#include <QtVersit/qversitproperty.h> +#include <QtOrganizer/qorganizer.h> + +QTORGANIZER_USE_NAMESPACE +QTVERSIT_USE_NAMESPACE +QTVERSITORGANIZER_USE_NAMESPACE class tst_QVersitOrganizerImporter : public QObject { |