--- a/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Wed Jun 23 18:33:25 2010 +0300
@@ -22,6 +22,8 @@
** Nokia at developer.feedback@nokia.com.
**
****************************************************************************/
+#include "hbinputscreenshotwidget.h"
+
#include <QPixmap>
#include <QPainter>
@@ -30,11 +32,8 @@
#include <hbinputregioncollector_p.h>
#include "hbframedrawerpool_p.h"
-
-#include "hbinputscreenshotwidget.h"
#include "hbinputvkbwidget.h"
-
/*!
@proto
@hbinput
@@ -66,7 +65,7 @@
};
HbInputScreenshotWidgetPrivate::HbInputScreenshotWidgetPrivate()
- : mIconDrawer(0), mCloseHandleHeight(0), mCloseHandleWidth(0)
+ : mIconDrawer(0), mCloseHandleHeight(0), mCloseHandleWidth(0)
{
}
@@ -81,31 +80,30 @@
/*!
Costructs the object.
*/
-HbInputScreenshotWidget::HbInputScreenshotWidget(QGraphicsItem* parent)
+HbInputScreenshotWidget::HbInputScreenshotWidget(QGraphicsItem *parent)
: HbWidget(*new HbInputScreenshotWidgetPrivate, parent)
{
Q_D(HbInputScreenshotWidget);
d->q_ptr = this;
HbInputRegionCollector::instance()->attach(this);
- setPos(QPointF(0,0));
+ setPos(QPointF(0, 0));
#ifdef HB_EFFECTS
HbEffect::disable(this);
#endif // HB_EFFECTS
-#if QT_VERSION >= 0x040600
// Make sure the keypad never steals focus.
setFlag(QGraphicsItem::ItemIsPanel, true);
setActive(false);
-#endif
+ setFlag(QGraphicsItem::ItemHasNoContents, false);
}
/*!
Destructs the object.
*/
HbInputScreenshotWidget::~HbInputScreenshotWidget()
-{
+{
}
void HbInputScreenshotWidget::setScreenshot(QPixmap &pixmap)
@@ -127,7 +125,7 @@
/*!
handles mouse press event.
*/
-void HbInputScreenshotWidget::mousePressEvent(QGraphicsSceneMouseEvent* event)
+void HbInputScreenshotWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(event);
}
@@ -135,7 +133,7 @@
/*!
Handles mouse release event.
*/
-void HbInputScreenshotWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+void HbInputScreenshotWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(event);
}
@@ -143,13 +141,13 @@
/*!
The paint method. Draws the widget.
*/
-void HbInputScreenshotWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
+void HbInputScreenshotWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
Q_UNUSED(option);
Q_UNUSED(widget);
Q_D(HbInputScreenshotWidget);
- if (!d->mPixmap.isNull()){
+ if (!d->mPixmap.isNull()) {
QRectF rect = boundingRect();
painter->save();
@@ -161,7 +159,7 @@
painter->save();
painter->translate(0, d->mCloseHandleHeight);
- painter->drawPixmap(0, 0, d->mPixmap);
+ painter->drawPixmap(0, 0, d->mPixmap);
painter->restore();
}
}