diff options
Diffstat (limited to 'src/imports/contacts')
12 files changed, 20 insertions, 28 deletions
diff --git a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp index a30cc8520..c85ebd1d6 100644 --- a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp +++ b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp @@ -39,8 +39,6 @@ #include "qdeclarativecontactdetails_p.h" -QT_BEGIN_NAMESPACE - #include "moc_qdeclarativecontactaddress_p.cpp" #include "moc_qdeclarativecontactanniversary_p.cpp" #include "moc_qdeclarativecontactavatar_p.cpp" @@ -69,5 +67,3 @@ QT_BEGIN_NAMESPACE #include "moc_qdeclarativecontacttimestamp_p.cpp" #include "moc_qdeclarativecontacturl_p.cpp" #include "moc_qdeclarativecontactversion_p.cpp" - -QT_END_NAMESPACE diff --git a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp index ff0986b23..ef7bb462f 100644 --- a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp +++ b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp @@ -39,8 +39,6 @@ #include "qdeclarativecontactfilters_p.h" -QT_BEGIN_NAMESPACE - #include "moc_qdeclarativecontactactionfilter_p.cpp" #include "moc_qdeclarativecontactchangelogfilter_p.cpp" #include "moc_qdeclarativecontactcollectionfilter_p.cpp" @@ -51,5 +49,3 @@ QT_BEGIN_NAMESPACE #include "moc_qdeclarativecontactidfilter_p.cpp" #include "moc_qdeclarativecontactrelationshipfilter_p.cpp" #include "moc_qdeclarativecontactunionfilter_p.cpp" - -QT_END_NAMESPACE diff --git a/src/imports/contacts/plugin.cpp b/src/imports/contacts/plugin.cpp index 450f8117c..61cbab946 100644 --- a/src/imports/contacts/plugin.cpp +++ b/src/imports/contacts/plugin.cpp @@ -135,6 +135,6 @@ public: } }; -#include "plugin.moc" - QT_END_NAMESPACE + +#include "plugin.moc" diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp index 26cc2eb74..6968c3885 100644 --- a/src/imports/contacts/qdeclarativecontact.cpp +++ b/src/imports/contacts/qdeclarativecontact.cpp @@ -904,6 +904,6 @@ int QDeclarativeContact::_q_detail_count(QQmlListProperty<QDeclarativeContactDet return 0; } -#include "moc_qdeclarativecontact_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontact_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactcollection.cpp b/src/imports/contacts/qdeclarativecontactcollection.cpp index 20ec3a24d..96820c4a9 100644 --- a/src/imports/contacts/qdeclarativecontactcollection.cpp +++ b/src/imports/contacts/qdeclarativecontactcollection.cpp @@ -230,6 +230,6 @@ void QDeclarativeContactCollection::setCollection(const QContactCollection &coll d = collection; } -#include "moc_qdeclarativecontactcollection_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactcollection_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactdetail.cpp b/src/imports/contacts/qdeclarativecontactdetail.cpp index 378a9599a..c55223778 100644 --- a/src/imports/contacts/qdeclarativecontactdetail.cpp +++ b/src/imports/contacts/qdeclarativecontactdetail.cpp @@ -1305,6 +1305,6 @@ void QDeclarativeContactExtendedDetail::setData(const QVariant &newData) \endlist */ -#include "moc_qdeclarativecontactdetail_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactdetail_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactfetchhint.cpp b/src/imports/contacts/qdeclarativecontactfetchhint.cpp index 0bc643322..6da4ee967 100644 --- a/src/imports/contacts/qdeclarativecontactfetchhint.cpp +++ b/src/imports/contacts/qdeclarativecontactfetchhint.cpp @@ -193,6 +193,6 @@ void QDeclarativeContactFetchHint::setFetchHint(const QContactFetchHint& fetchHi emit fetchHintChanged(); } -#include "moc_qdeclarativecontactfetchhint_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactfetchhint_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactfilter.cpp b/src/imports/contacts/qdeclarativecontactfilter.cpp index 205616f89..dc8006fd0 100644 --- a/src/imports/contacts/qdeclarativecontactfilter.cpp +++ b/src/imports/contacts/qdeclarativecontactfilter.cpp @@ -417,6 +417,6 @@ void QDeclarativeContactCompoundFilter::filters_clear(QQmlListProperty<QDeclarat } } -#include "moc_qdeclarativecontactfilter_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactfilter_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp index 4ef1e5efa..00d16e78a 100644 --- a/src/imports/contacts/qdeclarativecontactmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactmodel.cpp @@ -1576,6 +1576,6 @@ int QDeclarativeContactModel::contactIndex(const QDeclarativeContact* contact) return d->m_contacts.size(); } -#include "moc_qdeclarativecontactmodel_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactmodel_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp index c64a9bd52..19660a6b6 100644 --- a/src/imports/contacts/qdeclarativecontactrelationship.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp @@ -167,6 +167,6 @@ void QDeclarativeContactRelationship::setRelationship(const QContactRelationship emit valueChanged(); } -#include "moc_qdeclarativecontactrelationship_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactrelationship_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp index afcf38f16..ff4e5a776 100644 --- a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp @@ -424,6 +424,6 @@ void QDeclarativeContactRelationshipModel::relationshipsRemoved() } } -#include "moc_qdeclarativecontactrelationshipmodel_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactrelationshipmodel_p.cpp" diff --git a/src/imports/contacts/qdeclarativecontactsortorder.cpp b/src/imports/contacts/qdeclarativecontactsortorder.cpp index a85c936e5..974d6f2da 100644 --- a/src/imports/contacts/qdeclarativecontactsortorder.cpp +++ b/src/imports/contacts/qdeclarativecontactsortorder.cpp @@ -172,6 +172,6 @@ void QDeclarativeContactSortOrder::setSortOrder(const QContactSortOrder& sortOrd emit sortOrderChanged(); } -#include "moc_qdeclarativecontactsortorder_p.cpp" - QT_END_NAMESPACE + +#include "moc_qdeclarativecontactsortorder_p.cpp" |