--- a/src/hbcore/image/hbicon.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbcore/image/hbicon.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -397,19 +397,25 @@
     d = new HbIconPrivate(iconName);
 }
 
-/*! Constructs a new icon to be a copy of the given QIcon.
-* Due to the limitations listed below, this constructor should be used only for
-* compatibility reasons if a QIcon instance needs to be passed as a parameter
-* to a method taking a HbIcon parameter.
-* \note If this constructor is used, there are the following limitations in the HbIcon methods.
-* - HbIcon::defaultSize() may return QSizeF().
-* - HbIcon::paint() ignores the parameter aspectRatioMode and converts the given QRectF to QRect.
-* - HbIcon::iconName() returns empty string by default.
-* - HbIcon::pixmap() returns null pixmap.
-* - Colorization and mirroring support are not available.
-* This method should only be used if absolute necessary, as this is not ideal for hardware accelerated environment
-* and there may be huge differences in painting performance when compared to a native HbIcon.
-*/
+/*!
+ * Constructs a new icon to be a copy of the given QIcon.  Due to the
+ * limitations listed below, this constructor should be used only for
+ * compatibility reasons if a QIcon instance needs to be passed as a parameter
+ * to a method taking a HbIcon parameter.
+ *
+ * \note If this constructor is used, the following limitations apply:
+ *
+ * - HbIcon::defaultSize() may return QSizeF().
+ * - HbIcon::paint() ignores the parameter aspectRatioMode and converts the given QRectF to QRect.
+ * - HbIcon::iconName() returns empty string by default.
+ * - HbIcon::pixmap() returns null pixmap.
+ * - Colorization and mirroring support are not available.
+ *
+ * This method should only be used if absolute necessary, as this is not ideal
+ * for hardware accelerated environment and there may be huge differences in
+ * painting performance when compared to a native HbIcon.  Some advanced resource
+ * management features are not available for such icons either.
+ */
 HbIcon::HbIcon(const QIcon &icon)
 {
     d = new HbIconPrivate(icon);
@@ -518,9 +524,6 @@
 * However it is possible to override this theme-specific color with a custom one
 * by calling this function.
 *
-* \warning Currently this method makes use of pixmap() routine in case of NVG icons.
-* pixmap() slows down the hardware accelerated rendering.
-*
 * \sa HbIcon::color(), HbIcon::Colorized
 */
 void HbIcon::setColor(const QColor &color)
@@ -684,7 +687,7 @@
 */
 QSizeF HbIcon::size() const
 {
-    if ((static_cast<int>(flags()) & HbIcon::ResolutionCorrected)) {
+    if (flags().testFlag(HbIcon::ResolutionCorrected)) {
         if (d->engine) {
             d->size = d->engine->size();
         }