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

List:       kde-commits
Subject:    kdepim/kmail
From:       Bo Thorsen <bo () sonofthor ! dk>
Date:       2004-10-13 13:28:31
Message-ID: 20041013132831.9AE9592A5 () office ! kde ! org
[Download RAW message or body]

CVS commit by thorsen: 

From the branch: Let the expunged signal say where it came from. Required for my upcoming bugfix


  M +1 -1      folderstorage.cpp   1.33
  M +1 -1      folderstorage.h   1.31
  M +5 -5      kmailicalifaceimpl.cpp   1.71
  M +3 -2      kmfolder.cpp   1.342
  M +1 -1      kmfolder.h   1.165
  M +2 -2      kmheaders.cpp   1.673


--- kdepim/kmail/folderstorage.cpp  #1.32:1.33
@@ -717,5 +717,5 @@ int FolderStorage::expunge()
     writeConfig();
   emit changed();
-  emit expunged();
+  emit expunged( folder() );
 
   return 0;

--- kdepim/kmail/folderstorage.h  #1.30:1.31
@@ -424,5 +424,5 @@ signals:
   /** Emitted after an expunge. If not quiet, changed() will be
       emmitted first. */
-  void expunged();
+  void expunged( KMFolder* );
 
   /** Emitted when the name of the folder changes. */

--- kdepim/kmail/kmailicalifaceimpl.cpp  #1.70:1.71
@@ -1533,9 +1533,9 @@ void KMailICalIfaceImpl::readConfig()
 
   // Connect the expunged signal
-  connect( mCalendar, SIGNAL( expunged() ), this, SLOT( slotRefreshCalendar() ) );
-  connect( mTasks,    SIGNAL( expunged() ), this, SLOT( slotRefreshTasks() ) );
-  connect( mJournals, SIGNAL( expunged() ), this, SLOT( slotRefreshJournals() ) );
-  connect( mContacts, SIGNAL( expunged() ), this, SLOT( slotRefreshContacts() ) );
-  connect( mNotes,    SIGNAL( expunged() ), this, SLOT( slotRefreshNotes() ) );
+  connect( mCalendar, SIGNAL( expunged( KMFolder* ) ), this, SLOT( slotRefreshCalendar() ) );
+  connect( mTasks,    SIGNAL( expunged( KMFolder* ) ), this, SLOT( slotRefreshTasks() ) );
+  connect( mJournals, SIGNAL( expunged( KMFolder* ) ), this, SLOT( slotRefreshJournals() ) );
+  connect( mContacts, SIGNAL( expunged( KMFolder* ) ), this, SLOT( slotRefreshContacts() ) );
+  connect( mNotes,    SIGNAL( expunged( KMFolder* ) ), this, SLOT( slotRefreshNotes() ) );
 
   // Bad hack

--- kdepim/kmail/kmfolder.cpp  #1.341:1.342
@@ -64,5 +64,6 @@ KMFolder::KMFolder( KMFolderDir* aParent
   connect( mStorage, SIGNAL( changed() ), SIGNAL( changed() ) );
   connect( mStorage, SIGNAL( cleared() ), SIGNAL( cleared() ) );
-  connect( mStorage, SIGNAL( expunged() ), SIGNAL( expunged() ) );
+  connect( mStorage, SIGNAL( expunged( KMFolder* ) ),
+           SIGNAL( expunged( KMFolder* ) ) );
   connect( mStorage, SIGNAL( nameChanged() ), SIGNAL( nameChanged() ) );
   connect( mStorage, SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),

--- kdepim/kmail/kmfolder.h  #1.164:1.165
@@ -511,5 +511,5 @@ signals:
   /** Emitted after an expunge. If not quiet, changed() will be
       emmitted first. */
-  void expunged();
+  void expunged( KMFolder* );
 
   /** Emitted when the icon paths are set. */

--- kdepim/kmail/kmheaders.cpp  #1.672:1.673
@@ -1207,5 +1207,5 @@ void KMHeaders::setFolder( KMFolder *aFo
       disconnect(mFolder, SIGNAL(cleared()),
                  this, SLOT(folderCleared()));
-      disconnect(mFolder, SIGNAL(expunged()),
+      disconnect(mFolder, SIGNAL(expunged( KMFolder* )),
                  this, SLOT(folderCleared()));
       disconnect( mFolder, SIGNAL( statusMsg( const QString& ) ),
@@ -1237,5 +1237,5 @@ void KMHeaders::setFolder( KMFolder *aFo
       connect(mFolder, SIGNAL(cleared()),
               this, SLOT(folderCleared()));
-      connect(mFolder, SIGNAL(expunged()),
+      connect(mFolder, SIGNAL(expunged( KMFolder* )),
                  this, SLOT(folderCleared()));
       connect(mFolder, SIGNAL(statusMsg(const QString&)),


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