--- a/emailservices/nmclientapi/src/nmapifolder.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapifolder.cpp	Fri May 14 15:41:10 2010 +0300
@@ -15,111 +15,138 @@
  *
  */
 
-#include "nmapifolder.h"
+#include <nmapifolder.h>
+#include "nmapifolder_p.h"
 
 namespace EmailClientApi
 {
-NmFolderPrivate::NmFolderPrivate()
+
+/*!
+   constructor for NmFolder class
+ */
+NmApiFolder::NmApiFolder()
 {
-
+    d = new NmApiFolderPrivate();
 }
 
-NmFolderPrivate::~NmFolderPrivate()
+/*!
+    Copy constructor for NmApiMailbox 
+ */
+NmApiFolder::NmApiFolder(const NmApiFolder &nmApiFolder)
+: d(nmApiFolder.d)
+{
+    
+}
+
+/*!
+   destructor for NmApiFolder class
+ */
+NmApiFolder::~NmApiFolder()
 {
 
 }
 
-/*
- * constructor for NmFolder class
+/*!
+   Assign data from \a folder
  */
-NmFolder::NmFolder()
+NmApiFolder &NmApiFolder::operator=(const NmApiFolder &folder)
 {
-    d = new NmFolderPrivate();
+    if (this != &folder) {
+        d = folder.d;
+    }
+    return *this;
 }
 
-/*
- * destructor for NmFolder class
+/*!
+   Compare data from \a folder
  */
-NmFolder::~NmFolder()
+bool NmApiFolder::operator==(const NmApiFolder &folder)
 {
-
+    bool returnValue = false;
+    if (d == folder.d) {
+        returnValue = true;
+    }
+    return returnValue;
 }
 
-/*
- * getter for id
+/*!
+   getter for id
  */
-quint64 NmFolder::id() const
+quint64 NmApiFolder::id() const
 {
     return d->id;
 }
 
-/*
- * getter for name 
+/*!
+   getter for name 
  */
-QString NmFolder::name() const
+QString NmApiFolder::name() const
 {
     return d->name;
 }
 
-/*
- * getter for foldertype
+/*!
+   getter for foldertype
  */
-EmailFolderType NmFolder::folderType() const
+EmailClientApi::NmApiEmailFolderType NmApiFolder::folderType() const
 {
     return d->folderType;
 }
 
-/*
- * setter for name
+/*!
+   setter for name
  */
-void NmFolder::setName(const QString& name)
+void NmApiFolder::setName(const QString& name)
 {
     d->name = name;
 }
 
-/*
- * setter for id
+/*!
+   setter for id
  */
-void NmFolder::setId(quint64 id)
+void NmApiFolder::setId(quint64 id)
 {
     d->id = id;
 }
 
-/*
- * setter for foldertype
+/*!
+   setter for foldertype
  */
-void NmFolder::setFolderType(EmailFolderType folderType)
+void NmApiFolder::setFolderType(EmailClientApi::NmApiEmailFolderType folderType)
 {
     d->folderType = folderType;
 }
 
-/*
- * setter for parent folder id
+/*!
+   setter for parent folder id
  */
-void NmFolder::setParentFolderId(quint64 parentId)
+void NmApiFolder::setParentFolderId(quint64 parentId)
 {
     d->parentId = parentId;
 }
 
-/*
- * seter for childfolder ids
+/*!
+   seter for childfolder ids
  */
-void NmFolder::setChildFolderIds(QList<quint64> &childFolderIds)
+void NmApiFolder::setChildFolderIds(QList<quint64> &childFolderIds)
 {
     d->childFolderIds = childFolderIds;
 }
 
-/*
- * Returns count of child folder ids.
- * to be implemented later when nmail functionality is available
+/*!
+   Returns count of child folder ids.
+   to be implemented later when nmail functionality is available
  */
-void NmFolder::getChildFolderIds(QList<quint64> &childFolderIds)
+void NmApiFolder::getChildFolderIds(QList<quint64> &childFolderIds)
 {
     childFolderIds = d->childFolderIds;
 }
-;
+
 
-quint64 NmFolder::parentFolderId() const
+/*!
+   Returns id of parent folder.
+ */
+quint64 NmApiFolder::parentFolderId() const
 {
     return d->parentId;
 }