--- a/qtmobility/src/contacts/details/qcontactdetails.cpp Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactdetails.cpp Mon May 03 13:18:40 2010 +0300
@@ -110,6 +110,13 @@
*/
/*!
+ \class QContactGlobalPresence
+ \brief The QContactGlobalPresence class provides aggregated presence information
+ for a contact, synthesized or supplied by the backend.
+ \ingroup contacts-details
+ */
+
+/*!
\class QContactGuid
\brief The QContactGuid class contains the globally unique
Id of a contact.
@@ -157,6 +164,20 @@
*/
/*!
+ \class QContactPresence
+ \brief The QContactPresence class provides presence information
+ for an online account of a contact.
+ \ingroup contacts-details
+ */
+
+/*!
+ \class QContactRingtone
+ \brief The QContactRingtone class provides a ringtone associated
+ with a contact
+ \ingroup contacts-details
+ */
+
+/*!
\class QContactSyncTarget
\brief The QContactSyncTarget class provides a sync target
for a contact.
@@ -164,6 +185,20 @@
*/
/*!
+ \class QContactTag
+ \brief The QContactTag class contains a tag associated with a
+ contact.
+ \ingroup contacts-details
+ */
+
+/*!
+ \class QContactThumbnail
+ \brief The QContactThumbnail class contains a thumbnail used
+ in display lists to represent the contact.
+ \ingroup contacts-details
+ */
+
+/*!
\class QContactTimestamp
\brief The QContactTimestamp class contains the creation and
last-modified timestamp associated with the contact.
@@ -187,91 +222,151 @@
\variable QContactName::DefinitionName
The constant string which identifies the definition of details which are names.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::DefinitionName, "Name");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::DefinitionName, "Name");
/*!
\variable QContactNickname::DefinitionName
The constant string which identifies the definition of details which are nicknames.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactNickname::DefinitionName, "Nickname");
+Q_DEFINE_LATIN1_CONSTANT(QContactNickname::DefinitionName, "Nickname");
/*!
\variable QContactNote::DefinitionName
The constant string which identifies the definition of details which are notes.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactNote::DefinitionName, "Note");
+Q_DEFINE_LATIN1_CONSTANT(QContactNote::DefinitionName, "Note");
/*!
\variable QContactAvatar::DefinitionName
The constant string which identifies the definition of details which are avatars.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::DefinitionName, "Avatar");
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::DefinitionName, "Avatar");
/*!
\variable QContactAddress::DefinitionName
The constant string which identifies the definition of details which are street addresses.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::DefinitionName, "StreetAddress");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::DefinitionName, "Address");
/*!
\variable QContactPhoneNumber::DefinitionName
The constant string which identifies the definition of details which are phone numbers.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::DefinitionName, "PhoneNumber");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::DefinitionName, "PhoneNumber");
+
+/*!
+ \variable QContactPresence::DefinitionName
+ The constant string which identifies the definition of details which contain presence information.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::DefinitionName, "Presence");
+
+/*!
+ \variable QContactPresence::FieldTimestamp
+
+ The constant key for which the last update timestamp value is stored in details
+ of the QContactPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldTimestamp, "Timestamp");
+
+/*!
+ \variable QContactPresence::FieldNickname
+
+ The constant key for which the nickname value is stored in details
+ of the QContactPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldNickname, "Nickname");
+
+/*!
+ \variable QContactPresence::FieldPresenceState
+
+ The constant key for which the presence state value is stored in details
+ of the QContactPresence typel.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceState, "PresenceState");
+
+/*!
+ \variable QContactPresence::FieldPresenceStateText
+
+ The constant key for which the presence provider provided text representation
+ of the presence state is stored in details of the QContactPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateText, "PresenceStateText");
+
+/*!
+ \variable QContactPresence::FieldPresenceStateImageUrl
+
+ The constant key for which the image url value for the current presence state
+ is stored in details of the QContactPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
+
+/*!
+ \variable QContactPresence::FieldCustomMessage
+
+ The constant key for which the user-entered custom message for their state
+ is stored in details of the QContactPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldCustomMessage, "CustomMessage");
+
+/*!
+ \variable QContactRingtone::DefinitionName
+ The constant string which identifies the definition of details which are ringtones.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::DefinitionName, "Ringtone");
/*!
\variable QContactSyncTarget::DefinitionName
- The constant string which identifies the definition of details which are synchronisation target stores.
+ The constant string which identifies the definition of details which are synchronization target stores.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactSyncTarget::DefinitionName, "SyncTarget");
+Q_DEFINE_LATIN1_CONSTANT(QContactSyncTarget::DefinitionName, "SyncTarget");
/*!
\variable QContactTimestamp::DefinitionName
- The constant string which identifies the definition of details which are contact synchronisation timestamps.
+ The constant string which identifies the definition of details which are contact synchronization timestamps.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactTimestamp::DefinitionName, "Timestamp");
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::DefinitionName, "Timestamp");
/*!
\variable QContactType::DefinitionName
The constant string which identifies the definition of details which identify the type of the contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactType::DefinitionName, "Type");
+Q_DEFINE_LATIN1_CONSTANT(QContactType::DefinitionName, "Type");
/*!
\variable QContactGuid::DefinitionName
The constant string which identifies the definition of details which are globally unique identifiers.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGuid::DefinitionName, "Guid");
+Q_DEFINE_LATIN1_CONSTANT(QContactGuid::DefinitionName, "Guid");
/*!
\variable QContactEmailAddress::DefinitionName
The constant string which identifies the definition of details which are email addresses.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactEmailAddress::DefinitionName, "EmailAddress");
+Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::DefinitionName, "EmailAddress");
/*!
\variable QContactFamily::DefinitionName
The constant string which identifies the definition of details which contain the names of the contact's family.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactFamily::DefinitionName, "Family");
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::DefinitionName, "Family");
/*!
\variable QContactUrl::DefinitionName
The constant string which identifies the definition of details which are universal resource location paths.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactUrl::DefinitionName, "Url");
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::DefinitionName, "Url");
/*!
\variable QContactBirthday::DefinitionName
The constant string which identifies the definition of details which are the dates of birthdays.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactBirthday::DefinitionName, "Birthday");
+Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::DefinitionName, "Birthday");
/*!
\variable QContactAnniversary::DefinitionName
The constant string which identifies the definition of details which are anniversary dates.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::DefinitionName, "Anniversary");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::DefinitionName, "Anniversary");
/*!
\variable QContactGender::DefinitionName
@@ -279,7 +374,7 @@
The constant string which identifies the definition of details
which identify the gender of a contact in a given context.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGender::DefinitionName, "Gender");
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::DefinitionName, "Gender");
/*!
\variable QContactGeoLocation::DefinitionName
@@ -287,7 +382,61 @@
The constant string which identifies the definition of details
which describe a location associated with a contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::DefinitionName, "GeoLocation");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::DefinitionName, "GeoLocation");
+
+/*!
+ \variable QContactGlobalPresence::DefinitionName
+ The constant string which identifies the definition of details which contain presence information.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::DefinitionName, "GlobalPresence");
+
+/*!
+ \variable QContactGlobalPresence::FieldTimestamp
+
+ The constant key for which the last update timestamp value is stored in details
+ of the QContactGlobalPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldTimestamp, "Timestamp");
+
+/*!
+ \variable QContactGlobalPresence::FieldNickname
+
+ The constant key for which the nickname value is stored in details
+ of the QContactGlobalPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldNickname, "Nickname");
+
+/*!
+ \variable QContactGlobalPresence::FieldPresenceState
+
+ The constant key for which the presence state value is stored in details
+ of the QContactGlobalPresence typel.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceState, "PresenceState");
+
+/*!
+ \variable QContactGlobalPresence::FieldPresenceStateText
+
+ The constant key for which the presence provider provided text representation
+ of the presence state is stored in details of the QContactGlobalPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateText, "PresenceStateText");
+
+/*!
+ \variable QContactGlobalPresence::FieldPresenceStateImageUrl
+
+ The constant key for which the image url value for the current presence state
+ is stored in details of the QContactGlobalPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
+
+/*!
+ \variable QContactGlobalPresence::FieldCustomMessage
+
+ The constant key for which the user-entered custom message for their state
+ is stored in details of the QContactGlobalPresence type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldCustomMessage, "CustomMessage");
/*!
\variable QContactOnlineAccount::DefinitionName
@@ -296,77 +445,19 @@
which identify the organization to which a contact belongs in a
given context.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::DefinitionName, "OnlineAccount");
-
-/*!
- \variable QContactOnlineAccount::FieldNickname
-
- The constant key for which the nickname value is stored in details
- of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldNickname, "Nickname");
-
-/*!
- \variable QContactOnlineAccount::FieldPresence
-
- The constant key for which the presence value is stored in details
- of the QContactOnlineAccount typel.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldPresence, "Presence");
-
-/*!
- \variable QContactOnlineAccount::PresenceAvailable
-
- The value for presence which specifies that the contact's current
- status is available.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceAvailable, "Available");
-
-/*!
- \variable QContactOnlineAccount::PresenceHidden
-
- The value for presence which specifies that the contact's current.
- status is hidden
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceHidden, "Hidden");
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::DefinitionName, "OnlineAccount");
/*!
- \variable QContactOnlineAccount::PresenceBusy
- The value for presence which specifies that the contact's current status is busy.
+ \variable QContactTag::DefinitionName
+ The constant string which identifies the definition of details which are tags.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceBusy, "Busy");
-
-/*!
- \variable QContactOnlineAccount::PresenceAway
- The value for presence which specifies that the contact's current status is away.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceAway, "Away");
-
-/*!
- \variable QContactOnlineAccount::PresenceExtendedAway
- The value for presence which specifies that the contact's current status is extended away.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceExtendedAway, "ExtendedAway");
+Q_DEFINE_LATIN1_CONSTANT(QContactTag::DefinitionName, "Tag");
/*!
- \variable QContactOnlineAccount::PresenceUnknown
- The value for presence which specifies that the contact's current status is unknown.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceUnknown, "Unknown");
-
-/*!
- \variable QContactOnlineAccount::PresenceOffline
- The value for presence which specifies that the contact's current status is offline.
+ \variable QContactThumbnail::DefinitionName
+ The constant string which identifies the definition of details which are thumbnails.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::PresenceOffline, "Offline");
-
-/*!
- \variable QContactOnlineAccount::FieldStatusMessage
-
- The constant key for which the status message value is stored in
- details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldStatusMessage, "StatusMessage");
+Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::DefinitionName, "Thumbnail");
/*!
\variable QContactOnlineAccount::FieldCapabilities
@@ -374,7 +465,63 @@
The constant key for which the account capabilities value is stored in
details of the QContactOnlineAccount type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldCapabilities, "Capabilities");
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldCapabilities, "Capabilities");
+
+/*!
+ \variable QContactOnlineAccount::FieldAccountUri
+
+ The constant key for which the remote account uri value is stored
+ in details of the QContactOnlineAccount type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldAccountUri, "AccountUri");
+
+/*!
+ \variable QContactOnlineAccount::FieldServiceProvider
+
+ The constant key for which the service provider value is stored in
+ details of the QContactOnlineAccount type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldServiceProvider, "ServiceProvider");
+
+/*!
+ \variable QContactOnlineAccount::FieldSubTypes
+
+ The constant key for which the subtypes value is stored in details
+ of the QContactOnlineAccount type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldSubTypes, "SubTypes");
+
+/*!
+ \variable QContactOnlineAccount::SubTypeSip
+
+ The constant attribute value which describes the online account as
+ supporting SIP.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSip, "Sip");
+
+/*!
+ \variable QContactOnlineAccount::SubTypeSipVoip
+
+ The constant attribute value which describes the online account as
+ supporting SIP-based VoIP.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSipVoip, "SipVoip");
+
+/*!
+ \variable QContactOnlineAccount::SubTypeImpp
+
+ The constant attribute value which describes the online account as
+ supporting IMPP.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeImpp, "Impp");
+
+/*!
+ \variable QContactOnlineAccount::SubTypeVideoShare
+
+ The constant attribute value which describes the online account as
+ supporting VideoShare.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeVideoShare, "VideoShare");
/*!
\variable QContactOrganization::DefinitionName
@@ -383,7 +530,7 @@
which identify the organization to which a contact belongs in a
given context.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::DefinitionName, "Organization");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::DefinitionName, "Organization");
/*!
\variable QContactDisplayLabel::DefinitionName
@@ -391,7 +538,7 @@
The constant string which identifies the definition of details
which contain a display label of a contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactDisplayLabel::DefinitionName, "DisplayLabel");
+Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::DefinitionName, "DisplayLabel");
/*!
@@ -400,7 +547,7 @@
The constant key for which the phone number value is stored in
details of the QContactPhoneNumber type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::FieldNumber, "PhoneNumber");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldNumber, "PhoneNumber");
/*!
\variable QContactPhoneNumber::FieldSubTypes
@@ -408,7 +555,7 @@
The constant key for which the subtype values are stored in details
of the QContactPhoneNumber type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::FieldSubTypes, "SubTypes");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldSubTypes, "SubTypes");
/*!
\variable QContactEmailAddress::FieldEmailAddress
@@ -416,7 +563,7 @@
The constant key for which the email address value is stored in
details of the QContactEmailAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactEmailAddress::FieldEmailAddress, "EmailAddress");
+Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::FieldEmailAddress, "EmailAddress");
/*!
\variable QContactFamily::FieldSpouse
@@ -424,7 +571,7 @@
The constant key for which the spouse name value is stored in
details of the QContactFamily type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactFamily::FieldSpouse, "Spouse");
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldSpouse, "Spouse");
/*!
\variable QContactFamily::FieldChildren
@@ -432,7 +579,7 @@
The constant key for which the children names value is stored in
details of the QContactFamily type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactFamily::FieldChildren, "Children");
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldChildren, "Children");
/*!
\variable QContactGuid::FieldGuid
@@ -440,39 +587,31 @@
The constant key for which the globally unique identifier value is
stored in details of the QContactGuid type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGuid::FieldGuid, "Guid");
+Q_DEFINE_LATIN1_CONSTANT(QContactGuid::FieldGuid, "Guid");
/*!
\variable QContactSyncTarget::FieldSyncTarget
The constant key for which the value of the target store for
- synchronisation is stored in details of the QContactSyncTarget type.
+ synchronization is stored in details of the QContactSyncTarget type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactSyncTarget::FieldSyncTarget, "SyncTarget");
-
-/*!
- \variable QContactAvatar::FieldAvatar
-
- The constant key for which the path the avatar value is stored in
- details of the QContactAvatar type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::FieldAvatar, "Avatar");
+Q_DEFINE_LATIN1_CONSTANT(QContactSyncTarget::FieldSyncTarget, "SyncTarget");
/*!
- \variable QContactAvatar::FieldAvatarPixmap
-
- The constant key for which the path the avatar value is stored in
+ \variable QContactAvatar::FieldImageUrl
+
+ The constant key for which the url of the avatar image value is stored in
details of the QContactAvatar type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::FieldAvatarPixmap, "AvatarPixmap");
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldImageUrl, "ImageUrl");
/*!
- \variable QContactAvatar::FieldSubType
-
- The constant key for which the subtypes value is stored in details
- of the QContactAvatar type.
+ \variable QContactAvatar::FieldVideoUrl
+
+ The constant key for which the url of the avatar video value is stored in
+ details of the QContactAvatar type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::FieldSubType, "SubType");
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldVideoUrl, "VideoUrl");
/*!
\variable QContactName::FieldPrefix
@@ -480,7 +619,7 @@
The constant key for which the name prefix value is stored in
details of the QContactName type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldPrefix, "Prefix");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldPrefix, "Prefix");
/*!
\variable QContactName::FieldFirstName
@@ -488,7 +627,7 @@
The constant key for which the first name value is stored in
details of the QContactName type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldFirstName, "FirstName");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldFirstName, "FirstName");
/*!
\variable QContactName::FieldMiddleName
@@ -496,7 +635,7 @@
The constant key for which the middle name value is stored in
details of the QContactName type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldMiddleName, "MiddleName");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldMiddleName, "MiddleName");
/*!
\variable QContactName::FieldLastName
@@ -504,31 +643,7 @@
The constant key for which the last name value is stored in details
of the QContactName type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldLastName, "LastName");
-
-/*!
- \variable QContactName::FieldFirst
-
- The constant key for which the first name value is stored in
- details of the QContactName type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldFirst, "FirstName");
-
-/*!
- \variable QContactName::FieldMiddle
-
- The constant key for which the middle name value is stored in
- details of the QContactName type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldMiddle, "MiddleName");
-
-/*!
- \variable QContactName::FieldLast
-
- The constant key for which the last name value is stored in details
- of the QContactName type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldLast, "LastName");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldLastName, "LastName");
/*!
\variable QContactName::FieldSuffix
@@ -536,7 +651,7 @@
The constant key for which the name suffix value is stored in
details of the QContactName type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldSuffix, "Suffix");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldSuffix, "Suffix");
/*!
\variable QContactName::FieldCustomLabel
@@ -544,7 +659,7 @@
The constant key for which the custom name label value is stored in
details of the QContactName type, if supported.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactName::FieldCustomLabel, "CustomLabel");
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldCustomLabel, "CustomLabel");
/*!
\variable QContactNickname::FieldNickname
@@ -552,7 +667,7 @@
The constant key for which the nickname value is stored in details
of the QContactNickname type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactNickname::FieldNickname, "Nickname");
+Q_DEFINE_LATIN1_CONSTANT(QContactNickname::FieldNickname, "Nickname");
/*!
\variable QContactNote::FieldNote
@@ -560,7 +675,7 @@
The constant key for which the note value is stored in details of
the QContactNote type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactNote::FieldNote, "Note");
+Q_DEFINE_LATIN1_CONSTANT(QContactNote::FieldNote, "Note");
/*!
\variable QContactAddress::FieldStreet
@@ -568,7 +683,7 @@
The constant key for which the street value is stored in details of
the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldStreet, "Street");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldStreet, "Street");
/*!
\variable QContactAddress::FieldLocality
@@ -576,7 +691,7 @@
The constant key for which the locality value is stored in details
of the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldLocality, "Locality");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldLocality, "Locality");
/*!
\variable QContactAddress::FieldRegion
@@ -584,7 +699,7 @@
The constant key for which the region value is stored in details of
the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldRegion, "Region");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldRegion, "Region");
/*!
\variable QContactAddress::FieldPostcode
@@ -592,7 +707,7 @@
The constant key for which the postcode value is stored in details
of the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldPostcode, "Postcode");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostcode, "Postcode");
/*!
\variable QContactAddress::FieldCountry
@@ -600,7 +715,7 @@
The constant key for which the country value is stored in details
of the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldCountry, "Country");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldCountry, "Country");
/*!
\variable QContactAddress::FieldPostOfficeBox
@@ -608,7 +723,7 @@
The constant key for which the post office box value is stored in
details of the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldPostOfficeBox, "PostOfficeBox");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostOfficeBox, "PostOfficeBox");
/*!
\variable QContactAddress::FieldSubTypes
@@ -616,7 +731,7 @@
The constant key for which the subtypes value is stored in details
of the QContactAddress type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::FieldSubTypes, "SubTypes");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldSubTypes, "SubTypes");
/*!
\variable QContactUrl::FieldUrl
@@ -624,7 +739,7 @@
The constant key for which the url value is stored in details of
the QContactUrl type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactUrl::FieldUrl, "Url");
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldUrl, "Url");
/*!
\variable QContactUrl::FieldSubType
@@ -632,7 +747,7 @@
The constant key for which the subtypes value is stored in details
of the QContactUrl type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactUrl::FieldSubType, "SubType");
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldSubType, "SubType");
/*!
\variable QContactBirthday::FieldBirthday
@@ -640,7 +755,7 @@
The constant key for which the birthday date value is stored in
details of the QContactBirthday type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactBirthday::FieldBirthday, "Birthday");
+Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::FieldBirthday, "Birthday");
/*!
\variable QContactAnniversary::FieldOriginalDate
@@ -648,7 +763,7 @@
The constant key for which the anniversary original event date
value is stored in details of the QContactAnniversary type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::FieldOriginalDate, "OriginalDate");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldOriginalDate, "OriginalDate");
/*!
\variable QContactAnniversary::FieldEvent
@@ -656,7 +771,7 @@
The constant key for which the name of the event is stored in
details of the QContactAnniversary type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::FieldEvent, "Event");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldEvent, "Event");
/*!
\variable QContactAnniversary::FieldCalendarId
@@ -665,7 +780,7 @@
associated calendar entry is stored in details of the
QContactAnniversary type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::FieldCalendarId, "CalendarId");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldCalendarId, "CalendarId");
/*!
\variable QContactAnniversary::FieldSubType
@@ -673,7 +788,15 @@
The constant key for which the subtypes value is stored in details
of the QContactAnniversary type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::FieldSubType, "SubType");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldSubType, "SubType");
+
+/*!
+ \variable QContactDisplayLabel::FieldLabel
+
+ The constant key for which the display label value is stored in
+ details of the QContactDisplayLabel type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::FieldLabel, "Label");
/*!
\variable QContactGender::FieldGender
@@ -681,25 +804,25 @@
The constant key for which the gender value is stored in details of
the QContactGender type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGender::FieldGender, "Gender");
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::FieldGender, "Gender");
/*!
\variable QContactGender::GenderMale
The value that identifies this contact as being male.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGender::GenderMale, "Male");
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderMale, "Male");
/*!
\variable QContactGender::GenderFemale
The value that identifies this contact as being female.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGender::GenderFemale, "Female");
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderFemale, "Female");
/*!
\variable QContactGender::GenderUnspecified
The value that identifies this contact as being of unspecified gender.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGender::GenderUnspecified, "Unspecified");
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderUnspecified, "Unspecified");
/*!
\variable QContactGeoLocation::FieldLabel
@@ -707,7 +830,7 @@
The constant key for which the location label value is stored in
details of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldLabel, "Label");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLabel, "Label");
/*!
\variable QContactGeoLocation::FieldLatitude
@@ -715,7 +838,7 @@
The constant key for which the latitude value is stored in details
of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldLatitude, "Latitude");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLatitude, "Latitude");
/*!
\variable QContactGeoLocation::FieldLongitude
@@ -723,7 +846,7 @@
The constant key for which the longitude value is stored in details
of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldLongitude, "Longitude");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLongitude, "Longitude");
/*!
\variable QContactGeoLocation::FieldAccuracy
@@ -731,7 +854,7 @@
The constant key for which the location accuracy value is stored in
details of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldAccuracy, "Accuracy");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAccuracy, "Accuracy");
/*!
\variable QContactGeoLocation::FieldAltitude
@@ -739,7 +862,7 @@
The constant key for which the altitude value is stored in details
of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldAltitude, "Altitude");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitude, "Altitude");
/*!
@@ -748,7 +871,7 @@
The constant key for which the altitude accuracy value is stored in
details of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldAltitudeAccuracy, "AltitudeAccuracy");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitudeAccuracy, "AltitudeAccuracy");
/*!
\variable QContactGeoLocation::FieldHeading
@@ -756,7 +879,7 @@
The constant key for which the heading value is stored in details
of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldHeading, "Heading");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldHeading, "Heading");
/*!
\variable QContactGeoLocation::FieldSpeed
@@ -764,7 +887,15 @@
The constant key for which the speed value is stored in details of
the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldSpeed, "Speed");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldSpeed, "Speed");
+
+/*!
+ \variable QContactTag::FieldTag
+
+ The constant key for which the tag value is stored in details
+ of the QContactTag type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactTag::FieldTag, "Tag");
/*!
\variable QContactGeoLocation::FieldTimestamp
@@ -772,63 +903,7 @@
The constant key for which the timestamp value is stored in details
of the QContactGeoLocation type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactGeoLocation::FieldTimestamp, "Timestamp");
-
-/*!
- \variable QContactOnlineAccount::FieldAccountUri
-
- The constant key for which the remote account uri value is stored
- in details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldAccountUri, "AccountUri");
-
-/*!
- \variable QContactOnlineAccount::FieldServiceProvider
-
- The constant key for which the service provider value is stored in
- details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldServiceProvider, "ServiceProvider");
-
-/*!
- \variable QContactOnlineAccount::FieldSubTypes
-
- The constant key for which the subtypes value is stored in details
- of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::FieldSubTypes, "SubTypes");
-
-/*!
- \variable QContactOnlineAccount::SubTypeSip
-
- The constant attribute value which describes the online account as
- supporting SIP.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::SubTypeSip, "Sip");
-
-/*!
- \variable QContactOnlineAccount::SubTypeSipVoip
-
- The constant attribute value which describes the online account as
- supporting SIP-based VoIP.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::SubTypeSipVoip, "SipVoip");
-
-/*!
- \variable QContactOnlineAccount::SubTypeImpp
-
- The constant attribute value which describes the online account as
- supporting IMPP.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::SubTypeImpp, "Impp");
-
-/*!
- \variable QContactOnlineAccount::SubTypeVideoShare
-
- The constant attribute value which describes the online account as
- supporting VideoShare.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactOnlineAccount::SubTypeVideoShare, "VideoShare");
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldTimestamp, "Timestamp");
/*!
\variable QContactOrganization::FieldName
@@ -836,15 +911,15 @@
The constant key for which the name value is stored in details of
the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldName, "Name");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldName, "Name");
/*!
- \variable QContactOrganization::FieldLogo
-
- The constant key for which the logo path value is stored in details
+ \variable QContactOrganization::FieldLogoUrl
+
+ The constant key for which the logo url is stored in details
of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldLogo, "Logo");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLogoUrl, "LogoUrl");
/*!
\variable QContactOrganization::FieldDepartment
@@ -852,7 +927,7 @@
The constant key for which the organization's department value is
stored in details of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldDepartment, "Department");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldDepartment, "Department");
/*!
\variable QContactOrganization::FieldLocation
@@ -861,7 +936,7 @@
location of the contact's part of the organization) value is stored
in details of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldLocation, "Location");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLocation, "Location");
/*!
\variable QContactOrganization::FieldRole
@@ -869,7 +944,7 @@
The constant key for which the contact's role within the
organization is stored in details of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldRole, "Role");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldRole, "Role");
/*!
\variable QContactOrganization::FieldTitle
@@ -877,7 +952,7 @@
The constant key for which the contact's title within the
organization is stored in details of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldTitle, "Title");
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldTitle, "Title");
/*!
\variable QContactOrganization::FieldAssistantName
@@ -885,16 +960,39 @@
The constant key for which the contact's assistant name within the
organization is stored in details of the QContactOrganization type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactOrganization::FieldAssistantName, "AssistantName");
-
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldAssistantName, "AssistantName");
+
+/*!
+ \variable QContactRingtone::FieldAudioRingtoneUrl
+
+ The constant key for which the uri of the audio ringtone value is
+ stored in details of the QContactRingtone type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldAudioRingtoneUrl, "AudioRingtoneUrl");
/*!
- \variable QContactDisplayLabel::FieldLabel
-
- The constant key for which the display label value is stored in
- details of the QContactDisplayLabel type.
+ \variable QContactRingtone::FieldVideoRingtoneUrl
+
+ The constant key for which the uri of the video ringtone value is
+ stored in details of the QContactRingtone type.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactDisplayLabel::FieldLabel, "Label");
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVideoRingtoneUrl, "VideoRingtoneUrl");
+
+/*!
+ \variable QContactRingtone::FieldVibrationRingtoneUrl
+
+ The constant key for which the uri of the vibration ringtone value is
+ stored in details of the QContactRingtone type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVibrationRingtoneUrl, "VibrationRingtoneUrl");
+
+/*!
+ \variable QContactThumbnail::FieldThumbnail
+
+ The constant key for which the thumbnail image is stored in details
+ of the QContactThumbnail type.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::FieldThumbnail, "Thumbnail");
/*!
\variable QContactTimestamp::FieldModificationTimestamp
@@ -903,7 +1001,7 @@
QContactTimestamp type which describes the last modification date
and time of a contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactTimestamp::FieldModificationTimestamp, "ModificationTimestamp");
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldModificationTimestamp, "ModificationTimestamp");
/*!
\variable QContactTimestamp::FieldCreationTimestamp
@@ -912,7 +1010,7 @@
QContactTimestamp type which describes the creation date and time
of a contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactTimestamp::FieldCreationTimestamp, "CreationTimestamp");
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldCreationTimestamp, "CreationTimestamp");
/*!
\variable QContactType::FieldType
@@ -920,7 +1018,7 @@
The constant key for the type value which is stored in details of
the QContactType definition.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactType::FieldType, "Type");
+Q_DEFINE_LATIN1_CONSTANT(QContactType::FieldType, "Type");
/*!
@@ -929,7 +1027,7 @@
The constant attribute value which describes the contact as being
an ordinary contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactType::TypeContact, "Contact");
+Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeContact, "Contact");
/*!
\variable QContactType::TypeGroup
@@ -937,7 +1035,7 @@
The constant attribute value which describes the contact as being a
group.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactType::TypeGroup, "Group");
+Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeGroup, "Group");
/*!
\variable QContactPhoneNumber::SubTypeLandline
@@ -945,7 +1043,7 @@
The constant attribute value which describes the phone number as
identifying a landline phone.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeLandline, "Landline");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeLandline, "Landline");
/*!
\variable QContactPhoneNumber::SubTypeMobile
@@ -953,15 +1051,15 @@
The constant attribute value which describes the phone number as
identifying a mobile phone.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeMobile, "Mobile");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMobile, "Mobile");
/*!
- \variable QContactPhoneNumber::SubTypeFacsimile
+ \variable QContactPhoneNumber::SubTypeFax
The constant attribute value which describes the phone number as
- identifying a facsimile machine.
+ identifying a fax machine.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeFacsimile, "Facsimile");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeFax, "Fax");
/*!
\variable QContactPhoneNumber::SubTypePager
@@ -969,7 +1067,7 @@
The constant attribute value which describes the phone number as
identifying a pager device.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypePager, "Pager");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypePager, "Pager");
/*!
\variable QContactPhoneNumber::SubTypeCar
@@ -977,7 +1075,7 @@
The constant attribute value which describes the phone number as
identifying a car phone.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeCar, "Car");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeCar, "Car");
/*!
\variable QContactPhoneNumber::SubTypeBulletinBoardSystem
@@ -985,7 +1083,7 @@
The constant attribute value which describes the phone number as
identifying a bulletin board system.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeBulletinBoardSystem, "BulletinBoardSystem");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeBulletinBoardSystem, "BulletinBoardSystem");
/*!
\variable QContactPhoneNumber::SubTypeVoice
@@ -993,7 +1091,7 @@
The constant attribute value which describes the phone number as
supporting voice transmission.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeVoice, "Voice");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVoice, "Voice");
/*!
\variable QContactPhoneNumber::SubTypeModem
@@ -1001,7 +1099,7 @@
The constant attribute value which describes the phone number as
supporting digital data transfer.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeModem, "Modem");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeModem, "Modem");
/*!
\variable QContactPhoneNumber::SubTypeVideo
@@ -1009,7 +1107,7 @@
The constant attribute value which describes the phone number as
supporting video transmission.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeVideo, "Video");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVideo, "Video");
/*!
\variable QContactPhoneNumber::SubTypeMessagingCapable
@@ -1017,7 +1115,7 @@
The constant attribute value which describes the phone number as
supporting messaging services.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeMessagingCapable, "MessagingCapable");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMessagingCapable, "MessagingCapable");
/*!
\variable QContactPhoneNumber::SubTypeAssistant
@@ -1025,7 +1123,7 @@
The constant attribute value which describes the phone number as an
assistant phone number.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeAssistant, "Assistant");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeAssistant, "Assistant");
/*!
\variable QContactPhoneNumber::SubTypeDtmfMenu
@@ -1033,7 +1131,7 @@
The constant attribute value which describes the phone number as
supporting DTMF-controlled electronic menu navigation.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactPhoneNumber::SubTypeDtmfMenu, "DtmfMenu");
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeDtmfMenu, "DtmfMenu");
/*!
\variable QContactAddress::SubTypeParcel
@@ -1041,7 +1139,7 @@
The constant attribute value which describes the address as being
an address for parcel delivery.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::SubTypeParcel, "Parcel");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeParcel, "Parcel");
/*!
\variable QContactAddress::SubTypePostal
@@ -1049,7 +1147,7 @@
The constant attribute value which describes the address as being
an address for postal delivery.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::SubTypePostal, "Postal");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypePostal, "Postal");
/*!
\variable QContactAddress::SubTypeDomestic
@@ -1057,7 +1155,7 @@
The constant attribute value which describes the address as being a
domestic address.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::SubTypeDomestic, "Domestic");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeDomestic, "Domestic");
/*!
\variable QContactAddress::SubTypeInternational
@@ -1065,48 +1163,7 @@
The constant attribute value which describes the address as being
an international address.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAddress::SubTypeInternational, "International");
-
-/*!
- \variable QContactAvatar::SubTypeImage
-
- The constant attribute value which describes the avatar as being an
- image.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::SubTypeImage, "Image");
-
-/*!
- \variable QContactAvatar::SubTypeVideo
-
- The constant attribute value which describes the avatar as being a
- video.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::SubTypeVideo, "Video");
-
-/*!
- \variable QContactAvatar::SubTypeAudioRingtone
-
- The constant attribute value which describes the avatar as being an
- audio ringtone.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::SubTypeAudioRingtone, "AudioRingtone");
-
-/*!
- \variable QContactAvatar::SubTypeVideoRingtone
-
- The constant attribute value which describes the avatar as being a
- video ringtone.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::SubTypeVideoRingtone, "VideoRingtone");
-
-
-/*!
- \variable QContactAvatar::SubTypeTexturedMesh
-
- The constant attribute value which describes the avatar as being a
- textured, 3D mesh.
- */
-Q_DEFINE_LATIN1_LITERAL(QContactAvatar::SubTypeTexturedMesh, "TexturedMesh");
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeInternational, "International");
/*!
\variable QContactUrl::SubTypeHomePage
@@ -1114,7 +1171,7 @@
The constant attribute value which describes the url as being the
homepage of the contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactUrl::SubTypeHomePage, "HomePage");
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeHomePage, "HomePage");
/*!
\variable QContactUrl::SubTypeFavourite
@@ -1122,7 +1179,7 @@
The constant attribute value which describes the url as being a
favourite page of the contact.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactUrl::SubTypeFavourite, "Favourite");
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeFavourite, "Favourite");
/*!
\variable QContactAnniversary::SubTypeWedding
@@ -1130,7 +1187,7 @@
The constant attribute value which describes the anniversary as
being a wedding anniversary.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeWedding, "Wedding");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeWedding, "Wedding");
/*!
\variable QContactAnniversary::SubTypeEngagement
@@ -1138,7 +1195,7 @@
The constant attribute value which describes the anniversary as
being an engagement anniversary.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeEngagement, "Engagement");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEngagement, "Engagement");
/*!
\variable QContactAnniversary::SubTypeHouse
@@ -1146,7 +1203,7 @@
The constant attribute value which describes the anniversary as
being an anniversary of ownership of a particular residence.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeHouse, "House");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeHouse, "House");
/*!
\variable QContactAnniversary::SubTypeEmployment
@@ -1154,7 +1211,7 @@
The constant attribute value which describes the anniversary as
being an anniversary of employment at a particular company.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeEmployment, "Employment");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEmployment, "Employment");
/*!
\variable QContactAnniversary::SubTypeMemorial
@@ -1162,21 +1219,21 @@
The constant attribute value which describes the anniversary as
being an anniversary of an event of sentimental significance.
*/
-Q_DEFINE_LATIN1_LITERAL(QContactAnniversary::SubTypeMemorial, "Memorial");
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeMemorial, "Memorial");
/*!
\fn QContactSyncTarget::syncTarget() const
Returns the identifier of the backend store to which the contact
- containing this detail should be synchronised.
+ containing this detail should be synchronized.
*/
/*!
\fn QContactSyncTarget::setSyncTarget(const QString& syncTarget)
Sets the identifier of the backend store to which the contact
- containing this detail should be synchronised to \a syncTarget.
+ containing this detail should be synchronized to \a syncTarget.
*/
/*!
@@ -1211,12 +1268,12 @@
/*!
\fn QContactAnniversary::originalDate() const
- Returns the original date of occurrance of the event stored in this detail.
+ Returns the original date of occurrence of the event stored in this detail.
*/
/*!
\fn QContactAnniversary::setOriginalDate(const QDate& date)
- Sets the original date of occurrance of the event stored in this detail to \a date.
+ Sets the original date of occurrence of the event stored in this detail to \a date.
*/
/*!
@@ -1250,36 +1307,23 @@
*/
/*!
- \fn QContactAvatar::avatar() const
- Returns the location of an avatar file associated with the contact.
- */
-
-/*!
- \fn QContactAvatar::setAvatar(const QString& avatar)
- Sets the location of an avatar file associated with the contact to \a avatar.
- */
-
-/*!
- \fn QContactAvatar::pixmap() const
- Returns a thumbnail for a picture associated with this contact.
+ \fn QContactAvatar::imageUrl() const
+ Returns the url of an avatar image associated with the contact
*/
/*!
- \fn QContactAvatar::setPixmap(const QPixmap& pixmap)
- Sets the thumbnail of a picture avatar associated with the contact to \a pixmap.
- If \a pixmap is empty, the thumbnail pixmap will be removed.
-
- Returns true if the pixmap could be set, and false otherwise.
+ \fn QContactAvatar::setImageUrl(const QUrl& imageUrl)
+ Sets the url of an avatar image associated with the contact to \a imageUrl
*/
/*!
- \fn QContactAvatar::setSubType(const QString& subType)
- Sets the subtype which this detail implements to be the given \a subType.
+ \fn QContactAvatar::videoUrl() const
+ Returns the url of an avatar video associated with the contact
*/
/*!
- \fn QContactAvatar::subType() const
- Returns the subtype that this detail implements, if defined.
+ \fn QContactAvatar::setVideoUrl(const QUrl& videoUrl)
+ Sets the url of an avatar video associated with the contact to \a videoUrl
*/
/*!
@@ -1648,6 +1692,26 @@
*/
/*!
+ \fn QContactTag::setTag(const QString& tag)
+ Sets the tag associated with a contact which is stored in this detail to \a tag.
+ */
+
+/*!
+ \fn QContactTag::tag() const
+ Returns the tag associated with a contact which is stored in this detail.
+ */
+
+/*!
+ \fn QContactThumbnail::thumbnail() const
+ Returns the thumbnail image of the contact
+ */
+
+/*!
+ \fn QContactThumbnail::setThumbnail(const QImage& thumbnail)
+ Sets the thumbnail image of the contact to be \a thumbnail
+ */
+
+/*!
\fn QContactTimestamp::created() const
Returns the creation timestamp saved in this detail.
*/
@@ -1727,51 +1791,6 @@
*/
/*!
- \fn QContactOnlineAccount::setNickname(const QString& nickname)
-
- Sets the last-known nickname used by the contact during
- communications via the online account about which this detail
- stores presence information to \a nickname.
- */
-
-/*!
- \fn QContactOnlineAccount::nickname() const
-
- Returns the last-known nickname used by the contact during
- communications via the online account.
- */
-
-/*!
- \fn QContactOnlineAccount::setPresence(const QString& presence)
-
- Sets the presence of the online account according to the presence
- information provider to \a presence.
- */
-
-/*!
- \fn QContactOnlineAccount::presence() const
-
- Returns the presence of the online account according to the
- presence provider.
- */
-
-/*!
- \fn QContactOnlineAccount::setStatusMessage(const QString& statusMessage)
-
- Sets the last-known status message of the contact which was
- communicated via the online account about which this detail stores
- presence information to \a statusMessage.
- */
-
-/*!
- \fn QContactOnlineAccount::statusMessage() const
-
- Returns the last-known status message of the contact which was
- communicated via the online account about which this detail stores
- presence information.
- */
-
-/*!
\fn QContactOnlineAccount::setCapabilities(const QStringList& capabilities)
Sets the capabilities of the online account about which this detail stores
@@ -1798,16 +1817,15 @@
*/
/*!
- \fn QContactOrganization::setLogo(const QString& logo)
- Sets the logo of the organization stored in this detail to \a logo.
+ \fn QContactOrganization::setLogoUrl(const QUrl& logo)
+ Sets the url of the logo of the organization stored in this detail to \a logo.
*/
/*!
- \fn QContactOrganization::logo() const
- Returns the logo of the organization stored in this detail.
+ \fn QContactOrganization::logoUrl() const
+ Returns the url of the logo of the organization stored in this detail.
*/
-
/*!
\fn QContactOrganization::setDepartment(const QStringList& department)
@@ -1870,6 +1888,230 @@
this organization.
*/
+/*!
+ \fn QContactRingtone::audioRingtoneUrl() const
+
+ Returns the uri of the audio ringtone stored in the ringtone detail.
+ */
+
+/*!
+ \fn QContactRingtone::setAudioRingtoneUrl(const QUrl& audioRingtoneUrl)
+
+ Sets the uri of the audio ringtone stored in the ringtone detail
+ to \a audioRingtoneUrl.
+ */
+
+/*!
+ \fn QContactRingtone::videoRingtoneUrl() const
+
+ Returns the uri of the video ringtone stored in the ringtone detail.
+ */
+
+/*!
+ \fn QContactRingtone::setVideoRingtoneUrl(const QUrl& videoRingtoneUrl)
+
+ Sets the uri of the video ringtone stored in the ringtone detail
+ to \a videoRingtoneUrl.
+ */
+
+/*!
+ \fn QContactRingtone::vibrationRingtoneUrl() const
+
+ Returns the uri of the vibration ringtone stored in the ringtone detail.
+ */
+
+/*!
+ \fn QContactRingtone::setVibrationRingtoneUrl(const QUrl& vibrationRingtoneUrl)
+
+ Sets the uri of the vibration ringtone stored in the ringtone detail
+ to \a vibrationRingtoneUrl.
+ */
+
+/*!
+ \fn QContactPresence::setTimestamp(const QDateTime& updateTimestamp)
+
+ Sets the update timestamp of the presence detail to be
+ \a updateTimestamp.
+ */
+
+/*!
+ \fn QContactPresence::timestamp() const
+
+ Returns the timestamp at which the data in the presence detail was valid.
+ */
+
+/*!
+ \fn QContactPresence::setNickname(const QString& nickname)
+
+ Sets the last-known nickname used by the contact during
+ communications via the online account about which this detail
+ stores presence information to \a nickname.
+ */
+
+/*!
+ \fn QContactPresence::nickname() const
+
+ Returns the last-known nickname used by the contact during
+ communications via the online account.
+ */
+
+/*!
+ \enum QContactPresence::PresenceState
+
+ This enum defines the possible presence states supported by the default schema.
+
+ \value PresenceUnknown Signifies that the presence state of the contact is not currently known
+ \value PresenceAvailable Signifies that the contact is available
+ \value PresenceHidden Signifies that the contact is hidden
+ \value PresenceBusy Signifies that the contact is busy
+ \value PresenceAway Signifies that the contact is away
+ \value PresenceExtendedAway Signifies that the contact is away for an extended period of time
+ \value PresenceOffline Signifies that the contact is offline
+ */
+
+/*!
+ \fn QContactPresence::setPresenceState(QContactPresence::PresenceState presenceState)
+
+ Sets the presence state of the online account according to the presence
+ information provider to the given \a presenceState.
+ */
+
+/*!
+ \fn QContactPresence::presenceState() const
+
+ Returns the presence state of the online account according to the
+ presence provider.
+ */
+
+/*!
+ \fn QContactPresence::setPresenceStateText(const QString& presenceStateText)
+
+ Sets the text corresponding to the presence state to \a presenceStateText.
+ This function is generally called by presence providers to allow custom
+ naming of states, or to allow finer grained state reporting than is
+ provided by the presence state API.
+ */
+
+/*!
+ \fn QContactPresence::presenceStateText() const
+
+ Returns the text corresponding to the current presence state.
+ */
+
+/*!
+ \fn QContactPresence::setCustomMessage(const QString& customMessage)
+
+ Sets the custom status message from the contact for the online account
+ about which this detail stores presence information, to \a customMessage.
+ */
+
+/*!
+ \fn QContactPresence::customMessage() const
+
+ Returns the custom status message from the contact for the online account
+ about which this detail stores presence information.
+ */
+
+/*!
+ \fn QContactPresence::setPresenceStateImageUrl(const QUrl& presenceStateImageUrl)
+
+ Sets the last-known status image url of the contact for the online account
+ about which this detail stores presence information, to \a presenceStateImageUrl.
+ */
+
+/*!
+ \fn QContactPresence::presenceStateImageUrl() const
+
+ Returns the last-known status image url of the contact for the online account
+ about which this detail stores presence information.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setTimestamp(const QDateTime& updateTimestamp)
+
+ Sets the update timestamp of the global presence detail to be
+ \a updateTimestamp.
+ */
+
+/*!
+ \fn QContactGlobalPresence::timestamp() const
+
+ Returns the timestamp at which the data in the global presence detail was valid.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setNickname(const QString& nickname)
+
+ Sets the last-known nickname used by the contact during
+ communications via any online account about which this detail
+ aggregates presence information to \a nickname.
+ */
+
+/*!
+ \fn QContactGlobalPresence::nickname() const
+
+ Returns the last-known nickname used by the contact during
+ communications via any online account about which this detail
+ aggregates presence information.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setPresenceState(QContactPresence::PresenceState presenceState)
+
+ Sets the presence state of this aggregate detail according to the presence
+ information available from the presence providers which this detail aggregates
+ to the given \a presenceState.
+ */
+
+/*!
+ \fn QContactGlobalPresence::presenceState() const
+
+ Returns the aggregate presence state of any online accounts about which this detail
+ aggregates presence information.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setPresenceStateText(const QString& presenceStateText)
+
+ Sets the text corresponding to the presence state to \a presenceStateText.
+ This function is generally called by presence providers to allow custom
+ naming of states, or to allow finer grained state reporting than is
+ provided by the presence state API.
+ */
+
+/*!
+ \fn QContactGlobalPresence::presenceStateText() const
+
+ Returns the text corresponding to the current presence state.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setCustomMessage(const QString& customMessage)
+
+ Sets the custom status message from the contact for the aggregate presence
+ detail, to \a customMessage.
+ */
+
+/*!
+ \fn QContactGlobalPresence::customMessage() const
+
+ Returns the custom status message from the contact for the aggregate presence
+ detail.
+ */
+
+/*!
+ \fn QContactGlobalPresence::setPresenceStateImageUrl(const QUrl& presenceStateImageUrl)
+
+ Sets the last-known status image url of the contact to \a presenceStateImageUrl.
+ */
+
+/*!
+ \fn QContactGlobalPresence::presenceStateImageUrl() const
+
+ Returns the last-known status image url of the contact.
+ */
+
+
/* Convenience filters */