[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-07-28 10:48:32
[Download RAW message or body]

CVS commit by ogoffart: 

Fix a QT connection.  also remove some useless debug output


  M +0 -4      kopeteaccountmanager.cpp   1.29
  M +10 -7     kopetetransfermanager.cpp   1.20
  M +1 -1      kopetetransfermanager.h   1.16


--- kdenonbeta/kopete/libkopete/kopeteaccountmanager.cpp  #1.28:1.29
@@ -244,6 +244,4 @@ void KopeteAccountManager::save()
 void KopeteAccountManager::load()
 {
-        kdDebug( 14010 ) << k_funcinfo << endl;
-
         connect( LibraryLoader::pluginLoader(), SIGNAL( pluginLoaded( KopetePlugin* \
) ), SLOT( slotPluginLoaded( KopetePlugin * ) ) );  }
@@ -251,6 +249,4 @@ void KopeteAccountManager::load()
 void KopeteAccountManager::slotPluginLoaded( KopetePlugin *plugin )
 {
-        kdDebug(14010) << k_funcinfo << "Called." << endl;
-
         KopeteProtocol* protocol = dynamic_cast<KopeteProtocol*>( plugin );
         if ( !protocol )

--- kdenonbeta/kopete/libkopete/kopetetransfermanager.cpp  #1.19:1.20
@@ -204,5 +204,5 @@ KopeteTransfer* KopeteTransferManager::a
         KopeteFileTransferInfo info(contact, file, size, recipient,di,  nextID);
         KopeteTransfer *trans = new KopeteTransfer(info, contact);
-        connect(trans, SIGNAL(result(KIO::Job *)), this, \
SLOT(slotComplete(KopeteTransfer *))); +        connect(trans, SIGNAL(result(KIO::Job \
*)), this, SLOT(slotComplete(KIO::Job *)));  mTransfersMap.insert(nextID, trans);
         return trans;
@@ -212,5 +212,5 @@ void KopeteTransferManager::slotAccepted
 {
         KopeteTransfer *trans = new KopeteTransfer(info, filename);
-        connect(trans, SIGNAL(result(KIO::Job *)), this, \
SLOT(slotComplete(KopeteTransfer *))); +        connect(trans, SIGNAL(result(KIO::Job \
*)), this, SLOT(slotComplete(KIO::Job *)));  mTransfersMap.insert(info.transferId(), \
trans);  emit accepted(trans,filename);
@@ -234,11 +234,14 @@ int KopeteTransferManager::askIncomingTr
 void KopeteTransferManager::removeTransfer( unsigned int id )
 {
-        KopeteTransfer *trans = mTransfersMap[id];
-//      mTransfersMap.remove(id);
-        delete trans;
+        mTransfersMap.remove(id);
+        //we don't need to delete the job, the job get deleted itself
 }
 
-void KopeteTransferManager::slotComplete(KopeteTransfer *transfer)
+void KopeteTransferManager::slotComplete(KIO::Job *job)
 {
+        KopeteTransfer *transfer=dynamic_cast<KopeteTransfer*>(job);
+        if(!transfer)
+                return;
+
         emit done(transfer);
 
@@ -248,5 +251,5 @@ void KopeteTransferManager::slotComplete
                 if( it.data() == transfer )
                 {
-                        mTransfersMap.remove( it.key() );
+                        removeTransfer(it.key());
                         break;
                 }

--- kdenonbeta/kopete/libkopete/kopetetransfermanager.h  #1.15:1.16
@@ -116,5 +116,5 @@ signals:
 private slots:
         void slotAccepted(const KopeteFileTransferInfo&, const QString&);
-        void slotComplete(KopeteTransfer*);
+        void slotComplete(KIO::Job*);
 
 private:


[prev in list] [next in list] [prev in thread] [next in thread]