Taken from 261 documentation errors down to 246

-Still 16098 in gerrit is needed and this does not affect it.
-#ifndef Q_QDOC needed around all macros where enums follow
to make qdoc recognise them.
-A number of \variables replaces with methods needed updating.

Change-Id: Ia49ddcceb00889182c5fc3a840d0c8a1af4450d9
Reviewed-by: Simo Kivimäki <simo.kivimaki@nokia.com>

35 files changed, 66 insertions, 18 deletions

diff --git a/doc/compat.qdocconf b/doc/compat.qdocconf
index 36353aa57..11965b80a 100755
--- a/doc/compat.qdocconf
+++ b/doc/compat.qdocconf
@@ -1,4 +1,3 @@
-alias.i                         = e
 alias.include                   = input
 
 macro.0                         = "\\\\0"
diff --git a/doc/qtpim-cpp-ignore.qdocconf b/doc/qtpim-cpp-ignore.qdocconf
index e8a1002f0..9214bd34e 100644
--- a/doc/qtpim-cpp-ignore.qdocconf
+++ b/doc/qtpim-cpp-ignore.qdocconf
@@ -12,4 +12,5 @@ Cpp.ignoretokens += \
     QTVERSITORGANIZER_BEGIN_NAMESPACE \
     QTVERSITORGANIZER_END_NAMESPACE \
     Q_DECLARE_CUSTOM_CONTACT_DETAIL  \
-    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL \
+    QTVERSIT_PREPEND_NAMESPACE
diff --git a/doc/src/contactsactions.qdoc b/doc/src/contactsactions.qdoc
index 9c520a092..c5810eb9d 100644
--- a/doc/src/contactsactions.qdoc
+++ b/doc/src/contactsactions.qdoc
@@ -113,11 +113,11 @@ derived classes.  The QServicePluginInterface-derived class merely instantiates
 QContactActionFactory-derived class on request for the Qt Service Framework.  The
 QContactActionFactory-derived class then instantiates the actions when required.
 
-\snippet ../../tests/auto/qcontactactions/multiaction/multiaction_p.h Example Contact Action Plugin Declaration
+\snippet ../../tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h Example Contact Action Plugin Declaration
 
 The implementation of these classes might be something like the following (example only):
 
-\snippet ../../tests/auto/qcontactactions/multiaction/multiaction.cpp Example Contact Action Plugin Implementation
+\snippet ../../tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp Example Contact Action Plugin Implementation
 
 Once implemented, the plugin must be described by an xml file as per the Qt Service Framework guidelines,
 and installed in an appropriate location (once again, please see the documentation for the Qt Service Framework).
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index 4698304de..aed3bf5d5 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -247,7 +247,7 @@ QStringList QContactAction::availableActions(const QString& serviceName)
  */
 
 /*!
-   \variable QContactAction::ActionOpenInViewer()
+   \fn QContactAction::ActionOpenInViewer()
    The name of the default view contact action.
    Actions of this name will open a graphical element
    which allows the user to view the contact.
diff --git a/src/organizer/details/qorganizereventattendee.h b/src/organizer/details/qorganizereventattendee.h
index 6bd401b88..8cfc8df30 100644
--- a/src/organizer/details/qorganizereventattendee.h
+++ b/src/organizer/details/qorganizereventattendee.h
@@ -50,7 +50,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerEventAttendee : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerEventAttendee)
+#endif
 
     enum EventAttendeeField {
         FieldName = 0,
diff --git a/src/organizer/details/qorganizereventrsvp.h b/src/organizer/details/qorganizereventrsvp.h
index f4761e096..e13ffee0a 100644
--- a/src/organizer/details/qorganizereventrsvp.h
+++ b/src/organizer/details/qorganizereventrsvp.h
@@ -50,7 +50,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerEventRsvp : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerEventRsvp)
+#endif
 
     enum EventRsvpField {
         FieldParticipationStatus = 0,
diff --git a/src/organizer/details/qorganizereventtime.h b/src/organizer/details/qorganizereventtime.h
index 35d5f7683..4185504cc 100644
--- a/src/organizer/details/qorganizereventtime.h
+++ b/src/organizer/details/qorganizereventtime.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerEventTime : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerEventTime)
+#endif
 
     enum EventTimeField {
         FieldStartDateTime = 0,
diff --git a/src/organizer/details/qorganizeritemaudiblereminder.h b/src/organizer/details/qorganizeritemaudiblereminder.h
index aafbfed04..ad4b6d557 100644
--- a/src/organizer/details/qorganizeritemaudiblereminder.h
+++ b/src/organizer/details/qorganizeritemaudiblereminder.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemAudibleReminder : public QOrganizerItemReminder
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_REMINDER_DETAIL(QOrganizerItemAudibleReminder)
+#endif
 
     enum AudibleReminderField {
         FieldDataUrl = QOrganizerItemReminder::FieldRepetitionDelay + 100   // in case more fields added to QOrganizerItemReminder
diff --git a/src/organizer/details/qorganizeritemclassification.h b/src/organizer/details/qorganizeritemclassification.h
index bd9720034..0237f5e44 100644
--- a/src/organizer/details/qorganizeritemclassification.h
+++ b/src/organizer/details/qorganizeritemclassification.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemClassification : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemClassification)
+#endif
 
     enum ClassificationField {
         FieldClassification = 0
diff --git a/src/organizer/details/qorganizeritemcomment.h b/src/organizer/details/qorganizeritemcomment.h
index 67df71c19..0a97d4c06 100644
--- a/src/organizer/details/qorganizeritemcomment.h
+++ b/src/organizer/details/qorganizeritemcomment.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemComment : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemComment)
+#endif
 
     enum CommentField {
         FieldComment = 0
diff --git a/src/organizer/details/qorganizeritemdescription.h b/src/organizer/details/qorganizeritemdescription.h
index 92fb06e5a..5b13769d6 100644
--- a/src/organizer/details/qorganizeritemdescription.h
+++ b/src/organizer/details/qorganizeritemdescription.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemDescription : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemDescription)
+#endif
 
     enum DescriptionField {
         FieldDescription = 0
diff --git a/src/organizer/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp
index a000db796..44022bf87 100644
--- a/src/organizer/details/qorganizeritemdetails.cpp
+++ b/src/organizer/details/qorganizeritemdetails.cpp
@@ -1750,7 +1750,7 @@ QString QOrganizerEventRsvp::organizerEmail() const
  */
 
 /*!
-   \variable QOrganizerItemClassification::DefinitionName
+   \fn QOrganizerItemClassification::DefinitionName(QOrganizerItemDetail::TypeClassification);
 
    The constant string which identifies the definition of Classification-detail.
 
@@ -1854,7 +1854,7 @@ QString QOrganizerItemExtendedDetail::name() const
 }
 
 /*!
-    \fn void setDetailData(const QVariant &data)
+    \fn void QOrganizerItemExtendedDetail::setData(const QVariant &data)
 
     Sets the \a data of the extended detail.
  */
@@ -1864,7 +1864,7 @@ void QOrganizerItemExtendedDetail::setData(const QVariant &data)
 }
 
 /*!
-    \fn QVariant data() const
+    \fn QVariant QOrganizerItemExtendedDetail::data() const
 
     Gets the data of this extended detail.
  */
@@ -1881,7 +1881,7 @@ QVariant QOrganizerItemExtendedDetail::data() const
  */
 
 /*!
-    \variable QOrganizerItemVersion::DefinitionName
+    \fn QOrganizerItemVersion::DefinitionName(QOrganizerItemDetail::TypeVersion);
 
     The constant string which identifies the definition of details which are versions.
 
diff --git a/src/organizer/details/qorganizeritemdisplaylabel.h b/src/organizer/details/qorganizeritemdisplaylabel.h
index 97d4bd6f9..b245e977c 100644
--- a/src/organizer/details/qorganizeritemdisplaylabel.h
+++ b/src/organizer/details/qorganizeritemdisplaylabel.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemDisplayLabel : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemDisplayLabel)
+#endif
 
     enum DisplayLabelField {
         FieldLabel = 0
diff --git a/src/organizer/details/qorganizeritememailreminder.h b/src/organizer/details/qorganizeritememailreminder.h
index e3b41b36d..d9cb65b29 100644
--- a/src/organizer/details/qorganizeritememailreminder.h
+++ b/src/organizer/details/qorganizeritememailreminder.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemEmailReminder : public QOrganizerItemReminder
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_REMINDER_DETAIL(QOrganizerItemEmailReminder)
+#endif
 
     enum EmailReminderField {
         FieldSubject = QOrganizerItemReminder::FieldRepetitionDelay + 100,  // in case more fields added to QOrganizerItemReminder
diff --git a/src/organizer/details/qorganizeritemextendeddetail.h b/src/organizer/details/qorganizeritemextendeddetail.h
index accd65c48..639a8f55f 100644
--- a/src/organizer/details/qorganizeritemextendeddetail.h
+++ b/src/organizer/details/qorganizeritemextendeddetail.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemExtendedDetail : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemExtendedDetail)
+#endif
 
     enum ExtendedDetailField {
         FieldExtendedDetailName = 0,
diff --git a/src/organizer/details/qorganizeritemguid.h b/src/organizer/details/qorganizeritemguid.h
index 63c3e2d98..17188b910 100644
--- a/src/organizer/details/qorganizeritemguid.h
+++ b/src/organizer/details/qorganizeritemguid.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemGuid : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemGuid)
+#endif
 
     enum GuidField {
         FieldGuid = 0
diff --git a/src/organizer/details/qorganizeritemlocation.h b/src/organizer/details/qorganizeritemlocation.h
index 2fb6cd941..9b4b8e39a 100644
--- a/src/organizer/details/qorganizeritemlocation.h
+++ b/src/organizer/details/qorganizeritemlocation.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemLocation : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemLocation)
+#endif
 
     enum LocationField {
         FieldLatitude = 0,
diff --git a/src/organizer/details/qorganizeritemparent.h b/src/organizer/details/qorganizeritemparent.h
index 022fa485f..d01795cec 100644
--- a/src/organizer/details/qorganizeritemparent.h
+++ b/src/organizer/details/qorganizeritemparent.h
@@ -52,7 +52,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemParent : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemParent)
+#endif
 
     enum ParentField {
         FieldParentId = 0,
diff --git a/src/organizer/details/qorganizeritempriority.h b/src/organizer/details/qorganizeritempriority.h
index 2e75a00cc..b504798eb 100644
--- a/src/organizer/details/qorganizeritempriority.h
+++ b/src/organizer/details/qorganizeritempriority.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemPriority : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemPriority)
+#endif
 
     enum PriorityField {
         FieldPriority = 0
diff --git a/src/organizer/details/qorganizeritemrecurrence.h b/src/organizer/details/qorganizeritemrecurrence.h
index 07341a270..cb9fab10e 100644
--- a/src/organizer/details/qorganizeritemrecurrence.h
+++ b/src/organizer/details/qorganizeritemrecurrence.h
@@ -50,7 +50,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemRecurrence : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemRecurrence)
+#endif
 
     enum RecurrenceField {
         FieldRecurrenceRules = 0,
diff --git a/src/organizer/details/qorganizeritemreminder.h b/src/organizer/details/qorganizeritemreminder.h
index e7141383a..325ffc3e8 100644
--- a/src/organizer/details/qorganizeritemreminder.h
+++ b/src/organizer/details/qorganizeritemreminder.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemReminder : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemReminder)
+#endif
 
     enum ReminderField {
         FieldSecondsBeforeStart = 0,
diff --git a/src/organizer/details/qorganizeritemtag.h b/src/organizer/details/qorganizeritemtag.h
index 1934bd2c0..7eda68450 100644
--- a/src/organizer/details/qorganizeritemtag.h
+++ b/src/organizer/details/qorganizeritemtag.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemTag : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemTag)
+#endif
 
     enum TagField {
         FieldTag = 0
diff --git a/src/organizer/details/qorganizeritemtimestamp.h b/src/organizer/details/qorganizeritemtimestamp.h
index 1162aaa32..133ae91c4 100644
--- a/src/organizer/details/qorganizeritemtimestamp.h
+++ b/src/organizer/details/qorganizeritemtimestamp.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemTimestamp : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemTimestamp)
+#endif
 
     enum TimestampField {
         FieldCreated = 0,
diff --git a/src/organizer/details/qorganizeritemtype.h b/src/organizer/details/qorganizeritemtype.h
index c5d0ee754..f95f4ef91 100644
--- a/src/organizer/details/qorganizeritemtype.h
+++ b/src/organizer/details/qorganizeritemtype.h
@@ -59,7 +59,9 @@ public:
         TypeNote
     };
 
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemType)
+#endif
 
     enum ItemTypeField {
         FieldType = 0
diff --git a/src/organizer/details/qorganizeritemversion.h b/src/organizer/details/qorganizeritemversion.h
index 1643aaa0c..77b72dbfb 100644
--- a/src/organizer/details/qorganizeritemversion.h
+++ b/src/organizer/details/qorganizeritemversion.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemVersion : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerItemVersion)
+#endif
 
     enum VersionField {
         FieldVersion = 0,
diff --git a/src/organizer/details/qorganizeritemvisualreminder.h b/src/organizer/details/qorganizeritemvisualreminder.h
index 37f740641..128e50b30 100644
--- a/src/organizer/details/qorganizeritemvisualreminder.h
+++ b/src/organizer/details/qorganizeritemvisualreminder.h
@@ -49,7 +49,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerItemVisualReminder : public QOrganizerItemReminder
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_REMINDER_DETAIL(QOrganizerItemVisualReminder)
+#endif
 
     enum VisualReminderField {
         FieldMessage = QOrganizerItemReminder::FieldRepetitionDelay + 100,   // in case more fields added to QOrganizerItemReminder
diff --git a/src/organizer/details/qorganizerjournaltime.h b/src/organizer/details/qorganizerjournaltime.h
index aff24b1d8..833787245 100644
--- a/src/organizer/details/qorganizerjournaltime.h
+++ b/src/organizer/details/qorganizerjournaltime.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerJournalTime : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerJournalTime)
+#endif
 
     enum JournalTimeField {
         FieldEntryDateTime = 0
diff --git a/src/organizer/details/qorganizertodoprogress.h b/src/organizer/details/qorganizertodoprogress.h
index ba87e868e..cf408a9b5 100644
--- a/src/organizer/details/qorganizertodoprogress.h
+++ b/src/organizer/details/qorganizertodoprogress.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerTodoProgress : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerTodoProgress)
+#endif
 
     enum TodoProgressField {
         FieldFinishedDateTime = 0,
diff --git a/src/organizer/details/qorganizertodotime.h b/src/organizer/details/qorganizertodotime.h
index bd1b97050..cae09d428 100644
--- a/src/organizer/details/qorganizertodotime.h
+++ b/src/organizer/details/qorganizertodotime.h
@@ -51,7 +51,9 @@ QTORGANIZER_BEGIN_NAMESPACE
 class Q_ORGANIZER_EXPORT QOrganizerTodoTime : public QOrganizerItemDetail
 {
 public:
+#ifndef Q_QDOC
     Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerTodoTime)
+#endif
 
     enum TodoTimeField {
         FieldStartDateTime = 0,
diff --git a/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp b/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp
index 5aea8b79d..27ad80a6f 100644
--- a/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp
+++ b/src/plugins/contacts/jsondb/qcontactjsondbengine.cpp
@@ -96,7 +96,7 @@ QContactJsonDbEngine::~QContactJsonDbEngine()
 
 
 
-/*! \reimp */
+
 QContactJsonDbEngine& QContactJsonDbEngine::operator=(const QContactJsonDbEngine& other)
 {
     d = other.d;
diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
index 0cc011759..939f635a1 100644
--- a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
+++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
@@ -963,8 +963,6 @@ bool QOrganizerItemMemoryEngine::typesAreRelated(QOrganizerItemType::ItemType oc
                 && occurrenceType == QOrganizerItemType::TypeTodoOccurrence));
 }
 
-/*! \reimp
-*/
 bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     Q_ASSERT(errorMap);
@@ -995,6 +993,8 @@ bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem>* organizeritems
     return (*error == QOrganizerManager::NoError);
 }
 
+/*! \reimp
+*/
 bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem> *items, const QList<QOrganizerItemDetail::DetailType> &detailMask,
                                            QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
diff --git a/src/versit/qversitcontactexporter.cpp b/src/versit/qversitcontactexporter.cpp
index bc0656b25..bf3cdcb25 100644
--- a/src/versit/qversitcontactexporter.cpp
+++ b/src/versit/qversitcontactexporter.cpp
@@ -110,7 +110,7 @@ QTVERSIT_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn void QVersitContactExporterDetailHandlerV2::detailProcessed(const QContact& contact, const QContactDetail& detail, const QVersitDocument& document, QSet<QString>* processedFields, QList<QVersitProperty>* toBeRemoved, QList<QVersitProperty>* toBeAdded)
+  \fn void QVersitContactExporterDetailHandlerV2::detailProcessed(const QContact& contact, const QContactDetail& detail, const QVersitDocument& document, QSet<int>* processedFields, QList<QVersitProperty>* toBeRemoved, QList<QVersitProperty>* toBeAdded)
 
   Process \a detail and provide a list of updated \l{QVersitProperty}{QVersitProperties} by
   modifying the \a toBeRemoved and \a toBeAdded lists.
diff --git a/src/versit/qversitcontacthandler.cpp b/src/versit/qversitcontacthandler.cpp
index 43b44ed81..2c2b6c972 100644
--- a/src/versit/qversitcontacthandler.cpp
+++ b/src/versit/qversitcontacthandler.cpp
@@ -72,7 +72,7 @@ QStringList QVersitContactHandlerFactory::keys() const
  */
 
 /*!
-   \variable QVersitContactHandlerFactory::ProfileSync
+   \fn static const QString QVersitContactHandlerFactory::ProfileSync()
 
    The constant string signifying a plugin that is relevant to import and export in a
    synchronization context.
@@ -82,7 +82,7 @@ QStringList QVersitContactHandlerFactory::keys() const
  */
 
 /*!
-   \variable QVersitContactHandlerFactory::ProfileBackup
+   \fn static const QString QVersitContactHandlerFactory::ProfileBackup()
 
    The constant string signifying a plugin that will backup a QContact to vCard, so that exporting,
    then importing a contact will not lose any data.
diff --git a/src/versitorganizer/qversitorganizerexporter.cpp b/src/versitorganizer/qversitorganizerexporter.cpp
index e212f80fc..891f18449 100644
--- a/src/versitorganizer/qversitorganizerexporter.cpp
+++ b/src/versitorganizer/qversitorganizerexporter.cpp
@@ -81,7 +81,7 @@ QTVERSITORGANIZER_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn void QVersitOrganizerExporterDetailHandler::detailProcessed(const QOrganizerItem& item, const QOrganizerItemDetail& detail, const QVersitDocument& document, QSet<QString>* processedFields, QList<QVersitProperty>* toBeRemoved, QList<QVersitProperty>* toBeAdded)
+  \fn void QVersitOrganizerExporterDetailHandler::detailProcessed(const QOrganizerItem& item, const QOrganizerItemDetail& detail, const QVersitDocument& document, QSet<int>* processedFields, QList<QVersitProperty>* toBeRemoved, QList<QVersitProperty>* toBeAdded)
 
   Process \a detail and provide a list of updated \l{QVersitProperty}{QVersitProperties} by
   modifying the \a toBeRemoved and \a toBeAdded lists.
diff --git a/src/versitorganizer/qversitorganizerhandler.cpp b/src/versitorganizer/qversitorganizerhandler.cpp
index 3754bb861..06e081e76 100644
--- a/src/versitorganizer/qversitorganizerhandler.cpp
+++ b/src/versitorganizer/qversitorganizerhandler.cpp
@@ -62,7 +62,7 @@ QTVERSITORGANIZER_BEGIN_NAMESPACE
  */
 
 /*!
-   \variable QVersitOrganizerHandlerFactory::ProfileSync
+   \fn static const QString QVersitOrganizerHandlerFactory::ProfileSync()
 
    The constant string signifying a plugin that is relevant to import and export in a
    synchronization context.
@@ -70,7 +70,7 @@ QTVERSITORGANIZER_BEGIN_NAMESPACE
  */
 
 /*!
-   \variable QVersitOrganizerHandlerFactory::ProfileBackup
+   \fn static const QString QVersitOrganizerHandlerFactory::ProfileBackup()
 
    The constant string signifying a plugin that is relevant to import and export in a backup/restore
    context.