FCL/sf/app/organizer: comparison notes/notesui/notesmodel/src/notesmodel.cpp

equal deleted inserted replaced

-:579cc610882e
+:ef813d54df51
 #include <HbIcon>
 #include <HbExtendedLocale>
 // User includes
 #include "notesmodel.h"
-#include "agendautil.h"
+#include <agendautil.h>
-#include "agendaentry.h"
+#include <agendaentry.h>
 #include "notescommon.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "notesmodelTraces.h"
+#endif
 /*!
 	\class NotesModel
 	This is the source model class for the notes application views. This owns
 */
 NotesModel::NotesModel(AgendaUtil *agendaUtil, QObject *parent)
 :QObject(parent),
 mAgendaUtil(agendaUtil)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_NOTESMODEL_ENTRY );
 	// Construct the source model.
 	mSourceModel = new QStandardItemModel(0, 1, this);
 	connect(
 			mAgendaUtil, SIGNAL(entriesChanged(QList<ulong>)),
 	// Connect for instance view creation completed signal
 	connect(
 			mAgendaUtil, SIGNAL(instanceViewCreationCompleted(int)),
 			this,SLOT(handleInstanceViewCreationCompleted(int)));
+	OstTraceFunctionExit0( NOTESMODEL_NOTESMODEL_EXIT );
 }
 /*!
 	Destructor.
 */
 NotesModel::~NotesModel()
 {
+	OstTraceFunctionEntry0( DUP1_NOTESMODEL_NOTESMODEL_ENTRY );
 	// Nothing yet.
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_NOTESMODEL_EXIT );
 }
 /*!
 	Returns the source model to be used with a view.
 	\return QAbstractItemModel
 	\sa QAbstractItemModel, HbListView.
 */
 QAbstractItemModel *NotesModel::sourceModel()
 {
+	OstTraceFunctionEntry0( NOTESMODEL_SOURCEMODEL_ENTRY );
 	Q_ASSERT(mSourceModel);
+	OstTraceFunctionExit0( NOTESMODEL_SOURCEMODEL_EXIT );
 	return mSourceModel;
 }
 /*!
 	Populates the source model.
 */
 void NotesModel::populateSourceModel()
 {
+	OstTraceFunctionEntry0( NOTESMODEL_POPULATESOURCEMODEL_ENTRY );
 	// Clear the model if it has any data already
 	mSourceModel->clear();
 	mSourceModel->setColumnCount(1);
 	mNotesCount = mInCompTodoCount = mCompTodoCount = 0;
 	agendaEntyList = mAgendaUtil->fetchAllEntries(
 			(AgendaUtil::FilterFlags) (AgendaUtil::IncludeCompletedTodos));
 	// Add the completed to-dos to the model.
 	appendCompTodosToModel(agendaEntyList);
+	OstTraceFunctionExit0( NOTESMODEL_POPULATESOURCEMODEL_EXIT );
 }
 /*!
 	Updates the source model with the given entry `id'.
 	The entry could be either have undergone a status change or have just been
 	\param id Of type ulong, identifies the entry which was changed.
 */
 void NotesModel::updateSourceModel(ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_UPDATESOURCEMODEL_ENTRY );
 	AgendaEntry entry = mAgendaUtil->fetchById(id);
 	if (entry.isNull()) {
+		OstTraceFunctionExit0( NOTESMODEL_UPDATESOURCEMODEL_EXIT );
 		return;
 	}
 	// Entry can be updated in many ways.
 	// 1. Notes can just change their content or can be marked/unmarked as
 				insertInCompTodoToModel(foundIndex, id);
 			}
 		}
 	}
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_UPDATESOURCEMODEL_EXIT );
 }
 /*!
 	Populates the source model. This slot is called when we get a db change
 	notification from agenda server caused by another session.
 	\param ids List of ids containing the entries that got changed.
 */
 void NotesModel::populateSourceModel(QList<ulong> ids)
 {
+	OstTraceFunctionEntry0( DUP1_NOTESMODEL_POPULATESOURCEMODEL_ENTRY );
 	Q_UNUSED(ids)
 	QTimer::singleShot(1, this, SLOT(populateSourceModel()));
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_POPULATESOURCEMODEL_EXIT );
 }
 /*!
 	Adds an entry to the model i.e., creates a QModelIndex and inserts it to the
 	model.
 	\param id The id of the entry to be added to the model.
 */
 void NotesModel::addEntryToModel(ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_ADDENTRYTOMODEL_ENTRY );
 	// We have different logic for adding a note or an incompleted to-do or a
 	// completed to-do.
 	AgendaEntry entry = mAgendaUtil->fetchById(id);
 	if (entry.isNull()) {
+		OstTraceFunctionExit0( NOTESMODEL_ADDENTRYTOMODEL_EXIT );
 		return;
 	}
 	bool notify = false;
 	QModelIndex indexToNotify;
 	}
 	if (notify) {
 		emit rowAdded(indexToNotify);
 	}
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_ADDENTRYTOMODEL_EXIT );
 }
 /*!
 	Deletes an entry from model.
 	\param Deletes the entry from model and hence updating the view.
 */
 void NotesModel::removeEntryFromModel(ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_REMOVEENTRYFROMMODEL_ENTRY );
 	for (int iter = 0; iter < mSourceModel->rowCount(); iter++) {
 		QModelIndex mdlIndex = mSourceModel->index(iter, 0);
 		if (!mdlIndex.isValid()) {
+			OstTraceFunctionExit0( NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT );
 			return;
 		}
 		ulong noteId = mdlIndex.data(
 				NotesNamespace::IdRole).value<qulonglong>();
 				}
 			}
 			break;
 		}
 	}
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_REMOVEENTRYFROMMODEL_EXIT );
 }
 /*!
 	Populate the model after instance view creation.
 */
 void NotesModel::handleInstanceViewCreationCompleted(int status)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_ENTRY );
 	Q_UNUSED(status);
 	populateSourceModel();
+	OstTraceFunctionExit0( NOTESMODEL_HANDLEINSTANCEVIEWCREATIONCOMPLETED_EXIT );
 }
 /*!
 	Modifies the content of a given `row' with the data of the entry given by
 	`id'.
 	\param id The id of the entry.
 	\param row The row corresponding to the given id.
 */
 void NotesModel::modifyEntryInModel(ulong id, int row)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_MODIFYENTRYINMODEL_ENTRY );
 	// Get the model index.
 	QModelIndex modelIndex = mSourceModel->index(row, 0);
 	Q_ASSERT(modelIndex.isValid());
 	// Fetch the entry
 		}
 		// Set the icons.
 		mSourceModel->setData(modelIndex, iconList, Qt::DecorationRole);
 	}
+	OstTraceFunctionExit0( NOTESMODEL_MODIFYENTRYINMODEL_EXIT );
 }
 /*!
 	Appends notes to the model.
 	\param ids QList of uids containing the notes.
 */
 void NotesModel::appendNotesToModel(QList<AgendaEntry> &agendaEntryList)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_APPENDNOTESTOMODEL_ENTRY );
 	int entriesCount = agendaEntryList.count();
 	// Iterate and add notes to the model.
 	mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
 	int rowCount = mSourceModel->rowCount();
 	for (int idIter = 0, modelIter = rowCount - entriesCount;
 		}
 		// Update the notes count.
 		mNotesCount++;
 	}
+	OstTraceFunctionExit0( NOTESMODEL_APPENDNOTESTOMODEL_EXIT );
 }
 /*!
 	Appends incompleted to-dos to the model.
 	\param ids QList of uids containing the incompleted to-dos.
 */
 void NotesModel::appendInCompTodosToModel(QList<AgendaEntry> &agendaEntryList)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_APPENDINCOMPTODOSTOMODEL_ENTRY );
 	int entriesCount = agendaEntryList.count();
 	// Iterate and add incomplete to-do to the model.
 	mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
 	int rowCount = mSourceModel->rowCount();
 	for (int idIter = 0, modelIter = rowCount - entriesCount;
 		mSourceModel->setData(mdlIndex, iconList, Qt::DecorationRole);
 		// Update the incompleted to-do count.
 		mInCompTodoCount++;
 	}
+	OstTraceFunctionExit0( NOTESMODEL_APPENDINCOMPTODOSTOMODEL_EXIT );
 }
 /*!
 	Appends incompleted to-dos to the model.
 	\param ids QList of uids containing the completed to-dos.
 */
 void NotesModel::appendCompTodosToModel(QList<AgendaEntry> &agendaEntryList)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_APPENDCOMPTODOSTOMODEL_ENTRY );
 	int entriesCount = agendaEntryList.count();
 	// Iterate and add complete to-do to the model.
 	mSourceModel->insertRows(mSourceModel->rowCount(), entriesCount);
 	int rowCount = mSourceModel->rowCount();
 	for (int idIter = 0, modelIter = rowCount - entriesCount;
 		mSourceModel->setData(mdlIndex, iconList, Qt::DecorationRole);
 		// Update the completed to-do count.
 		mCompTodoCount++;
 	}
+	OstTraceFunctionExit0( NOTESMODEL_APPENDCOMPTODOSTOMODEL_EXIT );
 }
 /*!
 	Inserts a note at the 0th position.
 	\param id The id of the note to be inserted.
 	\return bool true if the insertion was successful, false otherwise.
 */
 bool NotesModel::insertNoteToModel(QModelIndex &index, ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_INSERTNOTETOMODEL_ENTRY );
 	AgendaEntry entry = mAgendaUtil->fetchById(id);
 	if (entry.isNull()) {
+		OstTraceFunctionExit0( NOTESMODEL_INSERTNOTETOMODEL_EXIT );
 		return false;
 	}
 	mSourceModel->insertRows(0, 1);
 	QModelIndex mdlIndex = mSourceModel->index(0, 0);
 	// Update the notes count.
 	mNotesCount++;
 	index = mdlIndex;
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTNOTETOMODEL_EXIT );
 	return true;
 }
 /*!
 	Inserts an incomplete to-do at a position based on the id of the
 	\param id The id of the to-do to be inserted.
 	\return bool true if the Insertion was successful, false otherwise.
 */
 bool NotesModel::insertInCompTodoToModel(QModelIndex &index, ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_INSERTINCOMPTODOTOMODEL_ENTRY );
 	bool success = false;
 	// Fetch the entry first.
 	AgendaEntry entry = mAgendaUtil->fetchById(id);
 	if (entry.isNull()) {
+		OstTraceFunctionExit0( NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT );
 		return success;
 	}
 	// First fetch the list of incompleted to-dos.
 	QList<ulong> entryIds = mAgendaUtil->entryIds(
 			success = true;
 			index = newModelIndex;
 		}
 	}
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTINCOMPTODOTOMODEL_EXIT );
 	return success;
 }
 /*!
 	Inserts a complete to-do at a position based on the id of the
 	\param id The id of the to-do to be inserted.
 	\return bool true if the Insertion was successful, false otherwise.
 */
 bool NotesModel::insertCompTodoToModel(QModelIndex &index, ulong id)
 {
+	OstTraceFunctionEntry0( NOTESMODEL_INSERTCOMPTODOTOMODEL_ENTRY );
 	bool success = false;
 	// Fetch the entry first.
 	AgendaEntry entry = mAgendaUtil->fetchById(id);
 	if (entry.isNull()) {
+		OstTraceFunctionExit0( NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT );
 		return success;
 	}
 	// Now fetch all the incomplete to-dos again and add them.
 	QList<ulong> entryIds = mAgendaUtil->entryIds(
 					newModelIndex, stringList, Qt::DisplayRole);
 			// Set the to-do done icon.
 			QList<QVariant> iconList;
 			iconList.append(HbIcon("qtg_small_todo_done"));
-			// To-do is already completed. No need to set alarm.
+			if (1 == entry.priority()) {
-			iconList.append(QVariant(QVariant::Invalid));
+				// Set the High Priority icon if priority is high or else not.
+				iconList.append(HbIcon("qtg_small_priority_high"));
+			} else {
+				// To-do is already completed. No need to set alarm.
+				iconList.append(QVariant(QVariant::Invalid));
+			}
 			// Set the icons.
 			mSourceModel->setData(
 					newModelIndex, iconList, Qt::DecorationRole);
 			success = true;
 			index = newModelIndex;
 		}
 	}
+	OstTraceFunctionExit0( DUP1_NOTESMODEL_INSERTCOMPTODOTOMODEL_EXIT );
 	return success;
 }
 /*!
 	Retruns the dateformat based current locale settings.
 	Common method can be used by any class.
 	Can be removed once format strings are defined in hb.
 */
 QString NotesModel::dateFormatString()
 {
+	OstTraceFunctionEntry0( NOTESMODEL_DATEFORMATSTRING_ENTRY );
 	HbExtendedLocale locale = HbExtendedLocale::system();
 	QString dateFormat;
 	switch (locale.dateStyle()) {
 		case HbExtendedLocale::American:
 			dateFormat.append(locale.dateSeparator(1));
 			dateFormat.append("dd");
 			break;
 	}
+	OstTraceFunctionExit0( NOTESMODEL_DATEFORMATSTRING_EXIT );
 	return dateFormat;
 }
 /*!
 	Retruns the timeformat string based on current locale settings
 	Common method can be used by any class.
 	Can be removed once format strings are defined in hb.
 */
 QString NotesModel::timeFormatString()
 {
+	OstTraceFunctionEntry0( NOTESMODEL_TIMEFORMATSTRING_ENTRY );
 	QString timeFormat;
 	HbExtendedLocale locale = HbExtendedLocale::system();
 	if (locale.timeStyle() == HbExtendedLocale::Time12) {
 		timeFormat.append("hh");
 		timeFormat.append(locale.timeSeparator(1));
 		timeFormat.append("mm");
 	}
+	OstTraceFunctionExit0( NOTESMODEL_TIMEFORMATSTRING_EXIT );
 	return timeFormat;
 }
 // End of file	--Don't remove this.

changeset 58	ef813d54df51
parent 26	a949c2543c15
child 80	fa7c359294fa