FCL/sf/mw/hb: comparison src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp

equal deleted inserted replaced

-:4633027730f5
+:e6ad4ef83b23
 mEngine->deleteKeyPress( this );
 }
 //To prevent showing autocompletion part while deleting the characters using backspace key
 mShowTail = false;
 mShowTooltip = false;
-		bool unused = false;
+bool unused = false;
 mEngine->updateCandidates(mBestGuessLocation, unused);
-		//If Input length greater or equal to one then Append the current word to candidate
+//If Input length greater or equal to one then Append the current word to candidate
-		if (!mCandidates->count() && mEngine->inputLength() >= 1) {
+if (!mCandidates->count() && mEngine->inputLength() >= 1) {
-			mCandidates->append(mEngine->currentWord());
+mCandidates->append(mEngine->currentWord());
 }
-		mCanContinuePrediction = true;
+mCanContinuePrediction = true;
-		// update the editor with the new preedit text.
+// update the editor with the new preedit text.
 updateEditor();
 return;
 } else {
 // we come here if their is no data in engine.
 // once the word is committed, we can not bring it back to inline edit.
 // so if the engine does not have any data, we just send backspace event to the editor.
 Q_Q(HbInputPredictionHandler);
 QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
 q->sendAndUpdate(event);
 event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
 q->sendAndUpdate(event);
 return;
 }
 } else {
 if (mCandidates->count() > mBestGuessLocation) {
 int taillength = mCandidates->at(mBestGuessLocation).length() - mEngine->inputLength();
 if (taillength > 0 && mShowTail) {
 // TODO: Color from skin should be used
-				QColor col = HbColorScheme::color("qtc_input_hint_normal");
+QColor col = HbColorScheme::color("qtc_input_hint_normal");
 QBrush brush(col);
 QTextCharFormat gray;
 gray.setForeground(brush);
 if((focusedObject->object())->inherits("QGraphicsWebView") || (focusedObject->object())->inherits("QWebView")) {
 //QGraphicsWebView does not handle partial input length formatting well. Causes crash, a temporary fix provided,
 //This should be treated as a work around till QGraphicsWebView is fixed.
 list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, QInputMethodEvent::TextFormat, gray));
 } else {
 list.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, mEngine->inputLength(), taillength, gray));
 }
-				list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0));
+list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0));
 QInputMethodEvent event(mCandidates->at(mBestGuessLocation), list);
 focusedObject->sendEvent(event);
 } else {
-				list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mBestGuessLocation).length(), 0, 0));
+list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mBestGuessLocation).length(), 0, 0));
 QInputMethodEvent event(mCandidates->at(mBestGuessLocation).left(mEngine->inputLength()), list);
 focusedObject->sendEvent(event);
 }
 if (mShowTooltip && mBestGuessLocation > 0 && mCandidates->at(0).mid(0, mEngine->inputLength()) \
 != mCandidates->at(mBestGuessLocation).mid(0, mEngine->inputLength())) {
 case Qt::Key_Backspace:
 case HbInputButton::ButtonKeyCodeDelete:
 {
 QString currentSelection = focusObject->inputMethodQuery(Qt::ImCurrentSelection).toString();
 if(currentSelection.length()) {
 QKeyEvent event = QKeyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
 q->sendAndUpdate(event);
 event = QKeyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
 q->sendAndUpdate(event);
 } else {
 deleteOneCharacter();
 }
-		}
+}
 ret = true;
 break;
 case HbInputButton::ButtonKeyCodeEnter:
 case HbInputButton::ButtonKeyCodeSpace:
 q->launchSpellQueryDialog();
 } else {
 //The mouse has been clicked on the pre-editing word, launch candidate list
 mInputMethod->launchCandidatePopup(*mCandidates);
 }
 }
 }
 void HbInputPredictionHandlerPrivate::init()
 {
 }
 void HbInputPredictionHandlerPrivate::commit()
 {
 if (mEngine && mEngine->inputLength() > 0 && mCandidates->count() > 0) {
-		// Close exact word pop up in qwerty when the word is committed
+// Close exact word pop up in qwerty when the word is committed
-		if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
+if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
-			mInputMethod->closeExactWordPopup();
+mInputMethod->closeExactWordPopup();
-		}
+}
 QString commitString = getCommitString();
 // need to update the freq information
 mEngine->commit(commitString);
 commit(commitString,false);
 void HbInputPredictionHandlerPrivate::commit(const QString& string, bool addToUsedWordDict, bool isAsync)
 {
 Q_Q(HbInputPredictionHandler);
 // Close exact word pop up in qwerty when the word is committed
-	if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
+if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
-		mInputMethod->closeExactWordPopup();
+mInputMethod->closeExactWordPopup();
-	}
+}
 q->commitAndUpdate(string, 0, 0, isAsync);
 if(mEngine) {
 if(addToUsedWordDict && !string.isEmpty()) {
 */
 void HbInputPredictionHandlerPrivate::commit(QInputMethodEvent & event,bool addToUsedWordDict)
 {
 Q_Q(HbInputPredictionHandler);
-	// Close exact word pop up in qwerty when the word is committed
+// Close exact word pop up in qwerty when the word is committed
-	if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
+if(HbInputUtils::isQwertyKeyboard(mInputMethod->inputState().keyboard())) {
-		mInputMethod->closeExactWordPopup();
+mInputMethod->closeExactWordPopup();
-	}
+}
 q->sendAndUpdate(event);
 if(mEngine) {
 if(addToUsedWordDict && !event.commitString().isEmpty())
 }
 //Temporarily delete the key press
 mEngine->deleteKeyPress();
 mEngine->updateCandidates(mBestGuessLocation, isCustomWord);
 if (mCandidates->count()){
-			(*mCandidates)[mBestGuessLocation] = (*mCandidates)[mBestGuessLocation].left(mEngine->inputLength());
+(*mCandidates)[mBestGuessLocation] = (*mCandidates)[mBestGuessLocation].left(mEngine->inputLength());
 (*mCandidates)[mBestGuessLocation].append("?");
 } else {
 //Should the mBestGuessLocation not be zero.
 mBestGuessLocation = 0;
 mCandidates->append(mEngine->currentWord());
 void HbInputPredictionHandlerPrivate::setPreEditTextToEditor(QString string, bool showAutocompletionPart)
 {
 //update the editor with pre-edit text
 mEngine->setWord(string);
 bool used = false;
 mEngine->updateCandidates(mBestGuessLocation, used);
 if(showAutocompletionPart && mShowTail) {
 mShowTail = true;
 } else {
 mShowTail =  false;
 this SLOT is called when a character in sct is selected.
 */
 void HbInputPredictionHandler::sctCharacterSelected(QString character)
 {
 Q_D(HbInputPredictionHandler);
-	//d->mShowTail = false;
+//d->mShowTail = false;
 d->commit();
 HbInputModeHandler::sctCharacterSelected(character);
 }
 void HbInputPredictionHandler::smileySelected(QString smiley)
 newFocusObject->setFocus();
 HbAbstractEdit *abstractEdit = qobject_cast<HbAbstractEdit*>(savedFocusObject);
 if(abstractEdit) {
 abstractEdit->setCursorPosition(abstractEdit->cursorPosition());
 }
-	HbInputMethod::activeInputMethod()->setFocusObject(newFocusObject);
+HbInputMethod::activeInputMethod()->setFocusObject(newFocusObject);
 if (closeReason == HbInputSpellQuery::HbOkPressed) {
 d->commit(string,true);
 } else if(closeReason == HbInputSpellQuery::HbCancelPressed) {
 //update the editor with pre-edit text

changeset 23	e6ad4ef83b23
parent 21	4633027730f5
child 28	b7da29130b0e