diff -r b7b49303d0c0 -r 762d760dcfdf qtms/src/qtmsringtoneimpl.cpp --- a/qtms/src/qtmsringtoneimpl.cpp Fri Jul 23 17:48:16 2010 -0500 +++ b/qtms/src/qtmsringtoneimpl.cpp Fri Aug 06 17:13:32 2010 -0500 @@ -24,63 +24,57 @@ using namespace TMS; QTMSRingToneImpl::QTMSRingToneImpl() - { - } +{ +} QTMSRingToneImpl::~QTMSRingToneImpl() - { +{ RemoveObserver(*this); - } +} gint QTMSRingToneImpl::Create(QTMSRingTone*& qrt, TMS::TMSRingTone*& tmsrt) - { +{ gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY); QTMSRingToneImpl* self = new QTMSRingToneImpl(); - if (self) - { + if (self) { ret = self->PostConstruct(); - if (ret != QTMS_RESULT_SUCCESS) - { + if (ret != QTMS_RESULT_SUCCESS) { delete self; self = NULL; - } + } self->iRingTone = tmsrt; ret = self->AddObserver(*self, NULL); - } + } qrt = self; return ret; - } +} gint QTMSRingToneImpl::PostConstruct() - { +{ gint ret(QTMS_RESULT_SUCCESS); return ret; - } +} -gint QTMSRingToneImpl::AddObserver(TMS::TMSRingToneObserver& obsrvr, - gpointer user_data) - { +gint QTMSRingToneImpl::AddObserver(TMS::TMSRingToneObserver& obsrvr, gpointer user_data) +{ gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT); - if (iRingTone) - { + if (iRingTone) { ret = iRingTone->AddObserver(obsrvr, user_data); - } + } return ret; - } +} gint QTMSRingToneImpl::RemoveObserver(TMS::TMSRingToneObserver& obsrvr) - { +{ gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT); - if (iRingTone) - { + if (iRingTone) { ret = iRingTone->RemoveObserver(obsrvr); - } + } return ret; - } +} -void QTMSRingToneImpl::RingtoneEvent(const TMS::TMSRingTone& /*rt*/, - TMS::TMSSignalEvent event) - { +void QTMSRingToneImpl::RingtoneEvent(const TMS::TMSRingTone& /*rt*/, TMS::TMSSignalEvent event) +{ QTMSSignalEvent qevent; qevent.type = event.type; qevent.reason = event.reason; @@ -89,8 +83,7 @@ qevent.event_data = event.event_data; qevent.user_data = event.user_data; - emit QTMS::QTMSRingTone::RingtoneEvent(static_cast (*this), - qevent); - } + emit QTMS::QTMSRingTone::RingtoneEvent(static_cast (*this), qevent); +} // End of file