FCL/sf/mw/hb: comparison src/hbinput/inputwidgets/hbinputcandidatelist.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbinputcandidatelist.h"
 #include <QLabel>
 #include <QGraphicsLayout>
 #include <hblistwidget.h>
 #include <hblistwidgetitem.h>
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinputvkbhost.h>
 #include <hbinputregioncollector_p.h>
-#include "hbinputcandidatelist.h"
 #include "hbdialog_p.h"
 const int HbCandListDefaultNumRows = 5;
 const qreal HbCandListMaxWidthMultiplier = 0.8;
 const qreal HbCandListMinWidth = 30.0;
 /// @cond
 class HbCandidateListPrivate : public HbDialogPrivate
 {
 Q_DECLARE_PUBLIC(HbCandidateList)
 public:
-HbCandidateListPrivate(HbInputMethod* input);
+HbCandidateListPrivate(HbInputMethod *input);
 ~HbCandidateListPrivate();
 void calculateAndSetSize(qreal maxWidth);
 void initFrameIcon();
 public:
-HbListWidget* mList;
+HbListWidget *mList;
-HbInputMethod* mInput;
+HbInputMethod *mInput;
 int numRows;
 int numCandidates;
 int longestStringWidth;
 HbFrameItem *mFrameBackground;
-HbListWidgetItem* mSpellQueryItem;
+HbListWidgetItem *mSpellQueryItem;
 bool mCandidateCommitted;
 bool mSpellQueryOpenIsPending;
 };
-HbCandidateListPrivate::HbCandidateListPrivate(HbInputMethod* input)
+HbCandidateListPrivate::HbCandidateListPrivate(HbInputMethod *input)
 : mInput(input),
 numRows(HbCandListDefaultNumRows),
 numCandidates(0),
 longestStringWidth(0),
 mFrameBackground(0),
 void HbCandidateListPrivate::initFrameIcon()
 {
 Q_Q(HbCandidateList);
-mFrameBackground = static_cast<HbFrameItem*>( q->primitive( HbStyle::P_Popup_background ));
+mFrameBackground = static_cast<HbFrameItem *>(q->primitive(HbStyle::P_Popup_background));
-if( mFrameBackground == 0 ) {
+if (mFrameBackground == 0) {
-mFrameBackground = static_cast<HbFrameItem*>( q->style()->createPrimitive(( HbStyle::Primitive )( HbStyle::P_Popup_background ), q ));
+mFrameBackground = static_cast<HbFrameItem *>(q->style()->createPrimitive((HbStyle::Primitive)(HbStyle::P_Popup_background), q));
 }
 }
 void HbCandidateListPrivate::calculateAndSetSize(qreal maxWidth)
 }
 finalWidth = finalWidth + l + r ;
 finalHeight = (qreal)numLines * oneLineHeight + 5.0 + t + b;
-if(mSpellQueryItem) {
+if (mSpellQueryItem) {
 finalHeight += oneLineHeight ; // for spell button
 }
-if(finalHeight > HbDeviceProfile::current().logicalSize().height() - 30) {
+if (finalHeight > HbDeviceProfile::current().logicalSize().height() - 30) {
 finalHeight = HbDeviceProfile::current().logicalSize().height() - 30;
 }
 geom.setHeight(finalHeight);
 geom.setWidth(finalWidth);
 /*!
 Constructor.
 @param input The input method that uses this widget.
 @param parent parent of the widget.
 */
-HbCandidateList::HbCandidateList(HbInputMethod* input, QGraphicsItem* parent)
+HbCandidateList::HbCandidateList(HbInputMethod *input, QGraphicsItem *parent)
 : HbDialog(*new HbCandidateListPrivate(input), parent)
 {
 Q_D(HbCandidateList);
 HbInputRegionCollector::instance()->attach(this);
 setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
 setTimeout(NoTimeout);
 setAttribute(Qt::WA_InputMethodEnabled, false);
-connect(d->mList, SIGNAL(activated(HbListWidgetItem*)), this, SLOT(itemActivated(HbListWidgetItem*)));
+connect(d->mList, SIGNAL(activated(HbListWidgetItem *)), this, SLOT(itemActivated(HbListWidgetItem *)));
-connect(d->mList, SIGNAL(longPressed(HbListWidgetItem*, const QPointF&)), this, SLOT(itemActivated(HbListWidgetItem*)));
+connect(d->mList, SIGNAL(longPressed(HbListWidgetItem *, const QPointF &)), this, SLOT(itemActivated(HbListWidgetItem *)));
 setBackgroundFaded(false);
 }
 /*!
 {
 }
 /*!
 Populates the candidate list with text strings given as parameter.
+*/
-@param
+void HbCandidateList::populateList(const QStringList &candidates, bool addSpellQuery)
-*/
-void HbCandidateList::populateList(const QStringList& candidates,bool addSpellQuery)
 {
 Q_D(HbCandidateList);
 setContentWidget(d->mList);
 d->mList->clear();
 int longestwidth = 0;
 int finalWidth = 250;
 for (int i = 0; i < candidates.count(); i++) {
-HbListWidgetItem* item = new HbListWidgetItem();
+HbListWidgetItem *item = new HbListWidgetItem();
 item->setText(candidates[i]);
 d->mList->addItem(item);
 // TODO: Font has not been set corretly yet...
 QFontMetrics fontMetrics(d->mList->fontSpec().font());
 finalWidth = fontMetrics.width(candidates[i]);
 if (finalWidth > longestwidth) {
 longestwidth = finalWidth;
 }
 }
 d->mSpellQueryItem = 0;
-if(addSpellQuery) {
+if (addSpellQuery) {
 d->mSpellQueryItem = new HbListWidgetItem();
 d->mSpellQueryItem->setText(tr("Spell"));
 d->mList->addItem(d->mSpellQueryItem);
 QFontMetrics fontMetrics(d->mList->fontSpec().font());
 finalWidth = fontMetrics.width(tr("Spell"));
 }
 /*!
 Inherited from HbDialog.
 */
-void HbCandidateList::keyPressEvent(QKeyEvent* event)
+void HbCandidateList::keyPressEvent(QKeyEvent *event)
 {
 Q_D(HbCandidateList);
 if (event->key() == Qt::Key_Space
 || event->key() == Qt::Key_Enter
 */
 void HbCandidateList::itemActivated(HbListWidgetItem *item)
 {
 Q_D(HbCandidateList);
 if (!d->mCandidateCommitted)  {
-if(d->mSpellQueryItem != item) {
+if (d->mSpellQueryItem != item) {
 emit candidateSelected(0, currentCandidate());
-} else if(d->mSpellQueryItem){
+} else if (d->mSpellQueryItem) {
 d->mSpellQueryOpenIsPending = true;
 }
 d->mCandidateCommitted = true;
 }
 hide();
 Returns the currently selected candidate on the list.
 */
 QString HbCandidateList::currentCandidate()
 {
 Q_D(HbCandidateList);
-return d->mList->currentItem()->text();
+if (d->mList->currentItem()) {
+return d->mList->currentItem()->text();
+}
+return QString();
 }
 /*!
 Sets the maximum number of visible candidates.
 */
 }
 /*!
 this event handler is called, for Hide events, is delivered after the widget has been hidden.
 */
-void HbCandidateList::hideEvent(QHideEvent * event)
+void HbCandidateList::hideEvent(QHideEvent *event)
 {
-	Q_D(HbCandidateList);
+Q_D(HbCandidateList);
-	d->mCandidateCommitted = false;
+d->mCandidateCommitted = false;
 HbDialog::hideEvent(event);
 // If we try to open spell query in itemActivated, first spell query tries to
 // open, and then candidatel list is closed. This creates problems if we
 // quickly double click on the Spell button. So open spell query only after candidate
 // list is closed.
-if(d->mSpellQueryOpenIsPending) {
+if (d->mSpellQueryOpenIsPending) {
 d->mSpellQueryOpenIsPending = false;
 emit launchSpellQueryDialog();
 }
 }
 resize(topRect.width(), topRect.height());
 setPos(topRect.topLeft());
 return true;
 }
 } else {
 if (bottomRect.height() > HbAutoComplPopupMinAllowedHeight) {
 qreal finalHeight = (size().height() < bottomRect.height() ? size().height() : bottomRect.height());
 bottomRect.setHeight(finalHeight);
 resize(bottomRect.width(), bottomRect.height());
 setPos(bottomRect.topLeft());
 return true;

changeset 6	c3690ec91ef8
parent 5	627c4a0fd0e7
child 7	923ff622b8b9