FCL/sf/app/organizer: comparison clock/clockmw/clockalarms/src/alarmclient.cpp

equal deleted inserted replaced

-:fd30d51f876b
+:b6db4fd4947b
 *
 */
 // System includes
 #include <e32cmn.h>
-#include <QDebug>
 // User includes
 #include "alarmclient.h"
 #include "alarmlistener.h"
 /*!
 	Default constructor.
 */
 AlarmClient::AlarmClient(QObject* parent)
 :QObject(parent),
 mListener(0)
 {
-	qDebug("clock: AlarmClient::AlarmClient() -->");
 	// Connect to the alarm server.
 	User::LeaveIfError(mAlarmSrvSession.Connect());
-	qDebug("clock: AlarmClient::AlarmClient() - Connection done, looks ok.");
 	// Construct the listener, but do not start it.
 	mListener = new AlarmListener(this, mAlarmSrvSession);
-	qDebug("clock: AlarmClient::AlarmClient() <--");
 }
 /*!
 	Destructor.
 */
 AlarmClient::~AlarmClient()
 {
-	qDebug("clock: AlarmClient::~AlarmClient() -->");
 	if (mListener) {
 		mListener->stop();
 		delete mListener;
 		mListener = 0;
 	}
 	mAlarmSrvSession.Close();
-	qDebug("clock: AlarmClient::~AlarmClient() <--");
 }
 /*!
 	Returns the list of alarms currently set on the phone.
 	\param alarmList Reference to a list of alarms.
 */
 void AlarmClient::getAlarmList(QList<AlarmInfo>& alarmList)
 {
-	qDebug() << "clock: AlarmClient::getAlarmList -->";
 	// This will hold the alarm ids returned from alarm server.
 	RArray<TAlarmId> alarmIdArray;
 	AlarmInfo alarmInfo;
 	TASShdAlarm tempSharedAlarm;
 			alarmList.append(alarmInfo);
 		}
 	}
 	// Cleanup.
 	alarmIdArray.Close();
-	qDebug() << "clock: AlarmClient::getAlarmList <--";
 }
 /*!
 	Sets a new alarm with the alarmserver.
 */
 void AlarmClient::setAlarm(AlarmInfo& alarmInfo)
 {
-	qDebug() << "clock: AlarmClient::setAlarm -->";
 	// Get the current home time
 	TTime homeTime;
 	homeTime.HomeTime();
 	TDateTime homeDateTime = homeTime.DateTime();
 		QDate alarmDate(
 		nextDueDateTime.Year(),nextDueDateTime.Month()+1,nextDueDateTime.Day()+1);
 		alarmInfo.alarmDateTime = alarmDate;
 	}
-	qDebug() << "clock: AlarmClient::setAlarm <--";
 }
 void AlarmClient::setAlarmState(TAlarmState state, AlarmState& alarmState)
 {
-	qDebug() << "clock: AlarmClient::setAlarmState -->";
 	switch (state) {
 		case EAlarmStateInPreparation:
 			alarmState = InPreparation;
 			break;
 		case EAlarmStateQueued:
 			break;
 		default:
 			break;
 	}
-	qDebug() << "clock: AlarmClient::setAlarmState <--";
 }
 void AlarmClient::setAlarmState(AlarmState state, TAlarmState& alarmState)
 {
-	qDebug() << "clock: AlarmClient::setAlarmState -->";
 	switch (state) {
 		case InPreparation:
 			alarmState = EAlarmStateInPreparation;
 			break;
 		case Queued:
 			alarmState = EAlarmStateNotified;
 			break;
 		default:
 			break;
 	}
-	qDebug() << "clock: AlarmClient::setAlarmState <--";
 }
 void AlarmClient::setAlarmRepeatType(
 		TAlarmRepeatDefinition repeat, AlarmRepeatType& repeatType)
 {
-	qDebug() << "clock: AlarmClient::setAlarmRepeatType -->";
 	switch (repeat) {
 		case EAlarmRepeatDefintionRepeatOnce:
 			repeatType = Once;
 			break;
 		case EAlarmRepeatDefintionRepeatDaily:
 			repeatType = Weekly;
 			break;
 		default:
 			break;
 	}
-	qDebug() << "clock: AlarmClient::setAlarmRepeatType <--";
 }
 void AlarmClient::setAlarmRepeatType(
 		AlarmRepeatType repeat, TAlarmRepeatDefinition& repeatType)
 {
-	qDebug() << "clock: AlarmClient::setAlarmRepeatType -->";
 	switch (repeat) {
 		case Once:
 			repeatType = EAlarmRepeatDefintionRepeatOnce;
 			break;
 		case Daily:
 			repeatType = EAlarmRepeatDefintionRepeatWeekly;
 			break;
 		default:
 			break;
 	}
-	qDebug() << "clock: AlarmClient::setAlarmRepeatType <--";
 }
 void AlarmClient::deleteAlarm(int alarmId)
 {
-	qDebug() << "clock: AlarmClient::deleteAlarm -->";
 	// Request the alarmserver to delete the alarm.
 	mAlarmSrvSession.AlarmDelete(alarmId);
+}
-	qDebug() << "clock: AlarmClient::deleteAlarm <--";
+/*!
+	 Delete the snoozed alarm.
+	 \param alarmId needs to be deleted and reset again.
+	 \return int error value if any.
+*/
+int AlarmClient::deleteSnoozedAlarm(int alarmId)
+{
+	AlarmInfo alarmInfo;
+	int retVal(KErrNone);
+	int returnVal = getAlarmInfo(alarmId, alarmInfo);
+	if (KErrNone != retVal) {
+		return retVal;
+	}
+	returnVal = mAlarmSrvSession.AlarmDelete(alarmId);
+	if (KErrNone != retVal) {
+		return retVal;
+	}
+	alarmInfo.alarmState = InPreparation;
+	alarmInfo.nextDueTime = alarmInfo.origAlarmTime;
+	setAlarm(alarmInfo);
+	return retVal;
 }
 int AlarmClient::getAlarmInfo(int alarmId, AlarmInfo& alarmInfo)
 {
-	qDebug() << "clock: AlarmClient::getAlarmInfo -->";
 	TASShdAlarm tempSharedAlarm;
 	// Get the requested alarm info from the alarm server.
 	int error = mAlarmSrvSession.GetAlarmDetails(alarmId, tempSharedAlarm);
 		alarmInfo.nextDueTime.setHMS(
 				tempSharedAlarm.NextDueTime().DateTime().Hour(),
 				tempSharedAlarm.NextDueTime().DateTime().Minute(),
 				tempSharedAlarm.NextDueTime().DateTime().Second());
-		// Alarm day
+		// Alarm date
 		alarmInfo.alarmDateTime.setYMD(
 				tempSharedAlarm.OriginalExpiryTime().DateTime().Year(),
 				tempSharedAlarm.OriginalExpiryTime().DateTime().Month()+1,
 				tempSharedAlarm.OriginalExpiryTime().DateTime().Day()+1);
+		// Set alarm day.
+		alarmInfo.alarmDay =
+			tempSharedAlarm.OriginalExpiryTime().DayNoInWeek();
 		// The alarm status
 		if (EAlarmStatusEnabled == tempSharedAlarm.Status()) {
 			alarmInfo.alarmStatus = Enabled;
 		} else {
 			alarmInfo.volumeStatus = AlarmVolumeOn;
 		} else {
 			alarmInfo.volumeStatus = AlarmVolumeOff;
 		}
 	}
-	qDebug() << "clock: AlarmClient::getAlarmInfo <--";
 	return error;
 }
 void AlarmClient::toggleAlarmStatus(int alarmId, int alarmStatus)
 {
-	qDebug() << "clock: AlarmClient::toggleAlarmStatus -->";
 	mAlarmSrvSession.SetAlarmStatus(alarmId, (TAlarmStatus)alarmStatus);
-	qDebug() << "clock: AlarmClient::toggleAlarmStatus <--";
 }
 void AlarmClient::startListener()
 {
-	qDebug("clock: AlarmClient::startListener() -->");
+		mListener->start();
-	mListener->start();
-	qDebug("clock: AlarmClient::startListener() <--");
 }
 void AlarmClient::stopListener()
 {
-	qDebug("clock: AlarmClient::stopListener() -->");
 	mListener->stop();
-	qDebug("clock: AlarmClient::stopListener() <--");
 }
 void AlarmClient::notifyChange(int alarmId)
 {
-	qDebug() << "clock: AlarmClient::notifyChange -->";
+		emit alarmStateChanged(alarmId);
-	emit alarmStateChanged(alarmId);
-	qDebug() << "clock: AlarmClient::notifyChange <--";
 }
 // End of file	--Don't remove this.

changeset 45	b6db4fd4947b
parent 18	c198609911f9
child 57	bb2d3e476f29