FCL/sf/mw/qtextensions: comparison qtmobility/src/systeminfo/qsysteminfo.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 \value UndefinedStatus        There is no network device, or error.
 \value NoNetworkAvailable     There is no network available.
 \value EmergencyOnly          Emergency calls only.
 \value Searching              Searching for or connecting with the network.
 \value Busy                   Network is busy.
-\value Connected              Connected to newtwork.
+\value Connected              Connected to network.
 \value HomeNetwork            On Home Network.
 \value Denied                 Network access denied.
 \value Roaming                On Roaming network.
 */
 }
 /*!
 \property QSystemNetworkInfo::cellId
 \brief The devices Cell ID
-Returns the Cell ID of the connected tower or based station.
+Returns the Cell ID of the connected tower or based station, or 0 if not connected.
 */
 int QSystemNetworkInfo::cellId()
 {
 return netInfoPrivate()->cellId();
 }
 /*!
 \property QSystemNetworkInfo::locationAreaCode
 \brief The LAC.
-Returns the Location Area Code. In the case of none such as a Desktop, an empty string.
+Returns the Location Area Code. In the case of a Desktop computer, 0 is returned.
 */
 int QSystemNetworkInfo::locationAreaCode()
 {
 return netInfoPrivate()->locationAreaCode();
 }
 /*!
 \property QSystemNetworkInfo::currentMobileCountryCode
 \brief The current MCC.
-Returns the current Mobile Country Code. In the case of none such as a Desktop, an empty string.
+Returns the current Mobile Country Code. In the case of a Desktop computer, an empty string is returned.
-/*/
+*/
 QString QSystemNetworkInfo::currentMobileCountryCode()
 {
 return netInfoPrivate()->currentMobileCountryCode();
 }
 /*!
 \property QSystemNetworkInfo::currentMobileNetworkCode
 \brief The current MNC.
-Returns the current Mobile Network Code. In the case of none such as a Desktop, an empty string.
+Returns the current Mobile Network Code. In the case of a Desktop computer, an empty string is returned.
 */
 QString QSystemNetworkInfo::currentMobileNetworkCode()
 {
 return netInfoPrivate()->currentMobileNetworkCode();
 }
 /*!
 \property QSystemNetworkInfo::homeMobileCountryCode
 \brief The home MNC.
-Returns the home Mobile Country Code. In the case of none such as a Desktop, an empty string.
+Returns the home Mobile Country Code. In the case of a Desktop computer, an empty string is returned.
 */
 QString QSystemNetworkInfo::homeMobileCountryCode()
 {
 return netInfoPrivate()->homeMobileCountryCode();
 }
 /*!
 \property QSystemNetworkInfo::homeMobileNetworkCode
 \brief The home MCC.
-Returns the home Mobile Network Code. In the case of none such as a Desktop, an empty string.
+Returns the home Mobile Network Code. In the case of a Desktop computer, an empty string is returned.
 Note: Some platforms don't support retrieving this info. In this case the Network Code is
 returned only when the device is registered on home network.
 */
 QString QSystemNetworkInfo::homeMobileNetworkCode()
 {
 {
 return netInfoPrivate()->macAddress(mode);
 }
 /*!
-Returns the first found QNetworkInterface for type \a mode.
+Returns the first found QNetworkInterface for type \a mode, or an invalid QNetworkInterface, if none is found.
 */
 QNetworkInterface QSystemNetworkInfo::interfaceForMode(QSystemNetworkInfo::NetworkMode mode)
 {
 return netInfoPrivate()->interfaceForMode(mode);
 }
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 if (QLatin1String(signal) == QLatin1String(QMetaObject::normalizedSignature(SIGNAL(
 networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int))))) {
 netInfoPrivate()->setWlanSignalStrengthCheckEnabled(true);
 }
+#else
+Q_UNUSED(signal)
 #endif
 }
 /*!
 \internal
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 if (QLatin1String(signal) == QLatin1String(QMetaObject::normalizedSignature(SIGNAL(
 networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int))))) {
 netInfoPrivate()->setWlanSignalStrengthCheckEnabled(false);
 }
+#else
+Q_UNUSED(signal)
 #endif
 }
 // display
 /*!
 {
 return displayInfoPrivate()->displayBrightness(screenNumber);
 }
 /*!
-Returns the color depth of the screen with the index \a screenNumber, in bits per pixel.
+Returns the color depth of the screen with the index \a screenNumber, in bits per pixel, or 0 if the screen is not found.
 \sa QDesktopWidget::screenCount()
 */
 int QSystemDisplayInfo::colorDepth(int screenNumber)
 {
 /*!
 \property QSystemStorageInfo::logicalDrives
 \brief The logical drives.
-Returns a QStringList of volumes or partitions.
+Returns a QStringList of volumes or partitions, or an empty list if no drives are found.
 */
 QStringList QSystemStorageInfo::logicalDrives()
 {
 return storageInfoPrivate()->logicalDrives();
 }
 /*!
 \property QSystemDeviceInfo::productName
 \brief The product name.
-Returns the product name of the device. In the case where no product information is available,
+Returns the product name of the device. In the case where no product information is available, an empty string will be returned.
 */
 QString QSystemDeviceInfo::productName()
 {
 return deviceInfoPrivate()->productName();
 /////
 /*!
 Constructs a QSystemScreenSaver object with the given \a parent.
-On platforms where there is no one default screensaver mechanism, such as Linux, this class
+On platforms where there is no default screensaver mechanism, such as Linux, this class
 may not be available.
 */
 QSystemScreenSaver::QSystemScreenSaver(QObject *parent)
 : QObject(parent)
 }
 /*!
 Temporarily inhibits the screensaver.
-Will be reverted upon destruction of the QSystemScreenSaver object.
+The screensaver will be set to a non inhibited state only when this QSystemScreenSaver object gets destroyed.
-Returns true on success, otherwise false.
+This is a non blocking function that will return true if the inhibit procedure was successful, otherwise false.
 On platforms that support it, if screensaver is secure by policy, the policy will be honored
 and this will fail.
 */
 bool QSystemScreenSaver::setScreenSaverInhibit()

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411