--- a/emailservices/nmclientapi/src/nmapieventnotifier_p.cpp	Fri Sep 03 17:52:02 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapieventnotifier_p.cpp	Wed Sep 15 12:09:55 2010 +0300
@@ -69,10 +69,10 @@
     }
     else {
         qRegisterMetaType<QList<quint64> > ("QList<quint64>");
-        qRegisterMetaType<NmApiMessage> ("NmApiMessage");
+        qRegisterMetaType<NmApiEvent> ("NmApiEvent");
 
-        connect(mEngine, SIGNAL(emailStoreEvent(NmApiMessage)), this,
-                SLOT(emailStoreEvent(NmApiMessage)));
+        connect(mEngine, SIGNAL(emailStoreEvent(NmApiEvent)), this,
+                SLOT(emailStoreEvent(NmApiEvent)));
             
         mEngine->startCollectingEvents();
             
@@ -89,14 +89,14 @@
 {
     mIsRunning = false;
     mEmitSignals->stop();
-    disconnect(mEngine, SIGNAL(emailStoreEvent(NmApiMessage)), this,
-            SLOT(emailStoreEvent(NmApiMessage)));
+    disconnect(mEngine, SIGNAL(emailStoreEvent(NmApiEvent)), this,
+            SLOT(emailStoreEvent(NmApiEvent)));
 }
 
 /*!
     Returns event buffer, after function call the buffer is empty
  */
-void NmApiEventNotifierPrivate::events(QList<NmApiMessage> &events)
+void NmApiEventNotifierPrivate::events(QList<NmApiEvent> &events)
 {
     while (!mBufferOfEvents.isEmpty()) {
         events << mBufferOfEvents.takeFirst();
@@ -107,10 +107,10 @@
    Add one email event into buffer.
    
    It is run by \sa NmApiEngine::emailStoreEvent signal.
-   \sa NmApiMessage
+   \sa NmApiEvent
    \param events It contains full info about object and it event.
  */
-void NmApiEventNotifierPrivate::emailStoreEvent(const NmApiMessage &events)
+void NmApiEventNotifierPrivate::emailStoreEvent(const NmApiEvent &events)
 {
     NM_FUNCTION;
     mBufferOfEvents << events;
@@ -127,8 +127,8 @@
     mIsRunning = false;
     mEmitSignals->stop();
 
-    disconnect(mEngine, SIGNAL(emailStoreEvent(NmApiMessage)), this,
-            SLOT(emailStoreEvent(NmApiMessage)));
+    disconnect(mEngine, SIGNAL(emailStoreEvent(NmApiEvent)), this,
+            SLOT(emailStoreEvent(NmApiEvent)));
 
     mBufferOfEvents.clear();
 }