--- a/src/hbcore/image/hbbadgeiconinfo.cpp Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbbadgeiconinfo.cpp Tue Jul 06 14:36:53 2010 +0300
@@ -28,19 +28,15 @@
#include "hbbadgeicon_p.h"
#include <QPainter>
#include <QDebug>
+#include <QPointF>
HbBadgeIconInfo::HbBadgeIconInfo(const HbIcon &badge,
Qt::Alignment alignment,
- int zValue): mIcon(badge), mAlignment(alignment), mZValue(zValue)
-{
-}
-
-HbBadgeIconInfo::HbBadgeIconInfo(const HbBadgeIconInfo &other)
-{
- *this = other;
-}
-
-HbBadgeIconInfo::~HbBadgeIconInfo()
+ int zValue,
+ const QSizeF &sizeFactor,
+ Qt::AspectRatioMode aspectRatio)
+ : mIcon(badge), mAlignment(alignment), mZValue(zValue),
+ mSizeFactor(sizeFactor), mAspectRatio(aspectRatio)
{
}
@@ -61,32 +57,27 @@
return false;
}
-HbIcon HbBadgeIconInfo::icon() const
-{
- return mIcon;
-}
-
void HbBadgeIconInfo::setIcon(const HbIcon &icon)
{
mIcon = icon;
}
-int HbBadgeIconInfo::zValue() const
-{
- return mZValue;
-}
-
void HbBadgeIconInfo::setZValue(int zValue)
{
mZValue = zValue;
}
-Qt::Alignment HbBadgeIconInfo::alignment() const
-{
- return mAlignment;
-}
-
void HbBadgeIconInfo::setAlignment(Qt::Alignment align)
{
mAlignment = align;
}
+
+void HbBadgeIconInfo::setSizeFactor(const QSizeF &sizeFactor)
+{
+ mSizeFactor = sizeFactor;
+}
+
+void HbBadgeIconInfo::setAspectRatio(Qt::AspectRatioMode aspectRatio)
+{
+ mAspectRatio = aspectRatio;
+}