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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim
From:       Laurent Montel <montel () kde ! org>
Date:       2009-10-07 8:33:26
Message-ID: 1254904406.163680.31646.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1032184 by mlaurent:

Remove some old code


 M  +13 -1     kmail/kmreaderwin.cpp  
 M  +2 -4      kmail/kmreaderwin.h  
 M  +11 -0     libmessageviewer/viewer.cpp  
 M  +3 -0      libmessageviewer/viewer.h  


--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.cpp #1032183:1032184
@@ -187,7 +187,6 @@
     mShowFullCcAddressList( false )
 {
   mDelayedMarkTimer.setObjectName( "mDelayedMarkTimer" );
-  mAutoDelete = false;
   mLastSerNum = 0;
   mWaitingForSerNum = 0;
   mMessage = 0;
@@ -298,7 +297,9 @@
 KMReaderWin::~KMReaderWin()
 {
   clearBodyPartMementos();
+#if 0
   if (mAutoDelete) delete message();
+#endif
   delete mRootNode; mRootNode = 0;
   removeTempFiles();
 }
@@ -1843,6 +1844,17 @@
   return mViewer->urlClicked();
 }
 
+bool KMReaderWin::autoDelete(void) const
+{
+  return mViewer->autoDelete();
+}
+
+void KMReaderWin::setAutoDelete(bool f)
+{
+  mViewer->setAutoDelete( f );
+}
+
+
 #include "kmreaderwin.moc"
 
 
--- branches/work/akonadi-ports/kdepim/kmail/kmreaderwin.h #1032183:1032184
@@ -208,8 +208,8 @@
   QString copyText();
 
   /** Get/set auto-delete msg flag. */
-  bool autoDelete(void) const { return mAutoDelete; }
-  void setAutoDelete(bool f) { mAutoDelete=f; }
+  bool autoDelete(void) const;
+  void setAutoDelete(bool f);
 
   /** Override default html mail setting */
   bool htmlOverride() const;
@@ -450,8 +450,6 @@
   unsigned long mSerNumOfOriginalMessage;
   int mNodeIdOffset;
 
-  // widgets:
-  bool mAutoDelete;
   QTimer mDelayedMarkTimer;
   bool mNoMDNsWhenEncrypted;
   unsigned long mLastSerNum;
--- branches/work/akonadi-ports/kdepim/libmessageviewer/viewer.cpp #1032183:1032184
@@ -429,9 +429,20 @@
   return d->mUrlClicked;
 }
 
+bool Viewer::autoDelete(void) const
+{
+  Q_D( const Viewer );
+  return d->mDeleteMessage;
+}
 
+void Viewer::setAutoDelete(bool f)
+{
+  Q_D( Viewer );
+  d->mDeleteMessage = f;
 }
 
+}
+
 #include "viewer.moc"
 
 
--- branches/work/akonadi-ports/kdepim/libmessageviewer/viewer.h #1032183:1032184
@@ -248,6 +248,9 @@
 
   KUrl urlClicked() const;
 
+  bool autoDelete(void) const;
+  void setAutoDelete(bool f);
+
 signals:
   /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */
[prev in list] [next in list] [prev in thread] [next in thread]