fixed several memory leaks

3 files changed, 12 insertions, 5 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 779b20e..9085673 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -58,13 +58,13 @@ $Id$
 
 QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
   : _usedSourceParameters(usedSourceParameters), _sourceMessage(sourceMessage), _targetChannel(targetChannel), _targetMessage(targetMessage)
 {
   //sourceMessage passes later three parameters: sourceChannel, uid, param1
     if (_usedSourceParameters == 0)
-      _sourceMessageParameters = "(QString,QString)";
+      _sourceMessageParameters = "QString,QString)";
     else if (_usedSourceParameters == 1)
       _sourceMessageParameters = "(QString,QString,QString)";
     else if (_usedSourceParameters == 2)
       _sourceMessageParameters = "(QString,QString,QString,QString)";
     else if (_usedSourceParameters == 3)
       _sourceMessageParameters = "(QString,QString,QString,QString,QString)";
@@ -254,12 +254,16 @@ bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& da
 
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
+QCopListTransferItem::~QCopListTransferItem()
+{
+    
+}
 
 QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
   : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
 {
   //targetMessage returns later two parameters: uid, and three lists
   _targetMessageParameters = "(QString,QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)";
@@ -372,13 +376,17 @@ ExternalAppHandler::ExternalAppHandler()
   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&)));
 
 
 }
 
 ExternalAppHandler::~ExternalAppHandler()
-{
+{ 
+    delete mNameEmailUidListFromKAPITransfer;
+    //delete mFindByEmailFromKAPITransfer;
+    delete mDisplayDetails;
+    delete mBirthdayListFromKAPITransfer;
 }
 
 void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
                                                        const QStringList& nameList,
                                                        const QStringList& emailList,
                                                        const QStringList& uidList,
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 4c6f1ea..6f5d345 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -97,13 +97,13 @@ class QCopMapTransferItem : public QCopTransferItem
 
 class QCopListTransferItem : public QCopTransferItem
 {
   Q_OBJECT
   public:
     QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
-
+    ~QCopListTransferItem();
     bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5,  const QStringList& list6);
 
 
     virtual bool appMessage( const QCString& msg, const QByteArray& data );
 
 
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 3771569..0fdc3e4 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -141,12 +141,13 @@ void KPimGlobalPrefs::setGlobalConfig()
                 int nbr;
                 nbr = text.find ( "},", br );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
                 int se, ee, st, et;
                 mLocaleDict = new QDict<QString>;
+                mLocaleDict->setAutoDelete( true );
                 QString end = "{ \"\",\"\" }";
                 while ( (line != end) && (br > 1)  ) {
                     //qDebug("%d *%s* ", br, line.latin1());
                     se = line.find("\"")+1;
                     et = line.findRev("\"",-1);
                     ee = line.find("\",\"");
@@ -185,14 +186,12 @@ void KPimGlobalPrefs::setGlobalConfig()
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
     if (sInstance == this)
       sInstance = staticDeleterGP.setObject(0); 
     else
         qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
-    //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
-    writeConfig();
     if ( mLocaleDict )
         delete mLocaleDict;
 }
 
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {