--- a/messagingapp/msgui/conversationview/src/msgeditorwidget.cpp Wed Jun 23 18:09:17 2010 +0300
+++ b/messagingapp/msgui/conversationview/src/msgeditorwidget.cpp Tue Jul 06 14:12:40 2010 +0300
@@ -46,8 +46,6 @@
const QString SEND_BUTTON_DISABLED("qtg_fr_input_btn_function_disabled");
#define LOC_SMS_CHAR_LIMIT_REACHED hbTrId("txt_messaging_dialog_sms_character_count_exceeded")
-#define LOC_DIALOG_OK hbTrId("txt_common_button_ok")
-#define LOC_BUTTON_CANCEL hbTrId("txt_common_button_cancel")
#define LOC_HINT_TEXT hbTrId("txt_messaging_formlabel_enter_message_here")
@@ -255,9 +253,8 @@
mSmsCharLimitReached = false;
HbMessageBox::question(LOC_SMS_CHAR_LIMIT_REACHED,
- this,SLOT(onSmsCharLimitReached(HbAction*)),
- LOC_DIALOG_OK,
- LOC_BUTTON_CANCEL);
+ this,SLOT(onSmsCharLimitReached(HbAction*)),
+ HbMessageBox::Ok | HbMessageBox::Cancel);
}
@@ -360,7 +357,6 @@
MsgEditor::MsgEditor(QGraphicsItem *parent)
:HbLineEdit(parent)
{
- this->setSmileysEnabled(true);
this->setPlaceholderText(LOC_HINT_TEXT);
}