--- a/emailuis/nmsettingui/src/nmmailboxsettingsmanager.cpp Thu May 27 12:43:55 2010 +0300
+++ b/emailuis/nmsettingui/src/nmmailboxsettingsmanager.cpp Fri Jun 11 13:27:14 2010 +0300
@@ -43,8 +43,8 @@
*/
QStringList pluginFolders()
{
- NMLOG(QString("NmMailboxSettingsManager - HELPER FUNCTIONS - pluginFolders"));
-
+ NM_FUNCTION;
+
const QString nmSettingsPluginFolderPath("resource/qt/plugins/nmail/settings");
QStringList pluginDirectories;
QFileInfoList driveList = QDir::drives();
@@ -57,8 +57,7 @@
pluginDirectories.append(pluginDirectory);
}
}
-
- NMLOG(QString("NmMailboxSettingsManager - HELPER FUNCTIONS - pluginFolders - OK"));
+
return pluginDirectories;
}
@@ -71,6 +70,8 @@
NmMailboxSettingsManager::NmMailboxSettingsManager()
: mDataManager(0)
{
+ NM_FUNCTION;
+
QScopedPointer<NmDataManager> dataManager(new NmDataManager());
loadPlugins();
mDataManager = dataManager.take();
@@ -82,6 +83,8 @@
*/
NmMailboxSettingsManager::~NmMailboxSettingsManager()
{
+ NM_FUNCTION;
+
unloadPlugins();
qDeleteAll(mPluginLoaders);
mPluginLoaders.clear();
@@ -98,6 +101,8 @@
*/
void NmMailboxSettingsManager::listMailboxes(QList<NmMailbox *> &mailboxList)
{
+ NM_FUNCTION;
+
mDataManager->listMailboxes(mailboxList);
}
@@ -110,6 +115,8 @@
*/
HbIcon &NmMailboxSettingsManager::mailboxIcon(const NmId &mailboxId) const
{
+ NM_FUNCTION;
+
Q_UNUSED(mailboxId);
// TODO: use some branding feature when it is available.
return NmIcons::getIcon(NmIcons::NmIconDefaultMailbox);
@@ -128,8 +135,8 @@
void NmMailboxSettingsManager::populateModel(HbDataFormModel &model,
HbDataForm &form, const NmId &mailboxId) const
{
- NMLOG(QString("NmMailboxSettingsManager::populateModel"));
-
+ NM_FUNCTION;
+
NmSettingsPluginInterface *plugin = 0;
foreach (QPluginLoader *loader, mPluginLoaders) {
@@ -165,7 +172,6 @@
break;
}
}
- NMLOG(QString("NmMailboxSettingsManager::populateModel - OK"));
}
@@ -175,8 +181,8 @@
*/
void NmMailboxSettingsManager::loadPlugins()
{
- NMLOG(QString("NmMailboxSettingsManager::loadPlugins"));
-
+ NM_FUNCTION;
+
QStringList directories(pluginFolders());
foreach (const QString &directoryPath, directories) {
@@ -190,8 +196,6 @@
loader.take();
}
}
-
- NMLOG(QString("NmMailboxSettingsManager::loadPlugins - OK"));
}
@@ -200,13 +204,11 @@
*/
void NmMailboxSettingsManager::unloadPlugins()
{
- NMLOG(QString("NmMailboxSettingsManager::unloadPlugins"));
-
+ NM_FUNCTION;
+
foreach (QPluginLoader *loader, mPluginLoaders) {
loader->unload();
}
-
- NMLOG(QString("NmMailboxSettingsManager::unloadPlugins - OK"));
}
// End of file.