added functionality for Birthdaylookup from kopi via qCop

2 files changed, 86 insertions, 14 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 99aee86..07bdff2 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -258,3 +258,3 @@ QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QStri
   //targetMessage returns later two parameters: uid, and three lists
-  _targetMessageParameters = "(QString,QStringList,QStringList,QStringList)";
+  _targetMessageParameters = "(QString,QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)";
 }
@@ -262,3 +262,3 @@ QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QStri
 /*********************************************************************************/
-bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
+bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6)
 {
@@ -269,3 +269,7 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
   qDebug("3Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1());
-  qDebug("passing uid(%s) and list1, list2, list3 as parameter to QCopEnvelope", uid.latin1());
+  qDebug("passing uid(%s) and list1, list2, list3, list4, list5, list6 as parameter to QCopEnvelope", uid.latin1());
+
+  
+    for ( int i = 0; i < list3.count(); i++)
+      qDebug("listentry list3: %s",list3[i].latin1());
 
@@ -274,3 +278,3 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
 
-  e << uid << list1 << list2 << list3;
+  e << uid << list1 << list2 << list3 << list4 << list5 << list6;
 
@@ -306,6 +310,11 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
       QStringList list3;
+      QStringList list4;
+      QStringList list5;
+      QStringList list6;
       QString uid;
 
-      stream >> uid >> list1 >> list2 >> list3;
-      emit receivedMessageFromTarget(uid, list1, list2, list3);
+      qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+
+      stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6;
+      emit receivedMessageFromTarget(uid, list1, list2, list3, list4, list5, list6);
 
@@ -335,3 +344,3 @@ ExternalAppHandler::ExternalAppHandler()
   connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&)));
-  connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)));
+  connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SLOT (receivedNameEmailUidList_Slot(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 
@@ -343,2 +352,10 @@ ExternalAppHandler::ExternalAppHandler()
   connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
+
+
+
+  mBirthdayListFromKAPITransfer = new QCopListTransferItem(0, "requestBirthdayListFromKAPI", "QPE/Application/kapi", "receiveBirthdayList");
+  connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForBirthdayList(const QString&, const QString&)));
+  connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
+
+
 }
@@ -349,2 +366,15 @@ ExternalAppHandler::~ExternalAppHandler()
 
+void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
+                                                       const QStringList& nameList,
+                                                       const QStringList& emailList,
+                                                       const QStringList& uidList,
+                                                       const QStringList&,
+                                                       const QStringList&,
+                                                       const QStringList& )
+{
+  // this method is a conevnient way to reduce the number of parameters I have to pass 
+  emit receivedNameEmailUidListEvent(uid, nameList, emailList, uidList);
+}
+
+
 void ExternalAppHandler::loadConfig()
@@ -1051,2 +1081,5 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
   if (!res)
+    res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data );
+
+  if (!res)
     res = mDisplayDetails->appMessage( cmsg, data );
@@ -1067,5 +1100,6 @@ bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceCha
 {
- 
+  QStringList list4, list5, list6;
+
   mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel);
-  return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3);
+  return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
 }
@@ -1080,4 +1114,6 @@ bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel,
 {
+  QStringList list4, list5, list6;
+
   mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel);
-  return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3);
+  return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
 }
@@ -1090,2 +1126,14 @@ bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QStri
 
+bool ExternalAppHandler::requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid)
+{
+  mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel);
+  return mBirthdayListFromKAPITransfer->sendMessageToTarget(sessionuid);
+}
+
+bool ExternalAppHandler::returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6)
+{
+  mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel);
+  return mBirthdayListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
+}
+
 
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index cfe577b..4c6f1ea 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -61,3 +61,2 @@ class QCopTransferItem  : public QObject
 
-
   public:
@@ -104,3 +103,3 @@ class QCopListTransferItem : public QCopTransferItem
 
-    bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3);
+    bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5,  const QStringList& list6);
 
@@ -111,3 +110,3 @@ class QCopListTransferItem : public QCopTransferItem
  signals:
-    void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3);
+    void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4 , const QStringList& list5,  const QStringList& list6);
 
@@ -209,2 +208,4 @@ class ExternalAppHandler : public QObject
 
+
+
     bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email);
@@ -215,2 +216,10 @@ class ExternalAppHandler : public QObject
 
+
+    bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
+    bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid,
+                                    const QStringList& birthdayList, const QStringList& anniversaryList,
+                                    const QStringList& realNameList, const QStringList& emailList,
+                                    const QStringList& assembledNameList, const QStringList& uidList);
+
+
     //loadConfig clears the cache and checks again if the applications are available or not
@@ -234,3 +243,3 @@ class ExternalAppHandler : public QObject
     void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email);
-    void receivedFindBbyEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
+    void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
 
@@ -239,2 +248,13 @@ class ExternalAppHandler : public QObject
 
+    // Emmitted when the target app receives a request from the source app
+    void requestForBirthdayList(const QString& sourceChannel, const QString& uid);
+
+    // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
+    // The first parameter is a uniqueid. It can be used to identify the event
+    void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList,
+                                   const QStringList& anniversaryList, const QStringList& realNameList,
+                                   const QStringList& emailList, const QStringList& assembledNameList,
+                                   const QStringList& uidList);
+
+
   private:
@@ -253,2 +273,3 @@ class ExternalAppHandler : public QObject
     QCopTransferItem* mDisplayDetails;
+    QCopListTransferItem* mBirthdayListFromKAPITransfer;
 
@@ -263,2 +284,5 @@ class ExternalAppHandler : public QObject
 
+  private slots:
+    void receivedNameEmailUidList_Slot(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList, const QStringList&, const QStringList&, const QStringList& );
+
 };