mail ASMailFolder.cpp,1.69,1.70 Address.cpp,1.10,1.11 AddressCC.cpp,1.19,1.20 HeaderInfoImpl.cpp,1.91,1.92 HeaderIterator.cpp,1.4,1.5 LogCircle.cpp,1.2,1.3 MFCache.cpp,1.24,1.25 MFDriver.cpp,1.1,1.2 MFPool.cpp,1.8,1.9 MFui.cpp,1.3,1.4 MailFolder.cpp,1.300,1.301 MailFolderCC.cpp,1.674,1.675 MailFolderCmn.cpp,1.117,1.118 MailMH.cpp,1.13,1.14 Message.cpp,1.33,1.34 MimePartCC.cpp,1.9,1.10 SendMessageCC.cpp,1.211,1.212 Sorting.cpp,1.3,1.4 ThreadJWZ.cpp,1.28,1.29 Threading.cpp,1.6,1.7 VFolder.cpp,1.12,1.13

Robert Vazan Thu, 18 Sep 2003 09:38:55 -0700

Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/src/mail


Modified Files:
        ASMailFolder.cpp Address.cpp AddressCC.cpp HeaderInfoImpl.cpp 
        HeaderIterator.cpp LogCircle.cpp MFCache.cpp MFDriver.cpp 
        MFPool.cpp MFui.cpp MailFolder.cpp MailFolderCC.cpp 
        MailFolderCmn.cpp MailMH.cpp Message.cpp MimePartCC.cpp 
        SendMessageCC.cpp Sorting.cpp ThreadJWZ.cpp Threading.cpp 
        VFolder.cpp 
Log Message:
Include dependencies cleanup, stage two (final so far)

Index: ASMailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/ASMailFolder.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -b -u -2 -r1.69 -r1.70
--- ASMailFolder.cpp    15 Sep 2003 17:01:39 -0000      1.69
+++ ASMailFolder.cpp    18 Sep 2003 16:30:57 -0000      1.70
@@ -16,5 +16,5 @@
 #   include "Mcommon.h"
 #   include "guidef.h"    // only for high-level functions
-#endif
+#endif // USE_PCH
 
 #include "Sequence.h"
@@ -71,5 +71,5 @@
 
 #ifdef USE_THREADS
-#   include <wx/thread.h>
+#   include <wx/thread.h>       // for wxThread
 #endif
 

Index: Address.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Address.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- Address.cpp 15 Sep 2003 17:01:39 -0000      1.10
+++ Address.cpp 18 Sep 2003 16:30:57 -0000      1.11
@@ -29,8 +29,8 @@
 
    #include "strutil.h"
+   #include "Mdefaults.h"
 #endif // USE_PCH
 
 #include "Address.h"
-#include "Mdefaults.h"
 
 // ----------------------------------------------------------------------------

Index: AddressCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/AddressCC.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -u -2 -r1.19 -r1.20
--- AddressCC.cpp       15 Sep 2003 17:01:39 -0000      1.19
+++ AddressCC.cpp       18 Sep 2003 16:30:57 -0000      1.20
@@ -27,10 +27,9 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
+   #include "Mcclient.h"
+   #include "Mdefaults.h"
 #endif // USE_PCH
 
 #include "AddressCC.h"
-
-#include "Mcclient.h"
-#include "Mdefaults.h"
 
 // ----------------------------------------------------------------------------

Index: HeaderInfoImpl.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/HeaderInfoImpl.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -b -u -2 -r1.91 -r1.92
--- HeaderInfoImpl.cpp  15 Sep 2003 17:01:39 -0000      1.91
+++ HeaderInfoImpl.cpp  18 Sep 2003 16:30:57 -0000      1.92
@@ -28,4 +28,6 @@
 
 #ifndef  USE_PCH
+   #include "Mcommon.h"
+   #include "Mdefaults.h"
    #include "Mcclient.h"      // need THREADNODE
 #endif // USE_PCH
@@ -36,5 +38,5 @@
 #include "UIdArray.h"
 
-#include "MDialogs.h"         // for MProgressInfo
+#include "gui/wxMDialogs.h"         // for MProgressInfo
 
 // ----------------------------------------------------------------------------

Index: HeaderIterator.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/HeaderIterator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- HeaderIterator.cpp  12 Sep 2002 02:36:50 -0000      1.4
+++ HeaderIterator.cpp  18 Sep 2003 16:30:58 -0000      1.5
@@ -24,7 +24,7 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
+#endif // USE_PCH
 
-   #include "Message.h"
-#endif
+#include "Message.h"
 
 // ============================================================================

Index: LogCircle.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/LogCircle.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- LogCircle.cpp       12 Sep 2002 02:36:50 -0000      1.2
+++ LogCircle.cpp       18 Sep 2003 16:30:58 -0000      1.3
@@ -19,5 +19,5 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-#endif
+#endif // USE_PCH
 
 #include "LogCircle.h"

Index: MFCache.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFCache.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -u -2 -r1.24 -r1.25
--- MFCache.cpp 15 Sep 2003 17:01:39 -0000      1.24
+++ MFCache.cpp 18 Sep 2003 16:30:58 -0000      1.25
@@ -26,12 +26,13 @@
 
 #ifndef USE_PCH
-   #include "MEvent.h"
+   #include "Mcommon.h"
 #endif // USE_PCH
 
 #include <wx/textfile.h>
 
+#include "MEvent.h"
 #include "MFolder.h"
-
 #include "MFCache.h"
+#include "MFStatus.h"
 
 // ----------------------------------------------------------------------------

Index: MFDriver.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFDriver.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- MFDriver.cpp        14 Jul 2002 23:41:22 -0000      1.1
+++ MFDriver.cpp        18 Sep 2003 16:30:58 -0000      1.2
@@ -23,5 +23,5 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-#endif
+#endif // USE_PCH
 
 #include "mail/Driver.h"

Index: MFPool.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFPool.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- MFPool.cpp  15 Sep 2003 17:01:39 -0000      1.8
+++ MFPool.cpp  18 Sep 2003 16:30:58 -0000      1.9
@@ -27,7 +27,7 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-
-   #include "lists.h"
 #endif // USE_PCH
+
+#include "lists.h"
 
 #include "mail/Driver.h"

Index: MFui.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MFui.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- MFui.cpp    15 Sep 2003 17:01:39 -0000      1.3
+++ MFui.cpp    18 Sep 2003 16:30:58 -0000      1.4
@@ -21,9 +21,9 @@
 
    #include "strutil.h"    // for strutil_ultoa()
-#endif
+#endif // USE_PCH
 
 #include "MFui.h"
 #include "MFStatus.h"
-
+#include "MailFolder.h"
 #include "MFolder.h"
 

Index: MailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolder.cpp,v
retrieving revision 1.300
retrieving revision 1.301
diff -b -u -2 -r1.300 -r1.301
--- MailFolder.cpp      15 Sep 2003 17:01:39 -0000      1.300
+++ MailFolder.cpp      18 Sep 2003 16:30:58 -0000      1.301
@@ -29,13 +29,14 @@
 #ifndef USE_PCH
 #   include "Mcommon.h"
+#   include "MApplication.h"
 #   include "strutil.h"
-#endif
+#   include "Mdefaults.h"
+#endif // USE_PCH
 
 #include <wx/file.h>
 
-#include "MDialogs.h" // for MDialog_FolderChoose
+#include "gui/wxMDialogs.h"
 
 #include "Sequence.h"
-
 #include "LogCircle.h"
 
@@ -46,5 +47,4 @@
 
 #include "Composer.h"
-#include "MApplication.h"
 
 class MPersMsgBox;

Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.674
retrieving revision 1.675
diff -b -u -2 -r1.674 -r1.675
--- MailFolderCC.cpp    16 Sep 2003 22:20:08 -0000      1.674
+++ MailFolderCC.cpp    18 Sep 2003 16:30:59 -0000      1.675
@@ -27,7 +27,8 @@
 #ifndef  USE_PCH
 #   include "Mcommon.h"
-#ifdef OS_WIN // cygwin and mingw
-#   include <wx/timer.h>
-#endif
+#   include "MApplication.h"
+#   include "strutil.h"
+#   include "Mdefaults.h"
+#   include <wx/timer.h>                // for wxTimer
 #endif // USE_PCH
 
@@ -48,5 +49,7 @@
 
 #include "MFCache.h"
+#include "MFStatus.h"
 #include "Sequence.h"
+#include "gui/wxMDialogs.h"
 
 #include "MFPrivate.h"
@@ -58,4 +61,6 @@
 // wxFile::Exists() too
 #include <wx/file.h>
+
+class MPersMsgBox;
 
 // windows.h included from fontutil.h defines ERROR

Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -b -u -2 -r1.117 -r1.118
--- MailFolderCmn.cpp   15 Sep 2003 17:01:40 -0000      1.117
+++ MailFolderCmn.cpp   18 Sep 2003 16:30:59 -0000      1.118
@@ -30,8 +30,14 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
+#  include "strutil.h"
+#  include "MApplication.h"
+#  include "Mdefaults.h"
 
-#  include <wx/mimetype.h>
+#  include <wx/filedlg.h>
+#  include <wx/timer.h>                   // for wxTimer
 #endif // USE_PCH
 
+#include <wx/mimetype.h>
+
 #include "Sequence.h"
 #include "UIdArray.h"
@@ -46,4 +52,7 @@
 #include "MThread.h"
 #include "MFCache.h"
+#include "MFStatus.h"
+#include "MFolder.h"
+#include "Address.h"
 
 #include "Composer.h"
@@ -52,4 +61,6 @@
 #include "MFPrivate.h"
 #include "mail/FolderPool.h"
+#include "gui/wxMDialogs.h"
+#include "wx/persctrl.h"
 
 #include <wx/datetime.h>

Index: MailMH.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailMH.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- MailMH.cpp  15 Sep 2003 17:01:40 -0000      1.13
+++ MailMH.cpp  18 Sep 2003 16:31:00 -0000      1.14
@@ -24,4 +24,5 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
+#  include "Mcclient.h"
 
 #  include "strutil.h"
@@ -40,6 +41,4 @@
 extern "C"
 {
-   #include "Mcclient.h"
-
    // including mh.h doesn't seem to work...
    int mh_isvalid(char *name, char *tmp, long synonly);
@@ -47,4 +46,6 @@
    char *mh_getpath(void);
 }
+
+class MOption;
 
 // ----------------------------------------------------------------------------

Index: Message.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Message.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- Message.cpp 15 Sep 2003 17:01:40 -0000      1.33
+++ Message.cpp 18 Sep 2003 16:31:00 -0000      1.34
@@ -28,6 +28,7 @@
 #ifndef  USE_PCH
    #include "Mcommon.h"
-   #include "Message.h"
 #endif // USE_PCH
+
+#include "Message.h"
 
 // should be always defined now

Index: MimePartCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MimePartCC.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- MimePartCC.cpp      12 Jul 2003 20:43:29 -0000      1.9
+++ MimePartCC.cpp      18 Sep 2003 16:31:00 -0000      1.10
@@ -27,5 +27,5 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-   #include "MailFolder.h"    // for DecodeHeader
+   #include "Mcclient.h" // for body_types
 #endif // USE_PCH
 
@@ -33,6 +33,5 @@
 
 #include "MimePartCC.h"
-
-#include "Mcclient.h" // for body_types
+#include "MailFolder.h"    // for DecodeHeader
 
 #undef MESSAGE

Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -b -u -2 -r1.211 -r1.212
--- SendMessageCC.cpp   15 Sep 2003 17:01:40 -0000      1.211
+++ SendMessageCC.cpp   18 Sep 2003 16:31:00 -0000      1.212
@@ -28,6 +28,8 @@
 #  include "Mcommon.h"
 #  include "strutil.h"
+#  include "Mdefaults.h"
 #endif // USE_PCH
 
+#include "Mversion.h"
 #include "MailFolderCC.h"
 
@@ -47,5 +49,5 @@
 
 #include "XFace.h"
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
 
 #include <wx/file.h>
@@ -53,4 +55,7 @@
 
 extern bool InitSSL(); // from src/util/ssl.cpp
+
+class MOption;
+class MPersMsgBox;
 
 // ----------------------------------------------------------------------------

Index: Sorting.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Sorting.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- Sorting.cpp 15 Sep 2003 17:01:40 -0000      1.3
+++ Sorting.cpp 18 Sep 2003 16:31:00 -0000      1.4
@@ -26,10 +26,9 @@
 
 #ifndef USE_PCH
+   #include "Mcommon.h"
    #include "Sorting.h"
-
+   #include "Mdefaults.h"
    #include "strutil.h"    // for strutil_restore_array()
 #endif // USE_PCH
-
-#include "Mdefaults.h"
 
 // ----------------------------------------------------------------------------

Index: ThreadJWZ.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/ThreadJWZ.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- ThreadJWZ.cpp       4 Jan 2003 23:58:34 -0000       1.28
+++ ThreadJWZ.cpp       18 Sep 2003 16:31:00 -0000      1.29
@@ -44,5 +44,5 @@
 #if wxUSE_REGEX
   #if defined(JWZ_USE_REGEX)
-    #include <wx/regex.h>
+    #include <wx/regex.h>       // for wxRegEx
   #endif
 #else

Index: Threading.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Threading.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- Threading.cpp       15 Sep 2003 17:01:40 -0000      1.6
+++ Threading.cpp       18 Sep 2003 16:31:00 -0000      1.7
@@ -29,9 +29,8 @@
 
    #include "Threading.h"
+   #include "Mdefaults.h"
 
    #include "Mcclient.h"      // need THREADNODE
 #endif // USE_PCH
-
-#include "Mdefaults.h"
 
 // ----------------------------------------------------------------------------

Index: VFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/VFolder.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- VFolder.cpp 15 Sep 2003 17:01:40 -0000      1.12
+++ VFolder.cpp 18 Sep 2003 16:31:00 -0000      1.13
@@ -28,5 +28,5 @@
 #ifndef USE_PCH
     #include "Mcommon.h"
-#endif
+#endif // USE_PCH
 
 #include "Sequence.h"



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to