diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-11-24 08:51:58 +0100 |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-11-24 08:51:58 +0100 |
| commit | 89bbcf9a2f49b36f7efd3726433d78586e8bbbd1 (patch) | |
| tree | 3141d4c48b0458a0e9a7048cf8dfcf58cca8ad3b | |
| parent | 178132c8a045c7429689736d7a3b4748baebfbec (diff) | |
doc: Fixed many qdoc errors.
| -rw-r--r-- | doc/html/annotated.html | 44 | ||||
| -rw-r--r-- | doc/html/classes.html | 44 | ||||
| -rw-r--r-- | doc/html/functions.html | 14 | ||||
| -rw-r--r-- | doc/html/hierarchy.html | 1 | ||||
| -rw-r--r-- | doc/html/location-overview.html | 13 | ||||
| -rw-r--r-- | doc/html/location.html | 11 | ||||
| -rw-r--r-- | doc/html/qcontactid.html | 4 | ||||
| -rw-r--r-- | doc/html/qcontactmanagerinfo-members.html | 25 | ||||
| -rw-r--r-- | doc/html/qcontactmanagerinfo.html | 55 | ||||
| -rw-r--r-- | doc/html/qcontactrelationshipfetchrequest.html | 3 | ||||
| -rw-r--r-- | doc/html/qgeocoordinate.html | 15 | ||||
| -rw-r--r-- | doc/html/qgeopositioninfo.html | 15 | ||||
| -rw-r--r-- | doc/html/qimagecapturecontrol.html | 4 | ||||
| -rw-r--r-- | doc/html/qservicefilter.html | 8 | ||||
| -rw-r--r-- | doc/html/qserviceinterfacedescriptor.html | 8 | ||||
| -rw-r--r-- | doc/html/qt-mobility-library.dcf | 24 | ||||
| -rw-r--r-- | doc/html/qt-mobility-library.index | 67 | ||||
| -rw-r--r-- | doc/html/qtmobility.qhp | 26 | ||||
| -rw-r--r-- | doc/src/qtmobility.qdocconf | 1 | ||||
| -rw-r--r-- | src/contacts/requests/qcontactrelationshipremoverequest.cpp | 14 | ||||
| -rw-r--r-- | src/location/qgeoareamonitor.h | 6 | ||||
| -rw-r--r-- | src/multimedia/experimental/qimagecapturecontrol.cpp | 5 |
22 files changed, 200 insertions, 207 deletions
diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 5a25181306..00b6ec73ec 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -55,7 +55,7 @@ <tr valign="top" class="odd"><th><a href="qcontactgender.html">QContactGender</a></th><td>Contains the gender of a contact</td></tr> <tr valign="top" class="even"><th><a href="qcontactgeolocation.html">QContactGeolocation</a></th><td>Contains the global location coordinate associated with a contact</td></tr> <tr valign="top" class="odd"><th><a href="qcontactguid.html">QContactGuid</a></th><td>Contains the globally unique Id of a contact</td></tr> -<tr valign="top" class="even"><th><a href="qcontactid.html">QContactId</a></th><td>Uniquely identifies a contact in a particular manager</td></tr> +<tr valign="top" class="even"><th><a href="qcontactid.html">QContactId</a></th><td>Information that uniquely identifies a contact in a particular manager</td></tr> <tr valign="top" class="odd"><th><a href="qcontactintersectionfilter.html">QContactIntersectionFilter</a></th><td>Filter which intersects the results of other filters</td></tr> <tr valign="top" class="even"><th><a href="qcontactinvalidengine.html">QContactInvalidEngine</a></th><td>Implementation of QContactManagerEngine whose functions always return an error</td></tr> <tr valign="top" class="odd"><th><a href="qcontactinvalidfilter.html">QContactInvalidFilter</a></th><td>Matches no contacts</td></tr> @@ -64,33 +64,33 @@ <tr valign="top" class="even"><th><a href="qcontactmanager.html">QContactManager</a></th></tr> <tr valign="top" class="odd"><th><a href="qcontactmanagerengine.html">QContactManagerEngine</a></th><td>The interface for all implementations of the contact manager backend functionality</td></tr> <tr valign="top" class="even"><th><a href="qcontactmanagerenginefactory.html">QContactManagerEngineFactory</a></th><td>The interface for plugins that implement QContactManagerEngine functionality</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactmanagerinfo.html">QContactManagerInfo</a></th><td>Information about a particular QContactManager</td></tr> -<tr valign="top" class="even"><th><a href="qcontactmemoryengine.html">QContactMemoryEngine</a></th><td>In-memory implementation of a contacts backend</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactname.html">QContactName</a></th><td>Contains the name of a contact</td></tr> -<tr valign="top" class="even"><th><a href="qcontactnickname.html">QContactNickname</a></th><td>Contains a nickname of a contact</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactnote.html">QContactNote</a></th><td>Contains a note associated with a contact</td></tr> -<tr valign="top" class="even"><th><a href="qcontactonlineaccount.html">QContactOnlineAccount</a></th><td>The online account, which the contact uses to communicate with friends and family</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactorganization.html">QContactOrganization</a></th><td>Details about an organization that the contact is either a part of, or stands for</td></tr> -<tr valign="top" class="even"><th><a href="qcontactphonenumber.html">QContactPhoneNumber</a></th><td>Phone number of a contact</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactrelationship.html">QContactRelationship</a></th><td>Describes a one-to-one relationship between a locally-stored contact and another (possibly remote) contact</td></tr> -<tr valign="top" class="even"><th><a href="qcontactrelationshipfetchrequest.html">QContactRelationshipFetchRequest</a></th><td>Allows a client to asynchronously request relationships from a contacts store manager</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactrelationshipfilter.html">QContactRelationshipFilter</a></th><td>Filter based around relationship criteria</td></tr> -<tr valign="top" class="even"><th><a href="qcontactrelationshipremoverequest.html">QContactRelationshipRemoveRequest</a></th><td>Allows a client to asynchronously request that certain relationships be removed from a contacts store</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactremoverequest.html">QContactRemoveRequest</a></th><td>Allows a client to asynchronously request that certain contacts be removed from a contacts store</td></tr> -<tr valign="top" class="even"><th><a href="qcontactsaverequest.html">QContactSaveRequest</a></th><td>Allows a client to asynchronously request that certain contacts be saved to a contacts store</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactsortorder.html">QContactSortOrder</a></th><td>Defines how a list of contacts should be ordered according to some criteria</td></tr> -<tr valign="top" class="even"><th><a href="qcontactsynctarget.html">QContactSyncTarget</a></th><td>Sync target for a contact</td></tr> -<tr valign="top" class="odd"><th><a href="qcontacttimestamp.html">QContactTimestamp</a></th><td>Contains the creation and last-modified timestamp associated with the contact</td></tr> -<tr valign="top" class="even"><th><a href="qcontacttype.html">QContactType</a></th><td>Describes the type of the contact</td></tr> -<tr valign="top" class="odd"><th><a href="qcontactunionfilter.html">QContactUnionFilter</a></th><td>Filter which unions the results of other filters</td></tr> -<tr valign="top" class="even"><th><a href="qcontacturl.html">QContactUrl</a></th><td>Contains a url associated with a contact</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactmemoryengine.html">QContactMemoryEngine</a></th><td>In-memory implementation of a contacts backend</td></tr> +<tr valign="top" class="even"><th><a href="qcontactname.html">QContactName</a></th><td>Contains the name of a contact</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactnickname.html">QContactNickname</a></th><td>Contains a nickname of a contact</td></tr> +<tr valign="top" class="even"><th><a href="qcontactnote.html">QContactNote</a></th><td>Contains a note associated with a contact</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactonlineaccount.html">QContactOnlineAccount</a></th><td>The online account, which the contact uses to communicate with friends and family</td></tr> +<tr valign="top" class="even"><th><a href="qcontactorganization.html">QContactOrganization</a></th><td>Details about an organization that the contact is either a part of, or stands for</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactphonenumber.html">QContactPhoneNumber</a></th><td>Phone number of a contact</td></tr> +<tr valign="top" class="even"><th><a href="qcontactrelationship.html">QContactRelationship</a></th><td>Describes a one-to-one relationship between a locally-stored contact and another (possibly remote) contact</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactrelationshipfetchrequest.html">QContactRelationshipFetchRequest</a></th><td>Allows a client to asynchronously request relationships from a contacts store manager</td></tr> +<tr valign="top" class="even"><th><a href="qcontactrelationshipfilter.html">QContactRelationshipFilter</a></th><td>Filter based around relationship criteria</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactrelationshipremoverequest.html">QContactRelationshipRemoveRequest</a></th><td>Allows a client to asynchronously request that certain relationships be removed from a contacts store</td></tr> +<tr valign="top" class="even"><th><a href="qcontactremoverequest.html">QContactRemoveRequest</a></th><td>Allows a client to asynchronously request that certain contacts be removed from a contacts store</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactsaverequest.html">QContactSaveRequest</a></th><td>Allows a client to asynchronously request that certain contacts be saved to a contacts store</td></tr> +<tr valign="top" class="even"><th><a href="qcontactsortorder.html">QContactSortOrder</a></th><td>Defines how a list of contacts should be ordered according to some criteria</td></tr> +<tr valign="top" class="odd"><th><a href="qcontactsynctarget.html">QContactSyncTarget</a></th><td>Sync target for a contact</td></tr> +<tr valign="top" class="even"><th><a href="qcontacttimestamp.html">QContactTimestamp</a></th><td>Contains the creation and last-modified timestamp associated with the contact</td></tr> +<tr valign="top" class="odd"><th><a href="qcontacttype.html">QContactType</a></th><td>Describes the type of the contact</td></tr> +<tr valign="top" class="even"><th><a href="qcontactunionfilter.html">QContactUnionFilter</a></th><td>Filter which unions the results of other filters</td></tr> +<tr valign="top" class="odd"><th><a href="qcontacturl.html">QContactUrl</a></th><td>Contains a url associated with a contact</td></tr> +<tr valign="top" class="even"><th><a href="qgeoareamonitor.html">QGeoAreaMonitor</a></th><td>Enables the detection of proximity changes for a specified set of coordinates</td></tr> <tr valign="top" class="odd"><th><a href="qgeocoordinate.html">QGeoCoordinate</a></th><td>Defines a geographical position on the surface of the Earth</td></tr> <tr valign="top" class="even"><th><a href="qgeopositioninfo.html">QGeoPositionInfo</a></th><td>Contains information gathered on a global position, direction and velocity at a particular point in time</td></tr> <tr valign="top" class="odd"><th><a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a></th><td>Abstract base class for the distribution of positional updates</td></tr> <tr valign="top" class="even"><th><a href="qgeosatelliteinfo.html">QGeoSatelliteInfo</a></th><td>Contains basic information about a satellite</td></tr> <tr valign="top" class="odd"><th><a href="qgeosatelliteinfosource.html">QGeoSatelliteInfoSource</a></th><td>Abstract base class for the distribution of satellite information updates</td></tr> <tr valign="top" class="even"><th><a href="qgraphicsvideoitem.html">QGraphicsVideoItem</a></th><td>Graphics item which display video produced by a QMediaObject</td></tr> -<tr valign="top" class="odd"><th><a href="qimagecapturecontrol.html">QImageCaptureControl</a></th></tr> +<tr valign="top" class="odd"><th><a href="qimagecapturecontrol.html">QImageCaptureControl</a></th><td>Control interface for image capture services</td></tr> <tr valign="top" class="even"><th><a href="qimageencodercontrol.html">QImageEncoderControl</a></th><td>Access to the settings of a media service that performs image encoding</td></tr> <tr valign="top" class="odd"><th><a href="qimageencodersettings.html">QImageEncoderSettings</a></th><td>Set of image encoder settings</td></tr> <tr valign="top" class="even"><th><a href="qimageprocessingcontrol.html">QImageProcessingControl</a></th><td>Abstract class for controling image processing parameters, like white balance, contrast, saturation, sharpening and denoising</td></tr> diff --git a/doc/html/classes.html b/doc/html/classes.html index 247dca5656..e3812c2d53 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -60,7 +60,7 @@ <td align="right"></td> <td><a href="qaudioencodercontrol.html">QAudioEncoderControl</a></td> <td align="right"></td> -<td><a href="qcontactmanagerinfo.html">QContactManagerInfo</a></td> +<td><a href="qcontactmemoryengine.html">QContactMemoryEngine</a></td> <td align="right"></td> <td><a href="qmailmessageheaderfieldfwd.html">QMailMessageHeaderFieldFwd</a></td> <td align="right"></td> @@ -70,7 +70,7 @@ <td align="right"></td> <td><a href="qaudioencodersettings.html">QAudioEncoderSettings</a></td> <td align="right"></td> -<td><a href="qcontactmemoryengine.html">QContactMemoryEngine</a></td> +<td><a href="qcontactname.html">QContactName</a></td> <td align="right"></td> <td><a href="qmailmessageid.html">QMailMessageId</a></td> <td align="right"></td> @@ -80,7 +80,7 @@ <td align="right"></td> <td><a href="qaudioformat.html">QAudioFormat</a></td> <td align="right"></td> -<td><a href="qcontactname.html">QContactName</a></td> +<td><a href="qcontactnickname.html">QContactNickname</a></td> <td align="right"></td> <td><a href="qmailmessagemetadata.html">QMailMessageMetaData</a></td> <td align="right"></td> @@ -90,7 +90,7 @@ <td align="right"><b>C </b></td> <td><a href="qcamera.html">QCamera</a></td> <td align="right"></td> -<td><a href="qcontactnickname.html">QContactNickname</a></td> +<td><a href="qcontactnote.html">QContactNote</a></td> <td align="right"></td> <td><a href="qmailmessagemetadatafwd.html">QMailMessageMetaDataFwd</a></td> <td align="right"></td> @@ -100,7 +100,7 @@ <td align="right"></td> <td><a href="qcameracontrol.html">QCameraControl</a></td> <td align="right"></td> -<td><a href="qcontactnote.html">QContactNote</a></td> +<td><a href="qcontactonlineaccount.html">QContactOnlineAccount</a></td> <td align="right"></td> <td><a href="qmailmessagepart.html">QMailMessagePart</a></td> <td align="right"></td> @@ -110,7 +110,7 @@ <td align="right"></td> <td><a href="qcameraexposurecontrol.html">QCameraExposureControl</a></td> <td align="right"></td> -<td><a href="qcontactonlineaccount.html">QContactOnlineAccount</a></td> +<td><a href="qcontactorganization.html">QContactOrganization</a></td> <td align="right"></td> <td><a href="qmailmessagepartcontainer.html">QMailMessagePartContainer</a></td> <td align="right"></td> @@ -120,7 +120,7 @@ <td align="right"></td> <td><a href="qcamerafocuscontrol.html">QCameraFocusControl</a></td> <td align="right"></td> -<td><a href="qcontactorganization.html">QContactOrganization</a></td> +<td><a href="qcontactphonenumber.html">QContactPhoneNumber</a></td> <td align="right"></td> <td><a href="qmailmessagepartcontainerfwd.html">QMailMessagePartContainerFwd</a></td> <td align="right"></td> @@ -130,7 +130,7 @@ <td align="right"></td> <td><a href="qcontact.html">QContact</a></td> <td align="right"></td> -<td><a href="qcontactphonenumber.html">QContactPhoneNumber</a></td> +<td><a href="qcontactrelationship.html">QContactRelationship</a></td> <td align="right"></td> <td><a href="qmailmessagepartfwd.html">QMailMessagePartFwd</a></td> <td align="right"></td> @@ -140,7 +140,7 @@ <td align="right"></td> <td><a href="qcontactabstractrequest.html">QContactAbstractRequest</a></td> <td align="right"></td> -<td><a href="qcontactrelationship.html">QContactRelationship</a></td> +<td><a href="qcontactrelationshipfetchrequest.html">QContactRelationshipFetchRequest</a></td> <td align="right"></td> <td><a href="qmailpassthroughcodec.html">QMailPassThroughCodec</a></td> <td align="right"></td> @@ -150,7 +150,7 @@ <td align="right"></td> <td><a href="qcontactaction.html">QContactAction</a></td> <td align="right"></td> -<td><a href="qcontactrelationshipfetchrequest.html">QContactRelationshipFetchRequest</a></td> +<td><a href="qcontactrelationshipfilter.html">QContactRelationshipFilter</a></td> <td align="right"></td> <td><a href="qmailquotedprintablecodec.html">QMailQuotedPrintableCodec</a></td> <td align="right"></td> @@ -160,7 +160,7 @@ <td align="right"></td> <td><a href="qcontactactiondescriptor.html">QContactActionDescriptor</a></td> <td align="right"></td> -<td><a href="qcontactrelationshipfilter.html">QContactRelationshipFilter</a></td> +<td><a href="qcontactrelationshipremoverequest.html">QContactRelationshipRemoveRequest</a></td> <td align="right"></td> <td><a href="qmailtimestamp.html">QMailTimeStamp</a></td> <td align="right"><b>N </b></td> @@ -170,7 +170,7 @@ <td align="right"></td> <td><a href="qcontactactionfactory.html">QContactActionFactory</a></td> <td align="right"></td> -<td><a href="qcontactrelationshipremoverequest.html">QContactRelationshipRemoveRequest</a></td> +<td><a href="qcontactremoverequest.html">QContactRemoveRequest</a></td> <td align="right"></td> <td><a href="qmediacontent.html">QMediaContent</a></td> <td align="right"></td> @@ -180,7 +180,7 @@ <td align="right"></td> <td><a href="qcontactactionfilter.html">QContactActionFilter</a></td> <td align="right"></td> -<td><a href="qcontactremoverequest.html">QContactRemoveRequest</a></td> +<td><a href="qcontactsaverequest.html">QContactSaveRequest</a></td> <td align="right"></td> <td><a href="qmediacontrol.html">QMediaControl</a></td> <td align="right"></td> @@ -190,7 +190,7 @@ <td align="right"></td> <td><a href="qcontactaddress.html">QContactAddress</a></td> <td align="right"></td> -<td><a href="qcontactsaverequest.html">QContactSaveRequest</a></td> +<td><a href="qcontactsortorder.html">QContactSortOrder</a></td> <td align="right"></td> <td><a href="qmediaformatcontrol.html">QMediaFormatControl</a></td> <td align="right"></td> @@ -200,7 +200,7 @@ <td align="right"></td> <td><a href="qcontactanniversary.html">QContactAnniversary</a></td> <td align="right"></td> -<td><a href="qcontactsortorder.html">QContactSortOrder</a></td> +<td><a href="qcontactsynctarget.html">QContactSyncTarget</a></td> <td align="right"></td> <td><a href="qmediaimageviewer.html">QMediaImageViewer</a></td> <td align="right"><b>R </b></td> @@ -210,7 +210,7 @@ <td align="right"></td> <td><a href="qcontactavatar.html">QContactAvatar</a></td> <td align="right"></td> -<td><a href="qcontactsynctarget.html">QContactSyncTarget</a></td> +<td><a href="qcontacttimestamp.html">QContactTimestamp</a></td> <td align="right"></td> <td><a href="qmediaobject.html">QMediaObject</a></td> <td align="right"></td> @@ -220,7 +220,7 @@ <td align="right"></td> <td><a href="qcontactbirthday.html">QContactBirthday</a></td> <td align="right"></td> -<td><a href="qcontacttimestamp.html">QContactTimestamp</a></td> +<td><a href="qcontacttype.html">QContactType</a></td> <td align="right"></td> <td><a href="qmediaplayer.html">QMediaPlayer</a></td> <td align="right"><b>S </b></td> @@ -230,7 +230,7 @@ <td align="right"></td> <td><a href="qcontactchangelogfilter.html">QContactChangeLogFilter</a></td> <td align="right"></td> -<td><a href="qcontacttype.html">QContactType</a></td> +<td><a href="qcontactunionfilter.html">QContactUnionFilter</a></td> <td align="right"></td> <td><a href="qmediaplayercontrol.html">QMediaPlayerControl</a></td> <td align="right"></td> @@ -240,7 +240,7 @@ <td align="right"></td> <td><a href="qcontactchangeset.html">QContactChangeSet</a></td> <td align="right"></td> -<td><a href="qcontactunionfilter.html">QContactUnionFilter</a></td> +<td><a href="qcontacturl.html">QContactUrl</a></td> <td align="right"></td> <td><a href="qmediaplaylist.html">QMediaPlaylist</a></td> <td align="right"></td> @@ -249,8 +249,8 @@ <tr> <td align="right"></td> <td><a href="qcontactdetail.html">QContactDetail</a></td> -<td align="right"></td> -<td><a href="qcontacturl.html">QContactUrl</a></td> +<td align="right"><b>G </b></td> +<td><a href="qgeoareamonitor.html">QGeoAreaMonitor</a></td> <td align="right"></td> <td><a href="qmediaplaylistcontrol.html">QMediaPlaylistControl</a></td> <td align="right"></td> @@ -259,7 +259,7 @@ <tr> <td align="right"></td> <td><a href="qcontactdetaildefinition.html">QContactDetailDefinition</a></td> -<td align="right"><b>G </b></td> +<td align="right"></td> <td><a href="qgeocoordinate.html">QGeoCoordinate</a></td> <td align="right"></td> <td><a href="qmediaplaylistioplugin.html">QMediaPlaylistIOPlugin</a></td> diff --git a/doc/html/functions.html b/doc/html/functions.html index b46f14eb79..06dcec9802 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -238,6 +238,8 @@ <li>appendItems: <a href="qmediaplaylist.html#appendItems">QMediaPlaylist</a> <a href="qmediaplaylistprovider.html#appendItems">QMediaPlaylistProvider</a></li> <li>appendPart: <a href="qmailmessagepartcontainer.html#appendPart">QMailMessagePartContainer</a></li> <li>applySettings: <a href="qmediarecordercontrol.html#applySettings">QMediaRecorderControl</a></li> +<li>areaEntered: <a href="qgeoareamonitor.html#areaEntered">QGeoAreaMonitor</a></li> +<li>areaExited: <a href="qgeoareamonitor.html#areaExited">QGeoAreaMonitor</a></li> <li>aspectRatioMode: <a href="qvideowidget.html#aspectRatioMode-prop">QVideoWidget</a> <a href="qvideowidgetcontrol.html#aspectRatioMode">QVideoWidgetControl</a> <a href="qvideowindowcontrol.html#aspectRatioMode">QVideoWindowControl</a></li> <li>assign: <a href="qcontactdetail.html#assign">QContactDetail</a></li> <li>assistantName: <a href="qcontactorganization.html#assistantName">QContactOrganization</a></li> @@ -316,7 +318,7 @@ <li>cd: <a href="qvaluespacesubscriber.html#cd">QValueSpaceSubscriber</a></li> <li>cdUp: <a href="qvaluespacesubscriber.html#cdUp">QValueSpaceSubscriber</a></li> <li>cellId: <a href="qsystemnetworkinfo.html#cellId-prop">QSystemNetworkInfo</a></li> -<li>center: <a href="http://qt.nokia.com/doc/4.5/qtextstream.html#center">global</a></li> +<li>center: <a href="http://qt.nokia.com/doc/4.5/qtextstream.html#center">global</a> <a href="qgeoareamonitor.html#center-prop">QGeoAreaMonitor</a></li> <li>changedContacts: <a href="qcontactchangeset.html#changedContacts">QContactChangeSet</a></li> <li>channels: <a href="qaudioencodersettings.html#channels">QAudioEncoderSettings</a> <a href="qaudioformat.html#channels">QAudioFormat</a> <a href="qmediaresource.html#channels">QMediaResource</a></li> <li>charset: <a href="qmailmessagecontenttype.html#charset">QMailMessageContentType</a></li> @@ -379,6 +381,7 @@ <li>coverArtUriLarge: <a href="qmediacontent.html#coverArtUriLarge">QMediaContent</a></li> <li>coverArtUriSmall: <a href="qmediacontent.html#coverArtUriSmall">QMediaContent</a></li> <li>create: <a href="qmediaserviceproviderplugin.html#create">QMediaServiceProviderPlugin</a></li> +<li>createDefaultMonitor: <a href="qgeoareamonitor.html#createDefaultMonitor">QGeoAreaMonitor</a></li> <li>createDefaultSource: <a href="qgeopositioninfosource.html#createDefaultSource">QGeoPositionInfoSource</a> <a href="qgeosatelliteinfosource.html#createDefaultSource">QGeoSatelliteInfoSource</a></li> <li>createInstance: <a href="qserviceplugininterface.html#createInstance">QServicePluginInterface</a></li> <li>createMemoryEngine: <a href="qcontactmemoryengine.html#createMemoryEngine">QContactMemoryEngine</a></li> @@ -742,13 +745,13 @@ <li>operator-: <a href="http://qt.nokia.com/doc/4.5/qpointf.html#operator--19">global</a></li> <li>operator/: <a href="http://qt.nokia.com/doc/4.5/qpointf.html#operator/-10">global</a></li> <li>operator<: <a href="http://qt.nokia.com/doc/4.5/qchar.html#operator<-15">global</a> <a href="qmailaccountid.html#operator-lt">QMailAccountId</a> <a href="qmailfolderid.html#operator-lt">QMailFolderId</a> <a href="qmailmessageid.html#operator-lt">QMailMessageId</a> <a href="qmailtimestamp.html#operator-lt">QMailTimeStamp</a></li> -<li>operator<<: <a href="qserviceinterfacedescriptor.html#operator-lt-lt-84">global</a> <a href="qcontactintersectionfilter.html#operator-lt-lt">QContactIntersectionFilter</a> <a href="qcontactunionfilter.html#operator-lt-lt">QContactUnionFilter</a></li> +<li>operator<<: <a href="qserviceinterfacedescriptor.html#operator-lt-lt-86">global</a> <a href="qcontactintersectionfilter.html#operator-lt-lt">QContactIntersectionFilter</a> <a href="qcontactunionfilter.html#operator-lt-lt">QContactUnionFilter</a></li> <li>operator<=: <a href="http://qt.nokia.com/doc/4.5/qchar.html#operator<=-12">global</a> <a href="qmailtimestamp.html#operator-lt-eq">QMailTimeStamp</a></li> <li>operator=: <a href="qaudioencodersettings.html#operator-eq">QAudioEncoderSettings</a> <a href="qaudioformat.html#operator-eq">QAudioFormat</a> <a href="qcontact.html#operator-eq">QContact</a> <a href="qcontactactiondescriptor.html#operator-eq">QContactActionDescriptor</a> <a href="qcontactchangeset.html#operator-eq">QContactChangeSet</a> <a href="qcontactdetail.html#operator-eq">QContactDetail</a> <a href="qcontactdetaildefinition.html#operator-eq">QContactDetailDefinition</a> <a href="qcontactdetaildefinitionfield.html#operator-eq">QContactDetailDefinitionField</a> <a href="qcontactfilter.html#operator-eq">QContactFilter</a> <a href="qcontactid.html#operator-eq">QContactId</a> <a href="qcontactrelationship.html#operator-eq">QContactRelationship</a> <a href="qcontactsortorder.html#operator-eq">QContactSortOrder</a> <a href="qgeocoordinate.html#operator-eq">QGeoCoordinate</a> <a href="qgeopositioninfo.html#operator-eq">QGeoPositionInfo</a> <a href="qgeosatelliteinfo.html#operator-eq">QGeoSatelliteInfo</a> <a href="qimageencodersettings.html#operator-eq">QImageEncoderSettings</a> <a href="qmediacontent.html#operator-eq">QMediaContent</a> <a href="qmediaresource.html#operator-eq">QMediaResource</a> <a href="qmediaserviceproviderhint.html#operator-eq">QMediaServiceProviderHint</a> <a href="qmessageaccountid.html#operator-eq">QMessageAccountId</a> <a href="qmessagefolderid.html#operator-eq">QMessageFolderId</a> <a href="qnetworkconfiguration.html#operator-eq">QNetworkConfiguration</a> <a href="qservicefilter.html#operator-eq">QServiceFilter</a> <a href="qserviceinterfacedescriptor.html#operator-eq">QServiceInterfaceDescriptor</a> <a href="qvideoencodersettings.html#operator-eq">QVideoEncoderSettings</a></li> <li>operator==: <a href="http://qt.nokia.com/doc/4.5/qrectf.html#operator==-75">global</a> <a href="qaudioencodersettings.html#operator-eq-eq">QAudioEncoderSettings</a> <a href="qaudioformat.html#operator-eq-eq">QAudioFormat</a> <a href="qcontact.html#operator-eq-eq">QContact</a> <a href="qcontactactiondescriptor.html#operator-eq-eq">QContactActionDescriptor</a> <a href="qcontactdetail.html#operator-eq-eq">QContactDetail</a> <a href="qcontactdetaildefinition.html#operator-eq-eq">QContactDetailDefinition</a> <a href="qcontactdetaildefinitionfield.html#operator-eq-eq">QContactDetailDefinitionField</a> <a href="qcontactfilter.html#operator-eq-eq">QContactFilter</a> <a href="qcontactid.html#operator-eq-eq">QContactId</a> <a href="qcontactrelationship.html#operator-eq-eq">QContactRelationship</a> <a href="qcontactsortorder.html#operator-eq-eq">QContactSortOrder</a> <a href="qgeocoordinate.html#operator-eq-eq">QGeoCoordinate</a> <a href="qgeopositioninfo.html#operator-eq-eq">QGeoPositionInfo</a> <a href="qgeosatelliteinfo.html#operator-eq-eq">QGeoSatelliteInfo</a> <a href="qimageencodersettings.html#operator-eq-eq">QImageEncoderSettings</a> <a href="qmailaccountid.html#operator-eq-eq">QMailAccountId</a> <a href="qmailfolderid.html#operator-eq-eq">QMailFolderId</a> <a href="qmailmessageid.html#operator-eq-eq">QMailMessageId</a> <a href="qmailtimestamp.html#operator-eq-eq">QMailTimeStamp</a> <a href="qmediacontent.html#operator-eq-eq">QMediaContent</a> <a href="qmediaresource.html#operator-eq-eq">QMediaResource</a> <a href="qmediaserviceproviderhint.html#operator-eq-eq">QMediaServiceProviderHint</a> <a href="qmessageaccountid.html#operator-eq-eq">QMessageAccountId</a> <a href="qnetworkconfiguration.html#operator-eq-eq">QNetworkConfiguration</a> <a href="qserviceinterfacedescriptor.html#operator-eq-eq">QServiceInterfaceDescriptor</a> <a href="qvideoencodersettings.html#operator-eq-eq">QVideoEncoderSettings</a></li> <li>operator>: <a href="http://qt.nokia.com/doc/4.5/qchar.html#operator>-12">global</a> <a href="qmailtimestamp.html#operator-gt">QMailTimeStamp</a></li> <li>operator>=: <a href="http://qt.nokia.com/doc/4.5/qchar.html#operator>=-12">global</a> <a href="qmailtimestamp.html#operator-gt-eq">QMailTimeStamp</a></li> -<li>operator>>: <a href="qserviceinterfacedescriptor.html#operator-gt-gt-78">global</a></li> +<li>operator>>: <a href="qserviceinterfacedescriptor.html#operator-gt-gt-80">global</a></li> <li>operator^: <a href="http://qt.nokia.com/doc/4.5/qbitarray.html#operator^">global</a></li> <li>operator|: <a href="">global</a> <a href="qmessageaccountfilter.html#operator-7c">QMessageAccountFilter</a> <a href="qmessagefilter.html#operator-7c">QMessageFilter</a> <a href="qmessagefolderfilter.html#operator-7c">QMessageFolderFilter</a></li> <li>operator|=: <a href="qmessageaccountfilter.html#operator-7c-eq">QMessageAccountFilter</a> <a href="qmessagefilter.html#operator-7c-eq">QMessageFilter</a> <a href="qmessagefolderfilter.html#operator-7c-eq">QMessageFolderFilter</a></li> @@ -929,7 +932,8 @@ <li>quoteString: <a href="qmail.html#quoteString">QMail</a></li> <li>qvariant_cast: <a href="http://qt.nokia.com/doc/4.5/qvariant.html#qvariant_cast">global</a></li> <li>qvsnprintf: <a href="http://qt.nokia.com/doc/4.5/qbytearray.html#qvsnprintf">global</a></li> -<li>rangeFlags:<a name="r"></a> <a href="qcontactdetailrangefilter.html#rangeFlags">QContactDetailRangeFilter</a></li> +<li>radius:<a name="r"></a> <a href="qgeoareamonitor.html#radius-prop">QGeoAreaMonitor</a></li> +<li>rangeFlags: <a href="qcontactdetailrangefilter.html#rangeFlags">QContactDetailRangeFilter</a></li> <li>readDate: <a href="qmailmessagecontentdisposition.html#readDate">QMailMessageContentDisposition</a></li> <li>readItem: <a href="qmediaplaylistreader.html#readItem">QMediaPlaylistReader</a></li> <li>readyForCaptureChanged: <a href="qcamera.html#readyForCaptureChanged">QCamera</a> <a href="qimagecapturecontrol.html#readyForCaptureChanged">QImageCaptureControl</a></li> @@ -1066,6 +1070,7 @@ <li>setCapabilities: <a href="qservicefilter.html#setCapabilities">QServiceFilter</a></li> <li>setCaseSensitivity: <a href="qcontactsortorder.html#setCaseSensitivity">QContactSortOrder</a></li> <li>setCc: <a href="qmailmessage.html#setCc">QMailMessage</a> <a href="qmessage.html#setCc">QMessage</a></li> +<li>setCenter: <a href="qgeoareamonitor.html#center-prop">QGeoAreaMonitor</a></li> <li>setChannels: <a href="qaudioencodersettings.html#setChannels">QAudioEncoderSettings</a> <a href="qaudioformat.html#setChannels">QAudioFormat</a> <a href="qmediaresource.html#setChannels">QMediaResource</a></li> <li>setCharset: <a href="qmailmessagecontenttype.html#setCharset">QMailMessageContentType</a></li> <li>setChildren: <a href="qcontactfamily.html#setChildren">QContactFamily</a></li> @@ -1208,6 +1213,7 @@ <li>setPrnNumber: <a href="qgeosatelliteinfo.html#setPrnNumber">QGeoSatelliteInfo</a></li> <li>setProperty: <a href="qabstractvaluespacelayer.html#setProperty">QAbstractValueSpaceLayer</a> <a href="qgeopositioninfo.html#setProperty">QGeoPositionInfo</a> <a href="qgeosatelliteinfo.html#setProperty">QGeoSatelliteInfo</a> <a href="qnetworksession.html#setProperty">QNetworkSession</a></li> <li>setQuality: <a href="qaudioencodersettings.html#setQuality">QAudioEncoderSettings</a> <a href="qimageencodersettings.html#setQuality">QImageEncoderSettings</a> <a href="qvideoencodersettings.html#setQuality">QVideoEncoderSettings</a></li> +<li>setRadius: <a href="qgeoareamonitor.html#radius-prop">QGeoAreaMonitor</a></li> <li>setRange: <a href="qcontactdetailrangefilter.html#setRange">QContactDetailRangeFilter</a></li> <li>setReadDate: <a href="qmailmessagecontentdisposition.html#setReadDate">QMailMessageContentDisposition</a></li> <li>setReceivedDate: <a href="qmailmessagemetadata.html#setReceivedDate">QMailMessageMetaData</a> <a href="qmessage.html#setReceivedDate">QMessage</a></li> diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 1a5f22f1ae..eb3790e816 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -59,7 +59,6 @@ </ul> <li><a href="qcontactid.html">QContactId</a></li> <li><a href="qcontactmanagerenginefactory.html">QContactManagerEngineFactory</a></li> -<li><a href="qcontactmanagerinfo.html">QContactManagerInfo</a></li> <li><a href="qcontactrelationship.html">QContactRelationship</a></li> <li><a href="qcontactsortorder.html">QContactSortOrder</a></li> <li><a href="qgeocoordinate.html">QGeoCoordinate</a></li> diff --git a/doc/html/location-overview.html b/doc/html/location-overview.html index 9d8bd953ab..d5ca0bcfd7 100644 --- a/doc/html/location-overview.html +++ b/doc/html/location-overview.html @@ -35,7 +35,7 @@ <p>This data can be extracted through a variety of methods. One of the most well known methods of positioning is GPS (Global Positioning System), a publicly available system that uses radiowave signals received from Earth-orbiting satellites to calculate the precise position and time of the receiver. Another popular method is Cell ID positioning, which uses the cell ID of the cell site that is currently serving the receiving device to calculate its approximate location. These and other positioning methods can all be used with the Location API; the only requirement for a location data source within the API is that it provides a latitude-longitude coordinate with a date/time value, with the option of providing the other attributes listed above.</p> <p>Location data sources are created by subclassing <a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a> and providing <a href="qgeopositioninfo.html">QGeoPositionInfo</a> objects through the <a href="qgeopositioninfosource.html#positionUpdated">QGeoPositionInfoSource::positionUpdated</a>() signal. Clients that require location data can connect to the <a href="qgeopositioninfosource.html#positionUpdated">positionUpdated()</a> signal and call <a href="qgeopositioninfosource.html#startUpdates">startUpdates()</a> or <a href="qgeopositioninfosource.html#requestUpdate">requestUpdate()</a> to trigger the distribution of location data.</p> <p>A default position source may be available on some platforms. Call QGeoPositionInfoSource::createSource() to create an instance of the default position source; the method returns 0 if no default source is available for the platform.</p> -<p>The QGeoAreaMonitor class enables client applications to be notified when the receiving device has moved in or out of a particular area, as specified by a coordinate and radius. If the platform provides built-in support for area monitoring, QGeoAreaMonitor::createMonitor() returns an instance of the default area monitor.</p> +<p>The <a href="qgeoareamonitor.html">QGeoAreaMonitor</a> class enables client applications to be notified when the receiving device has moved in or out of a particular area, as specified by a coordinate and radius. If the platform provides built-in support for area monitoring, QGeoAreaMonitor::createMonitor() returns an instance of the default area monitor.</p> <p>Satellite information can also be distributed through the QSatelliteInfoSource class. Call QSatelliteInfoSource::createSource() to create an instance of the default satellite data source for the platform, if one is available. Alternatively, clients can subclass it to provide a custom satellite data source.</p> <a name="requesting-location-data-from-data-sources"></a> <h4>Requesting location data from data sources</h4> @@ -177,11 +177,12 @@ <a name="classes"></a> <h3>Classes</h3> <p><table width="100%" class="annotated" cellpadding="2" cellspacing="1" border="0"> -<tr valign="top" class="odd"><th><a href="qgeocoordinate.html">QGeoCoordinate</a></th><td>Defines a geographical position on the surface of the Earth</td></tr> -<tr valign="top" class="even"><th><a href="qgeopositioninfo.html">QGeoPositionInfo</a></th><td>Contains information gathered on a global position, direction and velocity at a particular point in time</td></tr> -<tr valign="top" class="odd"><th><a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a></th><td>Abstract base class for the distribution of positional updates</td></tr> -<tr valign="top" class="even"><th><a href="qgeosatelliteinfo.html">QGeoSatelliteInfo</a></th><td>Contains basic information about a satellite</td></tr> -<tr valign="top" class="odd"><th><a href="qgeosatelliteinfosource.html">QGeoSatelliteInfoSource</a></th><td>Abstract base class for the distribution of satellite information updates</td></tr> +<tr valign="top" class="odd"><th><a href="qgeoareamonitor.html">QGeoAreaMonitor</a></th><td>Enables the detection of proximity changes for a specified set of coordinates</td></tr> +<tr valign="top" class="even"><th><a href="qgeocoordinate.html">QGeoCoordinate</a></th><td>Defines a geographical position on the surface of the Earth</td></tr> +<tr valign="top" class="odd"><th><a href="qgeopositioninfo.html">QGeoPositionInfo</a></th><td>Contains information gathered on a global position, direction and velocity at a particular point in time</td></tr> +<tr valign="top" class="even"><th><a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a></th><td>Abstract base class for the distribution of positional updates</td></tr> +<tr valign="top" class="odd"><th><a href="qgeosatelliteinfo.html">QGeoSatelliteInfo</a></th><td>Contains basic information about a satellite</td></tr> +<tr valign="top" class="even"><th><a href="qgeosatelliteinfosource.html">QGeoSatelliteInfoSource</a></th><td>Abstract base class for the distribution of satellite information updates</td></tr> </table></p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> diff --git a/doc/html/location.html b/doc/html/location.html index 61dc328f9c..b762cbb955 100644 --- a/doc/html/location.html +++ b/doc/html/location.html @@ -16,11 +16,12 @@ </h1> <p>The Location API provides a library for distributing and receiving location data using arbitrary data sources.</p> <p><table width="100%" class="annotated" cellpadding="2" cellspacing="1" border="0"> -<tr valign="top" class="odd"><th><a href="qgeocoordinate.html">QGeoCoordinate</a></th><td>Defines a geographical position on the surface of the Earth</td></tr> -<tr valign="top" class="even"><th><a href="qgeopositioninfo.html">QGeoPositionInfo</a></th><td>Contains information gathered on a global position, direction and velocity at a particular point in time</td></tr> -<tr valign="top" class="odd"><th><a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a></th><td>Abstract base class for the distribution of positional updates</td></tr> -<tr valign="top" class="even"><th><a href="qgeosatelliteinfo.html">QGeoSatelliteInfo</a></th><td>Contains basic information about a satellite</td></tr> -<tr valign="top" class="odd"><th><a href="qgeosatelliteinfosource.html">QGeoSatelliteInfoSource</a></th><td>Abstract base class for the distribution of satellite information updates</td></tr> +<tr valign="top" class="odd"><th><a href="qgeoareamonitor.html">QGeoAreaMonitor</a></th><td>Enables the detection of proximity changes for a specified set of coordinates</td></tr> +<tr valign="top" class="even"><th><a href="qgeocoordinate.html">QGeoCoordinate</a></th><td>Defines a geographical position on the surface of the Earth</td></tr> +<tr valign="top" class="odd"><th><a href="qgeopositioninfo.html">QGeoPositionInfo</a></th><td>Contains information gathered on a global position, direction and velocity at a particular point in time</td></tr> +<tr valign="top" class="even"><th><a href="qgeopositioninfosource.html">QGeoPositionInfoSource</a></th><td>Abstract base class for the distribution of positional updates</td></tr> +<tr valign="top" class="odd"><th><a href="qgeosatelliteinfo.html">QGeoSatelliteInfo</a></th><td>Contains basic information about a satellite</td></tr> +<tr valign="top" class="even"><th><a href="qgeosatelliteinfosource.html">QGeoSatelliteInfoSource</a></th><td>Abstract base class for the distribution of satellite information updates</td></tr> </table></p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> diff --git a/doc/html/qcontactid.html b/doc/html/qcontactid.html index 14fbc192f9..917f9f390f 100644 --- a/doc/html/qcontactid.html +++ b/doc/html/qcontactid.html @@ -13,7 +13,7 @@ <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">QContactId Class Reference</h1> -<p>The QContactId class uniquely identifies a contact in a particular manager. <a href="#details">More...</a></p> +<p>The QContactId class provides information that uniquely identifies a contact in a particular manager. <a href="#details">More...</a></p> <pre> #include <QContactId></pre><ul> <li><a href="qcontactid-members.html">List of all members, including inherited members</a></li> </ul> @@ -35,7 +35,7 @@ <a name="details"></a> <hr /> <h2>Detailed Description</h2> -<p>The QContactId class uniquely identifies a contact in a particular manager.</p> +<p>The QContactId class provides information that uniquely identifies a contact in a particular manager.</p> <p>It consists of a manager URI which identifies the manager which contains the contact, and the local id of the contact in that manager.</p> <hr /> <h2>Member Function Documentation</h2> diff --git a/doc/html/qcontactmanagerinfo-members.html b/doc/html/qcontactmanagerinfo-members.html deleted file mode 100644 index af3dd201ee..0000000000 --- a/doc/html/qcontactmanagerinfo-members.html +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<!-- qcontactmanagerinfo.cpp --> -<head> - <title>Qt Mobility 1.0: List of All Members for QContactManagerInfo</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">List of All Members for QContactManagerInfo</h1> -<p>This is the complete list of members for <a href="qcontactmanagerinfo.html">QContactManagerInfo</a>, including inherited members.</p> -<ul> -<li><div class="fn">enum <b><a href="qcontactmanagerinfo.html#ManagerFeature-enum">ManagerFeature</a></b></div></li> -</ul> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td align="right"><div align="right">Qt Mobility 1.0</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/qcontactmanagerinfo.html b/doc/html/qcontactmanagerinfo.html deleted file mode 100644 index 807e8a4def..0000000000 --- a/doc/html/qcontactmanagerinfo.html +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<!-- qcontactmanagerinfo.cpp --> -<head> - <title>Qt Mobility 1.0: QContactManagerInfo Class Reference</title> - <link href="classic.css" rel="stylesheet" type="text/css" /> -</head> -<body> -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr> -<td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> -<td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> -<td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">QContactManagerInfo Class Reference</h1> -<p>The QContactManagerInfo class provides information about a particular <a href="qcontactmanager.html">QContactManager</a>. <a href="#details">More...</a></p> -<pre> #include <QContactManagerInfo></pre><p><b>This class is deprecated.</b></p> -<ul> -<li><a href="qcontactmanagerinfo-members.html">List of all members, including inherited members</a></li> -</ul> -<hr /> -<a name="public-types"></a> -<h2>Public Types</h2> -<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr><td class="memItemLeft" align="right" valign="top">enum </td><td class="memItemRight" valign="bottom"><b><a href="qcontactmanagerinfo.html#ManagerFeature-enum">ManagerFeature</a></b> { ChangeLogs, ActionPreferences, Groups, Relationships, ..., Anonymous }</td></tr> -</table> -<a name="details"></a> -<hr /> -<h2>Detailed Description</h2> -<p>The QContactManagerInfo class provides information about a particular <a href="qcontactmanager.html">QContactManager</a>.</p> -<p>This class allows managers to report information about their supported functionality to clients. The supported functionality of a manager includes which data types the backend supports, which definitions are natively filterable in the backend (and thus are high performance), and what capabilities the manager supports.</p> -<p>If the manager that provided an information object is subsequently destroyed, the returned QContactManagerInfo object will be invalid.</p> -<p>THIS CLASS IS DEPRECATED AND WILL BE REMOVED IN WEEK 47 - see commit SHA1: 948704fe9b83ef164f0c816897f67ef34654e510</p> -<p>See also <a href="qcontactmanager.html">QContactManager</a>.</p> -<hr /> -<h2>Member Type Documentation</h2> -<h3 class="fn"><a name="ManagerFeature-enum"></a>enum QContactManagerInfo::ManagerFeature</h3> -<p>This enum describes the possible features that a particular manager may support</p> -<p><table class="valuelist" border="1" cellpadding="2" cellspacing="1" width="100%"> -<tr><th width="25%">Constant</th><th width="15%">Value</th><th width="60%">Description</th></tr> -<tr><td valign="top"><tt>QContactManagerInfo::ChangeLogs</tt></td><td align="center" valign="top"><tt>7</tt></td><td valign="top">The manager supports changelog related operations</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::ActionPreferences</tt></td><td align="center" valign="top"><tt>1</tt></td><td valign="top">The manager supports saving preferred details per action per contact</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::Groups</tt></td><td align="center" valign="top"><tt>0</tt></td><td valign="top">The manager supports contacts of the <tt>QContactType::Group</tt> type</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::Relationships</tt></td><td align="center" valign="top"><tt>3</tt></td><td valign="top">The manager supports at least some types of relationships between contacts</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::ArbitraryRelationshipTypes</tt></td><td align="center" valign="top"><tt>4</tt></td><td valign="top">The manager supports relationships of arbitrary types between contacts</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::MutableDefinitions</tt></td><td align="center" valign="top"><tt>2</tt></td><td valign="top">The manager supports saving, updating or removing detail definitions. Some built-in definitions may still be immutable</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::SelfContact</tt></td><td align="center" valign="top"><tt>5</tt></td><td valign="top">The manager supports the concept of saving a contact which represents the current user</td></tr> -<tr><td valign="top"><tt>QContactManagerInfo::Anonymous</tt></td><td align="center" valign="top"><tt>6</tt></td><td valign="top">The manager is isolated from other managers</td></tr> -</table></p> -<p /><address><hr /><div align="center"> -<table width="100%" cellspacing="0" border="0"><tr class="address"> -<td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> -<td align="right"><div align="right">Qt Mobility 1.0</div></td> -</tr></table></div></address></body> -</html> diff --git a/doc/html/qcontactrelationshipfetchrequest.html b/doc/html/qcontactrelationshipfetchrequest.html index 53e412b179..1f26f610f9 100644 --- a/doc/html/qcontactrelationshipfetchrequest.html +++ b/doc/html/qcontactrelationshipfetchrequest.html @@ -59,7 +59,10 @@ <a name="details"></a> <hr /> <h2>Detailed Description</h2> +<p><<<<<<< HEAD:src/contacts/requests/qcontactrelationshipfetchrequest.cpp</p> <p>The QContactRelationshipFetchRequest class allows a client to asynchronously request relationships from a contacts store manager.</p> +<p>======= * *</p> +<p>The QContactRelationshipFetchRequest class allows a client to asynchronously request relationships from a contacts store manager >>>>>>> 1b639d508a550569a5623c10f7774f5bfa503d4a:src/contacts/requests/qcontactrelationshipfetchrequest.cpp</p> <hr /> <h2>Member Function Documentation</h2> <h3 class="fn"><a name="QContactRelationshipFetchRequest"></a>QContactRelationshipFetchRequest::QContactRelationshipFetchRequest ()</h3> diff --git a/doc/html/qgeocoordinate.html b/doc/html/qgeocoordinate.html index 58d4bb69f1..827ac3f257 100644 --- a/doc/html/qgeocoordinate.html +++ b/doc/html/qgeocoordinate.html @@ -48,6 +48,13 @@ <tr><td class="memItemLeft" align="right" valign="top">QGeoCoordinate & </td><td class="memItemRight" valign="bottom"><b><a href="qgeocoordinate.html#operator-eq">operator=</a></b> ( const QGeoCoordinate & <i>other</i> )</td></tr> <tr><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><b><a href="qgeocoordinate.html#operator-eq-eq">operator==</a></b> ( const QGeoCoordinate & <i>other</i> ) const</td></tr> </table> +<hr /> +<a name="related-non-members"></a> +<h2>Related Non-Members</h2> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qgeocoordinate.html#operator-lt-lt-77">operator<<</a></b> ( QDataStream & <i>stream</i>, const QGeoCoordinate & <i>coordinate</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qgeocoordinate.html#operator-gt-gt-72">operator>></a></b> ( QDataStream & <i>stream</i>, QGeoCoordinate & <i>coordinate</i> )</td></tr> +</table> <a name="details"></a> <hr /> <h2>Detailed Description</h2> @@ -148,6 +155,14 @@ <p>Assigns <i>other</i> to this coordinate and returns a reference to this coordinate.</p> <h3 class="fn"><a name="operator-eq-eq"></a>bool QGeoCoordinate::operator== ( const QGeoCoordinate & <i>other</i> ) const</h3> <p>Returns true if the latitude, longitude and altitude of this coordinate are the same as those of <i>other</i>.</p> +<hr /> +<h2>Related Non-Members</h2> +<h3 class="fn"><a name="operator-lt-lt-77"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>stream</i>, const QGeoCoordinate & <i>coordinate</i> )</h3> +<p>Writes the given <i>coordinate</i> to the specified <i>stream</i>.</p> +<p>See also <a href="http://qt.nokia.com/doc/4.5/datastreamformat.html">Format of the QDataStream Operators</a>.</p> +<h3 class="fn"><a name="operator-gt-gt-72"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>stream</i>, QGeoCoordinate & <i>coordinate</i> )</h3> +<p>Reads a coordinate from the specified <i>stream</i> into the given <i>coordinate</i>.</p> +<p>See also <a href="http://qt.nokia.com/doc/4.5/datastreamformat.html">Format of the QDataStream Operators</a>.</p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> diff --git a/doc/html/qgeopositioninfo.html b/doc/html/qgeopositioninfo.html index 46d1fa5fcd..2506149315 100644 --- a/doc/html/qgeopositioninfo.html +++ b/doc/html/qgeopositioninfo.html @@ -44,6 +44,13 @@ <tr><td class="memItemLeft" align="right" valign="top">QGeoPositionInfo & </td><td class="memItemRight" valign="bottom"><b><a href="qgeopositioninfo.html#operator-eq">operator=</a></b> ( const QGeoPositionInfo & <i>other</i> )</td></tr> <tr><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><b><a href="qgeopositioninfo.html#operator-eq-eq">operator==</a></b> ( const QGeoPositionInfo & <i>other</i> ) const</td></tr> </table> +<hr /> +<a name="related-non-members"></a> +<h2>Related Non-Members</h2> +<table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qgeopositioninfo.html#operator-lt-lt-80">operator<<</a></b> ( QDataStream & <i>stream</i>, const QGeoPositionInfo & <i>info</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qgeopositioninfo.html#operator-gt-gt-74">operator>></a></b> ( QDataStream & <i>stream</i>, QGeoPositionInfo & <i>info</i> )</td></tr> +</table> <a name="details"></a> <hr /> <h2>Detailed Description</h2> @@ -109,6 +116,14 @@ <p>Assigns the values from <i>other</i> to this <a href="qgeopositioninfo.html">QGeoPositionInfo</a>.</p> <h3 class="fn"><a name="operator-eq-eq"></a>bool QGeoPositionInfo::operator== ( const QGeoPositionInfo & <i>other</i> ) const</h3> <p>Returns true if all of this object's values are the same as those of <i>other</i>.</p> +<hr /> +<h2>Related Non-Members</h2> +<h3 class="fn"><a name="operator-lt-lt-80"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>stream</i>, const QGeoPositionInfo & <i>info</i> )</h3> +<p>Writes the given <i>info</i> to the specified <i>stream</i>.</p> +<p>See also <a href="http://qt.nokia.com/doc/4.5/datastreamformat.html">Format of the QDataStream Operators</a>.</p> +<h3 class="fn"><a name="operator-gt-gt-74"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>stream</i>, QGeoPositionInfo & <i>info</i> )</h3> +<p>Reads a coordinate from the specified <i>stream</i> into the given <i>info</i>.</p> +<p>See also <a href="http://qt.nokia.com/doc/4.5/datastreamformat.html">Format of the QDataStream Operators</a>.</p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> <td align="left">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td> diff --git a/doc/html/qimagecapturecontrol.html b/doc/html/qimagecapturecontrol.html index 5a4b2a1121..97e8212e40 100644 --- a/doc/html/qimagecapturecontrol.html +++ b/doc/html/qimagecapturecontrol.html @@ -13,7 +13,7 @@ <td align="left" valign="top" width="32"><a href="http://qt.nokia.com/"><img src="images/qtlogo.png" align="left" border="0" /></a></td> <td width="1"> </td><td class="postheader" valign="center"><a href="index.html"><font color="#004faf">Home</font></a> · <a href="classes.html"><font color="#004faf">All Classes</font></a> · <a href="functions.html"><font color="#004faf">All Functions</font></a> ·</td> <td align="right" valign="top" width="230"><img src="images/codeless.png" border="0" /></td></tr></table><h1 class="title">QImageCaptureControl Class Reference</h1> -<p>The QImageCaptureControl provides a control interface for image capture services. <a href="#details">More...</a></p> +<p>The QImageCaptureControl class provides a control interface for image capture services. <a href="#details">More...</a></p> <pre> #include <QImageCaptureControl></pre><p><b>This class is under development and is subject to change.</b></p> <p>Inherits <a href="qmediacontrol.html">QMediaControl</a>.</p> <ul> @@ -67,7 +67,7 @@ <a name="details"></a> <hr /> <h2>Detailed Description</h2> -<p>The QImageCaptureControl provides a control interface for image capture services.</p> +<p>The QImageCaptureControl class provides a control interface for image capture services.</p> <p>The interface name of QImageCaptureControl is <tt>com.nokia.Qt.QImageCaptureControl/1.0</tt> as defined in <a href="qimagecapturecontrol.html#QImageCaptureControl_iid">QImageCaptureControl_iid</a>.</p> <p>See also <a href="qmediaservice.html#control">QMediaService::control</a>().</p> <hr /> diff --git a/doc/html/qservicefilter.html b/doc/html/qservicefilter.html index 65cdd22d39..466ca7ecc0 100644 --- a/doc/html/qservicefilter.html +++ b/doc/html/qservicefilter.html @@ -53,8 +53,8 @@ <a name="related-non-members"></a> <h2>Related Non-Members</h2> <table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qservicefilter.html#operator-lt-lt-79">operator<<</a></b> ( QDataStream & <i>out</i>, const QServiceFilter & <i>sf</i> )</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qservicefilter.html#operator-gt-gt-73">operator>></a></b> ( QDataStream & <i>in</i>, QServiceFilter & <i>sf</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qservicefilter.html#operator-lt-lt-81">operator<<</a></b> ( QDataStream & <i>out</i>, const QServiceFilter & <i>sf</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qservicefilter.html#operator-gt-gt-75">operator>></a></b> ( QDataStream & <i>in</i>, QServiceFilter & <i>sf</i> )</td></tr> </table> <a name="details"></a> <hr /> @@ -139,9 +139,9 @@ <p>Copies the content of the <a href="qservicefilter.html">QServiceFilter</a> object contained in <i>other</i> into this one.</p> <hr /> <h2>Related Non-Members</h2> -<h3 class="fn"><a name="operator-lt-lt-79"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>out</i>, const QServiceFilter & <i>sf</i> )</h3> +<h3 class="fn"><a name="operator-lt-lt-81"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>out</i>, const QServiceFilter & <i>sf</i> )</h3> <p>Writes service filter <i>sf</i> to the stream <i>out</i> and returns a reference to the stream.</p> -<h3 class="fn"><a name="operator-gt-gt-73"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>in</i>, QServiceFilter & <i>sf</i> )</h3> +<h3 class="fn"><a name="operator-gt-gt-75"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>in</i>, QServiceFilter & <i>sf</i> )</h3> <p>Reads a service filter into <i>sf</i> from the stream <i>in</i> and returns a reference to the stream.</p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> diff --git a/doc/html/qserviceinterfacedescriptor.html b/doc/html/qserviceinterfacedescriptor.html index 808f6cd022..5c0329195e 100644 --- a/doc/html/qserviceinterfacedescriptor.html +++ b/doc/html/qserviceinterfacedescriptor.html @@ -47,8 +47,8 @@ <a name="related-non-members"></a> <h2>Related Non-Members</h2> <table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qserviceinterfacedescriptor.html#operator-lt-lt-84">operator<<</a></b> ( QDataStream & <i>out</i>, const QServiceInterfaceDescriptor & <i>dc</i> )</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qserviceinterfacedescriptor.html#operator-gt-gt-78">operator>></a></b> ( QDataStream & <i>in</i>, QServiceInterfaceDescriptor & <i>dc</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qserviceinterfacedescriptor.html#operator-lt-lt-86">operator<<</a></b> ( QDataStream & <i>out</i>, const QServiceInterfaceDescriptor & <i>dc</i> )</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">QDataStream & </td><td class="memItemRight" valign="bottom"><b><a href="qserviceinterfacedescriptor.html#operator-gt-gt-80">operator>></a></b> ( QDataStream & <i>in</i>, QServiceInterfaceDescriptor & <i>dc</i> )</td></tr> </table> <a name="details"></a> <hr /> @@ -108,9 +108,9 @@ <p>Compares a <a href="qserviceinterfacedescriptor.html">QServiceInterfaceDescriptor</a> to <i>other</i>. Returns true if they are equal and false otherwise.</p> <hr /> <h2>Related Non-Members</h2> -<h3 class="fn"><a name="operator-lt-lt-84"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>out</i>, const QServiceInterfaceDescriptor & <i>dc</i> )</h3> +<h3 class="fn"><a name="operator-lt-lt-86"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator<< ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>out</i>, const QServiceInterfaceDescriptor & <i>dc</i> )</h3> <p>Writes service interface descriptor <i>dc</i> to the stream <i>out</i> and returns a reference to the stream.</p> -<h3 class="fn"><a name="operator-gt-gt-78"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>in</i>, QServiceInterfaceDescriptor & <i>dc</i> )</h3> +<h3 class="fn"><a name="operator-gt-gt-80"></a><a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & operator>> ( <a href="http://qt.nokia.com/doc/4.5/qdatastream.html">QDataStream</a> & <i>in</i>, QServiceInterfaceDescriptor & <i>dc</i> )</h3> <p>Reads a service interface descriptor into <i>dc</i> from the stream <i>in</i> and returns a reference to the stream.</p> <p /><address><hr /><div align="center"> <table width="100%" cellspacing="0" border="0"><tr class="address"> diff --git a/doc/html/qt-mobility-library.dcf b/doc/html/qt-mobility-library.dcf index 7951615b57..3b9c0acf0b 100644 --- a/doc/html/qt-mobility-library.dcf +++ b/doc/html/qt-mobility-library.dcf @@ -987,19 +987,6 @@ <keyword ref="qcontactmanagerenginefactory.html#version">version</keyword> <section ref="qcontactmanagerenginefactory-members.html" title="List of all members"/> </section> - <section ref="qcontactmanagerinfo.html" title="QContactManagerInfo Class Reference"> - <keyword ref="qcontactmanagerinfo.html">QContactManagerInfo</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">ManagerFeature</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::Groups</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::ActionPreferences</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::ArbitraryRelationshipTypes</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::SelfContact</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::Relationships</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::Anonymous</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::ChangeLogs</keyword> - <keyword ref="qcontactmanagerinfo.html#ManagerFeature-enum">QContactManagerInfo::MutableDefinitions</keyword> - <section ref="qcontactmanagerinfo-members.html" title="List of all members"/> - </section> <section ref="qcontactmemoryengine.html" title="QContactMemoryEngine Class Reference"> <keyword ref="qcontactmemoryengine.html">QContactMemoryEngine</keyword> <keyword ref="qcontactmemoryengine.html#cancelRequest">cancelRequest</keyword> @@ -1299,6 +1286,17 @@ <keyword ref="qcontacturl.html#SubTypeHomePage-var">SubTypeHomePage</keyword> <section ref="qcontacturl-members.html" title="List of all members"/> </section> + <section ref="qgeoareamonitor.html" title="QGeoAreaMonitor Class Reference"> + <keyword ref="qgeoareamonitor.html">QGeoAreaMonitor</keyword> + <keyword ref="qgeoareamonitor.html#center-prop">center</keyword> + <keyword ref="qgeoareamonitor.html#center-prop">setCenter</keyword> + <keyword ref="qgeoareamonitor.html#radius-prop">radius</keyword> + <keyword ref="qgeoareamonitor.html#radius-prop">setRadius</keyword> + <keyword ref="qgeoareamonitor.html#areaEntered">areaEntered</keyword> + <keyword ref="qgeoareamonitor.html#areaExited">areaExited</keyword> + <keyword ref="qgeoareamonitor.html#createDefaultMonitor">createDefaultMonitor</keyword> + <section ref="qgeoareamonitor-members.html" title="List of all members"/> + </section> <section ref="qgeocoordinate.html" title="QGeoCoordinate Class Reference"> <keyword ref="qgeocoordinate.html">QGeoCoordinate</keyword> <keyword ref="qgeocoordinate.html#CoordinateFormat-enum">CoordinateFormat</keyword> diff --git a/doc/html/qt-mobility-library.index b/doc/html/qt-mobility-library.index index 7cff3496e1..b237aba0b2 100644 --- a/doc/html/qt-mobility-library.index +++ b/doc/html/qt-mobility-library.index @@ -1898,18 +1898,6 @@ <function access="public" threadsafety="unspecified" status="commendable" name="vendorName" fullname="QContactActionDescriptor::vendorName" href="qcontactactiondescriptor.html#vendorName" location="qcontactactiondescriptor.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QString" signature="vendorName() const"/> <function access="public" threadsafety="unspecified" status="commendable" name="implementationVersion" fullname="QContactActionDescriptor::implementationVersion" href="qcontactactiondescriptor.html#implementationVersion" location="qcontactactiondescriptor.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="int" signature="implementationVersion() const"/> </class> - <class access="public" threadsafety="unspecified" status="deprecated" name="QContactManagerInfo" href="qcontactmanagerinfo.html" location="qcontactmanagerinfo.h" bases="" module=""> - <enum access="public" threadsafety="unspecified" status="commendable" name="ManagerFeature" fullname="QContactManagerInfo::ManagerFeature" href="qcontactmanagerinfo.html#ManagerFeature-enum" location="qcontactmanagerinfo.h"> - <value name="Groups" value="0"/> - <value name="ActionPreferences" value="1"/> - <value name="MutableDefinitions" value="2"/> - <value name="Relationships" value="3"/> - <value name="ArbitraryRelationshipTypes" value="4"/> - <value name="SelfContact" value="5"/> - <value name="Anonymous" value="6"/> - <value name="ChangeLogs" value="7"/> - </enum> - </class> <class access="public" threadsafety="unspecified" status="commendable" name="QContactChangeLogFilter" href="qcontactchangelogfilter.html" location="qcontactchangelogfilter.h" bases="QContactFilter" module=""> <enum access="public" threadsafety="unspecified" status="commendable" name="EventType" fullname="QContactChangeLogFilter::EventType" href="qcontactchangelogfilter.html#EventType-enum" location="qcontactchangelogfilter.h"> <value name="EventAdded" value="0"/> @@ -2586,6 +2574,37 @@ <parameter left="QObject *" right="" name="parent" default="0"/> </function> </class> + <class access="public" threadsafety="unspecified" status="commendable" name="QGeoAreaMonitor" href="qgeoareamonitor.html" location="qgeoareamonitor.h" bases="QObject" module=""> + <property access="public" threadsafety="unspecified" status="commendable" name="center" fullname="QGeoAreaMonitor::center" href="qgeoareamonitor.html#center-prop" location="qgeoareamonitor.h" type="QGeoCoordinate"> + <getter name="center"/> + <setter name="setCenter"/> + </property> + <property access="public" threadsafety="unspecified" status="commendable" name="radius" fullname="QGeoAreaMonitor::radius" href="qgeoareamonitor.html#radius-prop" location="qgeoareamonitor.h" type="qreal"> + <getter name="radius"/> + <setter name="setRadius"/> + </property> + <function access="public" threadsafety="unspecified" status="commendable" name="QGeoAreaMonitor" fullname="QGeoAreaMonitor::QGeoAreaMonitor" href="qgeoareamonitor.html#QGeoAreaMonitor" location="qgeoareamonitor.h" virtual="non" meta="constructor" const="false" static="false" overload="false" type="" signature="QGeoAreaMonitor(QObject * parent)"> + <parameter left="QObject *" right="" name="parent" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="~QGeoAreaMonitor" fullname="QGeoAreaMonitor::~QGeoAreaMonitor" href="qgeoareamonitor.html#dtor.QGeoAreaMonitor" location="qgeoareamonitor.h" virtual="pure" meta="destructor" const="false" static="false" overload="false" type="" signature="~QGeoAreaMonitor()"/> + <function access="public" threadsafety="unspecified" status="commendable" name="setCenter" fullname="QGeoAreaMonitor::setCenter" href="qgeoareamonitor.html#center-prop" location="qgeoareamonitor.cpp" virtual="impure" meta="plain" const="false" static="false" overload="false" associated-property="center" type="void" signature="setCenter(const QGeoCoordinate & coordinate)"> + <parameter left="const QGeoCoordinate &" right="" name="coordinate" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="center" fullname="QGeoAreaMonitor::center" href="qgeoareamonitor.html#center-prop" location="qgeoareamonitor.cpp" virtual="non" meta="plain" const="true" static="false" overload="false" associated-property="center" type="QGeoCoordinate" signature="center() const"/> + <function access="public" threadsafety="unspecified" status="commendable" name="setRadius" fullname="QGeoAreaMonitor::setRadius" href="qgeoareamonitor.html#radius-prop" location="qgeoareamonitor.cpp" virtual="impure" meta="plain" const="false" static="false" overload="false" associated-property="radius" type="void" signature="setRadius(qreal radius)"> + <parameter left="qreal" right="" name="radius" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="radius" fullname="QGeoAreaMonitor::radius" href="qgeoareamonitor.html#radius-prop" location="qgeoareamonitor.cpp" virtual="non" meta="plain" const="true" static="false" overload="false" associated-property="radius" type="qreal" signature="radius() const"/> + <function access="public" threadsafety="unspecified" status="commendable" name="createDefaultMonitor" fullname="QGeoAreaMonitor::createDefaultMonitor" href="qgeoareamonitor.html#createDefaultMonitor" location="qgeoareamonitor.h" virtual="non" meta="plain" const="false" static="true" overload="false" type="QGeoAreaMonitor *" signature="createDefaultMonitor(QObject * parent)"> + <parameter left="QObject *" right="" name="parent" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="areaEntered" fullname="QGeoAreaMonitor::areaEntered" href="qgeoareamonitor.html#areaEntered" location="qgeoareamonitor.h" virtual="non" meta="signal" const="false" static="false" overload="false" type="void" signature="areaEntered(const QGeoPositionInfo & update)"> + <parameter left="const QGeoPositionInfo &" right="" name="update" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="areaExited" fullname="QGeoAreaMonitor::areaExited" href="qgeoareamonitor.html#areaExited" location="qgeoareamonitor.h" virtual="non" meta="signal" const="false" static="false" overload="false" type="void" signature="areaExited(const QGeoPositionInfo & update)"> + <parameter left="const QGeoPositionInfo &" right="" name="update" default=""/> + </function> + </class> <class access="public" threadsafety="unspecified" status="preliminary" name="QMediaServiceProviderHint" href="qmediaserviceproviderhint.html" location="qmediaserviceprovider.h" bases="" module=""> <enum access="public" threadsafety="unspecified" status="commendable" name="Type" fullname="QMediaServiceProviderHint::Type" href="qmediaserviceproviderhint.html#Type-enum" location="qmediaserviceprovider.h"> <value name="Null" value="0"/> @@ -4208,6 +4227,14 @@ <parameter left="CoordinateFormat" right="" name="format" default="DegreesMinutesSecondsWithHemisphere"/> </function> </class> + <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qgeocoordinate.html#operator<<-77" location="qgeocoordinate.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="77" relates="QGeoCoordinate" type="QDataStream &" signature="operator<<(QDataStream & stream, const QGeoCoordinate & coordinate)"> + <parameter left="QDataStream &" right="" name="stream" default=""/> + <parameter left="const QGeoCoordinate &" right="" name="coordinate" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qgeocoordinate.html#operator>>-72" location="qgeocoordinate.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="72" relates="QGeoCoordinate" type="QDataStream &" signature="operator>>(QDataStream & stream, QGeoCoordinate & coordinate)"> + <parameter left="QDataStream &" right="" name="stream" default=""/> + <parameter left="QGeoCoordinate &" right="" name="coordinate" default=""/> + </function> <class access="public" threadsafety="unspecified" status="preliminary" name="QMediaPlaylist" href="qmediaplaylist.html" location="qmediaplaylist.h" bases="QObject" module=""> <property access="public" threadsafety="unspecified" status="commendable" name="playbackMode" fullname="QMediaPlaylist::playbackMode" href="qmediaplaylist.html#playbackMode-prop" location="qmediaplaylist.h" type="QMediaPlaylist::PlaybackMode"> <getter name="playbackMode"/> @@ -4487,6 +4514,14 @@ <parameter left="Property" right="" name="property" default=""/> </function> </class> + <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qgeopositioninfo.html#operator<<-80" location="qgeopositioninfo.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="80" relates="QGeoPositionInfo" type="QDataStream &" signature="operator<<(QDataStream & stream, const QGeoPositionInfo & info)"> + <parameter left="QDataStream &" right="" name="stream" default=""/> + <parameter left="const QGeoPositionInfo &" right="" name="info" default=""/> + </function> + <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qgeopositioninfo.html#operator>>-74" location="qgeopositioninfo.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="74" relates="QGeoPositionInfo" type="QDataStream &" signature="operator>>(QDataStream & stream, QGeoPositionInfo & info)"> + <parameter left="QDataStream &" right="" name="stream" default=""/> + <parameter left="QGeoPositionInfo &" right="" name="info" default=""/> + </function> <class access="public" threadsafety="unspecified" status="commendable" name="QContactDetail" href="qcontactdetail.html" location="qcontactdetail.h" bases="" module=""> <function access="public" threadsafety="unspecified" status="commendable" name="QContactDetail" fullname="QContactDetail::QContactDetail" href="qcontactdetail.html#QContactDetail" location="qcontactdetail.h" virtual="non" meta="constructor" const="false" static="false" overload="false" type="" signature="QContactDetail()"/> <function access="public" threadsafety="unspecified" status="commendable" name="QContactDetail" fullname="QContactDetail::QContactDetail" href="qcontactdetail.html#QContactDetail-2" location="qcontactdetail.h" virtual="non" meta="constructor" const="false" static="false" overload="true" overload-number="2" type="" signature="QContactDetail(const QString & thisDefinitionId)"> @@ -5593,11 +5628,11 @@ <function access="public" threadsafety="unspecified" status="commendable" name="capabilities" fullname="QServiceFilter::capabilities" href="qservicefilter.html#capabilities" location="qservicefilter.cpp" virtual="non" meta="plain" const="true" static="false" overload="false" type="QStringList" signature="capabilities() const"/> <function access="public" threadsafety="unspecified" status="commendable" name="capabilityMatchRule" fullname="QServiceFilter::capabilityMatchRule" href="qservicefilter.html#capabilityMatchRule" location="qservicefilter.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="CapabilityMatchRule" signature="capabilityMatchRule() const"/> </class> - <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qservicefilter.html#operator<<-79" location="qservicefilter.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="79" relates="QServiceFilter" type="QDataStream &" signature="operator<<(QDataStream & out, const QServiceFilter & sf)"> + <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qservicefilter.html#operator<<-81" location="qservicefilter.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="81" relates="QServiceFilter" type="QDataStream &" signature="operator<<(QDataStream & out, const QServiceFilter & sf)"> <parameter left="QDataStream &" right="" name="out" default=""/> <parameter left="const QServiceFilter &" right="" name="sf" default=""/> </function> - <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qservicefilter.html#operator>>-73" location="qservicefilter.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="73" relates="QServiceFilter" type="QDataStream &" signature="operator>>(QDataStream & in, QServiceFilter & sf)"> + <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qservicefilter.html#operator>>-75" location="qservicefilter.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="75" relates="QServiceFilter" type="QDataStream &" signature="operator>>(QDataStream & in, QServiceFilter & sf)"> <parameter left="QDataStream &" right="" name="in" default=""/> <parameter left="QServiceFilter &" right="" name="sf" default=""/> </function> @@ -7037,11 +7072,11 @@ </function> <function access="public" threadsafety="unspecified" status="commendable" name="customPropertyKeys" fullname="QServiceInterfaceDescriptor::customPropertyKeys" href="qserviceinterfacedescriptor.html#customPropertyKeys" location="qserviceinterfacedescriptor.cpp" virtual="non" meta="plain" const="true" static="false" overload="false" type="QStringList" signature="customPropertyKeys() const"/> </class> - <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qserviceinterfacedescriptor.html#operator<<-84" location="qserviceinterfacedescriptor.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="84" relates="QServiceInterfaceDescriptor" type="QDataStream &" signature="operator<<(QDataStream & out, const QServiceInterfaceDescriptor & dc)"> + <function access="public" threadsafety="unspecified" status="commendable" name="operator<<" href="qserviceinterfacedescriptor.html#operator<<-86" location="qserviceinterfacedescriptor.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="86" relates="QServiceInterfaceDescriptor" type="QDataStream &" signature="operator<<(QDataStream & out, const QServiceInterfaceDescriptor & dc)"> <parameter left="QDataStream &" right="" name="out" default=""/> <parameter left="const QServiceInterfaceDescriptor &" right="" name="dc" default=""/> </function> - <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qserviceinterfacedescriptor.html#operator>>-78" location="qserviceinterfacedescriptor.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="78" relates="QServiceInterfaceDescriptor" type="QDataStream &" signature="operator>>(QDataStream & in, QServiceInterfaceDescriptor & dc)"> + <function access="public" threadsafety="unspecified" status="commendable" name="operator>>" href="qserviceinterfacedescriptor.html#operator>>-80" location="qserviceinterfacedescriptor.cpp" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="80" relates="QServiceInterfaceDescriptor" type="QDataStream &" signature="operator>>(QDataStream & in, QServiceInterfaceDescriptor & dc)"> <parameter left="QDataStream &" right="" name="in" default=""/> <parameter left="QServiceInterfaceDescriptor &" right="" name="dc" default=""/> </function> diff --git a/doc/html/qtmobility.qhp b/doc/html/qtmobility.qhp index 10852b4cf4..b476f5886e 100644 --- a/doc/html/qtmobility.qhp +++ b/doc/html/qtmobility.qhp @@ -154,7 +154,6 @@ <section ref="qcontactmanagerenginefactory.html" title="QContactManagerEngineFactory Class Reference"> <section ref="qcontactmanagerenginefactory-members.html" title="List of all members"/> </section> - <section ref="qcontactmanagerinfo.html" title="QContactManagerInfo Class Reference"/> <section ref="qcontactmemoryengine.html" title="QContactMemoryEngine Class Reference"> <section ref="qcontactmemoryengine-members.html" title="List of all members"/> </section> @@ -212,6 +211,9 @@ <section ref="qcontacturl.html" title="QContactUrl Class Reference"> <section ref="qcontacturl-members.html" title="List of all members"/> </section> + <section ref="qgeoareamonitor.html" title="QGeoAreaMonitor Class Reference"> + <section ref="qgeoareamonitor-members.html" title="List of all members"/> + </section> <section ref="qgeocoordinate.html" title="QGeoCoordinate Class Reference"> <section ref="qgeocoordinate-members.html" title="List of all members"/> </section> @@ -1406,16 +1408,6 @@ <keyword name="supportedImplementationVersions" id="QContactManagerEngineFactory::supportedImplementationVersions" ref="qcontactmanagerenginefactory.html#supportedImplementationVersions"/> <keyword name="version" id="QContactManagerEngineFactory::version" ref="qcontactmanagerenginefactory.html#version"/> <keyword name="~QContactManagerEngineFactory" id="QContactManagerEngineFactory::~QContactManagerEngineFactory" ref="qcontactmanagerenginefactory.html#dtor.QContactManagerEngineFactory"/> - <keyword name="QContactManagerInfo" id="QContactManagerInfo" ref="qcontactmanagerinfo.html"/> - <keyword name="QContactManagerInfo::ManagerFeature" id="QContactManagerInfo::ManagerFeature" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::Groups" id="QContactManagerInfo::Groups" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::ActionPreferences" id="QContactManagerInfo::ActionPreferences" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::MutableDefinitions" id="QContactManagerInfo::MutableDefinitions" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::Relationships" id="QContactManagerInfo::Relationships" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::ArbitraryRelationshipTypes" id="QContactManagerInfo::ArbitraryRelationshipTypes" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::SelfContact" id="QContactManagerInfo::SelfContact" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::Anonymous" id="QContactManagerInfo::Anonymous" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> - <keyword name="QContactManagerInfo::ChangeLogs" id="QContactManagerInfo::ChangeLogs" ref="qcontactmanagerinfo.html#ManagerFeature-enum"/> <keyword name="QContactMemoryEngine" id="QContactMemoryEngine" ref="qcontactmemoryengine.html"/> <keyword name="cancelRequest" id="QContactMemoryEngine::cancelRequest" ref="qcontactmemoryengine.html#cancelRequest"/> <keyword name="contact" id="QContactMemoryEngine::contact" ref="qcontactmemoryengine.html#contact"/> @@ -1592,6 +1584,15 @@ <keyword name="setUrl" id="QContactUrl::setUrl" ref="qcontacturl.html#setUrl"/> <keyword name="subType" id="QContactUrl::subType" ref="qcontacturl.html#subType"/> <keyword name="url" id="QContactUrl::url" ref="qcontacturl.html#url"/> + <keyword name="QGeoAreaMonitor" id="QGeoAreaMonitor" ref="qgeoareamonitor.html"/> + <keyword name="areaEntered" id="QGeoAreaMonitor::areaEntered" ref="qgeoareamonitor.html#areaEntered"/> + <keyword name="areaExited" id="QGeoAreaMonitor::areaExited" ref="qgeoareamonitor.html#areaExited"/> + <keyword name="center" id="QGeoAreaMonitor::center" ref="qgeoareamonitor.html#center-prop"/> + <keyword name="createDefaultMonitor" id="QGeoAreaMonitor::createDefaultMonitor" ref="qgeoareamonitor.html#createDefaultMonitor"/> + <keyword name="radius" id="QGeoAreaMonitor::radius" ref="qgeoareamonitor.html#radius-prop"/> + <keyword name="setCenter" id="QGeoAreaMonitor::setCenter" ref="qgeoareamonitor.html#center-prop"/> + <keyword name="setRadius" id="QGeoAreaMonitor::setRadius" ref="qgeoareamonitor.html#radius-prop"/> + <keyword name="~QGeoAreaMonitor" id="QGeoAreaMonitor::~QGeoAreaMonitor" ref="qgeoareamonitor.html#dtor.QGeoAreaMonitor"/> <keyword name="QGeoCoordinate" id="QGeoCoordinate" ref="qgeocoordinate.html"/> <keyword name="QGeoCoordinate::CoordinateFormat" id="QGeoCoordinate::CoordinateFormat" ref="qgeocoordinate.html#CoordinateFormat-enum"/> <keyword name="QGeoCoordinate::DecimalDegrees" id="QGeoCoordinate::DecimalDegrees" ref="qgeocoordinate.html#CoordinateFormat-enum"/> @@ -3601,7 +3602,6 @@ <file>qcontactdisplaylabel-members.html</file> <file>qcontactdetailfilter.html</file> <file>qcontactdetaildefinitionfetchrequest-members.html</file> - <file>qcontactmanagerinfo.html</file> <file>qabstractvaluespacelayer.html</file> <file>qmediaserviceprovider-members.html</file> <file>fetchgooglemaps-mapwindow-h.html</file> @@ -3845,6 +3845,7 @@ <file>qcontactrelationshipfetchrequest.html</file> <file>qmediaobject.html</file> <file>filemanagerplugin-filemanagertransfer-cpp.html</file> + <file>qgeoareamonitor-members.html</file> <file>qcontactunionfilter-members.html</file> <file>qmediaplaylistcontrol-members.html</file> <file>qmessageid-members.html</file> @@ -3964,6 +3965,7 @@ <file>cameracapture-cameracapture-cpp.html</file> <file>samplephonebook-finddialog-h.html</file> <file>qcontactphonenumber-members.html</file> + <file>qgeoareamonitor.html</file> <file>qmediaservicesupportedformatsinterface-members.html</file> <file>qvideooutputcontrol.html</file> <file>slideshow-main-cpp.html</file> diff --git a/doc/src/qtmobility.qdocconf b/doc/src/qtmobility.qdocconf index a220290fb0..9b4cdc813c 100644 --- a/doc/src/qtmobility.qdocconf +++ b/doc/src/qtmobility.qdocconf @@ -112,6 +112,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ Q_GUI_EXPORT_STYLE_WINDOWSXP \ Q_INLINE_TEMPLATE \ Q_INVOKABLE \ + Q_LOCATION_EXPORT \ Q_NETWORK_EXPORT \ Q_OPENGL_EXPORT \ Q_OUTOFLINE_TEMPLATE \ diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp index f4735d1e47..d646ef5973 100644 --- a/src/contacts/requests/qcontactrelationshipremoverequest.cpp +++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp @@ -45,17 +45,13 @@ QTM_BEGIN_NAMESPACE /*! -<<<<<<< HEAD:src/contacts/requests/qcontactrelationshipremoverequest.cpp \class QContactRelationshipRemoveRequest - \brief The QContactRelationshipRemoveRequest class allows a client to - asynchronously request that certain relationships be removed from a - contacts store. - + + \brief The QContactRelationshipRemoveRequest class allows a client + to asynchronously request that certain relationships be removed from + a contacts store. + \ingroup contacts-requests -======= - * \class QContactRelationshipRemoveRequest - * \brief The QContactRelationshipRemoveRequest class allows a client to asynchronously request that certain relationships be removed from a contacts store ->>>>>>> 1b639d508a550569a5623c10f7774f5bfa503d4a:src/contacts/requests/qcontactrelationshipremoverequest.cpp */ /*! diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 7d3f329784..5022b25a80 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -48,8 +48,7 @@ QT_BEGIN_HEADER -//QTM_BEGIN_NAMESPACE -namespace QtMobility { +QTM_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoAreaMonitorPrivate; @@ -80,8 +79,7 @@ private: QGeoAreaMonitorPrivate *d; }; -//QTM_END_NAMESPACE -} +QTM_END_NAMESPACE QT_END_HEADER diff --git a/src/multimedia/experimental/qimagecapturecontrol.cpp b/src/multimedia/experimental/qimagecapturecontrol.cpp index 4d5800157f..27aa4723ed 100644 --- a/src/multimedia/experimental/qimagecapturecontrol.cpp +++ b/src/multimedia/experimental/qimagecapturecontrol.cpp @@ -46,7 +46,10 @@ QTM_BEGIN_NAMESPACE /*! \class QImageCaptureControl - \brief The QImageCaptureControl provides a control interface for image capture services. + + \brief The QImageCaptureControl class provides a control interface + for image capture services. + \preliminary The interface name of QImageCaptureControl is \c com.nokia.Qt.QImageCaptureControl/1.0 as |