diff -r 453da2cfceef -r 71781823f776 qtmobility/src/messaging/qmessageid_symbian.cpp --- a/qtmobility/src/messaging/qmessageid_symbian.cpp Fri May 14 16:41:33 2010 +0300 +++ b/qtmobility/src/messaging/qmessageid_symbian.cpp Thu May 27 13:42:11 2010 +0300 @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmessageid.h" #include - +#include QTM_BEGIN_NAMESPACE @@ -81,9 +81,9 @@ if (!d_ptr) d_ptr = new QMessageIdPrivate; - + d_ptr->_id = other.d_ptr->_id; - + return *this; } @@ -91,10 +91,10 @@ { if (!other.d_ptr && !d_ptr) return true; - + if (!other.d_ptr || !d_ptr) return false; - + return (d_ptr->_id == other.d_ptr->_id); } @@ -103,12 +103,12 @@ long left = 0; long right = 0; if (d_ptr) { - left = d_ptr->_id.toLong(); + left = SymbianHelpers::stripIdPrefix(d_ptr->_id).toLong(); } if (other.d_ptr) { - right = other.d_ptr->_id.toLong(); + right = SymbianHelpers::stripIdPrefix(other.d_ptr->_id).toLong(); } - + return (left < right); }