Don't mention "mobility" in QtPim

...and replace QTM_USE_NAMESPACE with appropriate namespace(s).
Some occurrences intentionally omitted in the code
that requires Service Framework.

Change-Id: I553b93f6773f434e7752ffa7a25091741dda79e5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

22 files changed, 35 insertions, 40 deletions

diff --git a/src/contacts/details/qcontactversion.h b/src/contacts/details/qcontactversion.h
index f8040635d..4b98240f8 100644
--- a/src/contacts/details/qcontactversion.h
+++ b/src/contacts/details/qcontactversion.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtContacts module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
index 63765220e..9d164fdc5 100644
--- a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
+++ b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp
index b0b1c0a0a..755634aae 100644
--- a/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp
+++ b/src/contacts/doc/snippets/qtcontactsdocsample/qtcontactsdocsampleasync.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h b/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h
index aae707936..41e862fde 100644
--- a/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h
+++ b/src/contacts/doc/snippets/qtcontactsdocsample/requestexample.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/imports/contacts/details/qdeclarativecontactversion_p.h b/src/imports/contacts/details/qdeclarativecontactversion_p.h
index 441f86c8b..3a1f5349a 100644
--- a/src/imports/contacts/details/qdeclarativecontactversion_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactversion_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtContacts module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
index 8459b8672..1603c08c4 100644
--- a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
+++ b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "qmobilityglobal.h"
 #include "qtorganizer.h"
 
 #include <QDebug>
@@ -47,7 +46,7 @@
 #include <QObject>
 #include <QTimer>
 
-QTM_USE_NAMESPACE
+QTORGANIZER_USE_NAMESPACE
 
 static void snippets();
 static void dumpItems(QOrganizerManager* manager);
diff --git a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.pro b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.pro
index 82824cae9..6bb8ffde0 100644
--- a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.pro
+++ b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += ../../../../src/global \
                ../../../../src/organizer/items \
                ../../../../src/organizer/filters
 
-CONFIG += mobility console
-MOBILITY = organizer
+CONFIG += console
+QT = organizer
 
 SOURCES += qtorganizerdocsample.cpp
diff --git a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
index a6e74246c..7e87a45c3 100644
--- a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
+++ b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "qmobilityglobal.h"
 #include "qtcontacts.h"
 #include "qcontacttag.h"
 #include "qversitreader.h"
@@ -54,7 +53,7 @@
 #include <QList>
 #include <QFile>
 
-QTM_USE_NAMESPACE
+QTVERSIT_USE_NAMESPACE
 
 void completeExample();
 void exportExample();
diff --git a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.pro b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.pro
index 4987a47e8..e6795261e 100644
--- a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.pro
+++ b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += ../../../../src/global \
                ../../../../src/contacts/details \
                ../../../../src/versit
 
-CONFIG += mobility console
-MOBILITY = contacts versit
+CONFIG += console
+QT = contacts versit
 
 SOURCES += qtversitdocsample.cpp
diff --git a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
index cb43cb364..b2f6f3c3a 100644
--- a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
+++ b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h b/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h
index de5a923dc..26d2989d1 100644
--- a/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h
+++ b/tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -65,7 +65,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 //! [Example Contact Action Plugin Declaration]
 
diff --git a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp
index 2e54d7d87..d818df8f8 100644
--- a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp
+++ b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h
index f48268d55..877bc57ae 100644
--- a/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h
+++ b/tests/auto/contacts/qcontactactions/sendemailaction/sendemailaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -65,8 +65,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
-
+QTCONTACTS_USE_NAMESPACE
 
 class QContactSendEmailActionPlugin : public QObject, public QServicePluginInterface
 {
diff --git a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
index 78db23c68..64a116575 100644
--- a/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
+++ b/tests/auto/contacts/qcontactactions/unittest/tst_qcontactactions.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -50,7 +50,7 @@
 
 #include "qservicemanager.h"
 
-QTM_USE_NAMESPACE 
+QTCONTACTS_USE_NAMESPACE
 
 class tst_QContactActions : public QObject
 {
diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
index 8562f6335..3e91d721d 100644
--- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
+++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
index b497683bf..6b5465f72 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 class DummyAction : public QContactAction
 {
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
index 0045b8b61..449b583b8 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 class DummyAction : public QContactAction
 {
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
index 500b8f07c..2340ecbb9 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 class DummyAction : public QContactAction
 {
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
index 93af4748a..6936848b7 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 class DummyAction : public QContactAction
 {
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
index 0547f26fb..ff5bfa419 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 #include <QString>
 #include <QVariantMap>
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 
 class DummyAction : public QContactAction
 {
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
index 8817fd343..f76b9a9cd 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
+++ b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
@@ -55,7 +55,7 @@ do {                                                                      \
         qFatal("severe failure encountered, test cannot continue");       \
 } while (0)
 
-QTM_USE_NAMESPACE
+QTCONTACTS_USE_NAMESPACE
 /*
  * This test is mostly just for testing sorting and filtering -
  * having it in tst_QContactManager makes maintenance more
diff --git a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
index fccffe274..7ed31a535 100644
--- a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
+++ b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
@@ -63,9 +63,7 @@
 #define SRCDIR "."
 #endif
 
-
-QTM_USE_NAMESPACE
-
+QTCONTACTS_USE_NAMESPACE
 
 class tst_QDeclarativeContact : public QObject
 {