[M-CVS] CVS: M/src/gui Mdnd.cpp,1.13,1.14 wxFolderView.cpp,1.593,1.594 wxMDialogs.cpp,1.374,1.375 wxMessageView.cpp,1.281,1.282 wxMsgCmdProc.cpp,1.26,1.27

[Vadim Zeitlin]

Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21249/src/gui

Modified Files:
        Mdnd.cpp wxFolderView.cpp wxMDialogs.cpp wxMessageView.cpp 
        wxMsgCmdProc.cpp 
Log Message:
code reorganization: nothing really changed but plenty of things moved around so that 
MailFolder.h contains only MailFolder class and nothing else; some unused code/classes 
removed completely

Index: Mdnd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/Mdnd.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- Mdnd.cpp    29 Jun 2002 00:19:46 -0000      1.13
+++ Mdnd.cpp    4 Jul 2002 17:22:37 -0000       1.14
@@ -40,4 +40,6 @@
 #include "MsgCmdProc.h"
 
+#include "UIdArray.h"
+
 #include "Mdnd.h"
 

Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.593
retrieving revision 1.594
diff -b -u -2 -r1.593 -r1.594
--- wxFolderView.cpp    4 Jul 2002 14:09:26 -0000       1.593
+++ wxFolderView.cpp    4 Jul 2002 17:22:37 -0000       1.594
@@ -64,4 +64,5 @@
 #include "MFolder.h"
 #include "MFCache.h"
+#include "MSearch.h"
 
 #include "FolderMonitor.h" // for case WXK_F5
@@ -75,6 +76,8 @@
 #include "Composer.h"
 #include "MsgCmdProc.h"
+#include "MFui.h"
 
 #include "Sequence.h"
+#include "UIdArray.h"
 
 #include "gui/wxFolderView.h"
@@ -281,5 +284,5 @@
          *value = strutil_ftime(m_hi->GetDate(), m_dateFormat, m_dateGMT);
       else if ( name == "size" )
-         *value = MailFolder::SizeToString(m_hi->GetSize());
+         *value = SizeToString(m_hi->GetSize());
 #ifdef USE_HEADER_SCORE
       else if ( name == "score" )
@@ -2791,5 +2794,5 @@
    {
       case WXFLC_STATUS:
-         text = MailFolder::ConvertMessageStatusToString(hi->GetStatus());
+         text = ConvertMessageStatusToString(hi->GetStatus());
          break;
 
@@ -2848,7 +2851,10 @@
 
       case WXFLC_SIZE:
-         text = MailFolder::SizeToString(hi->GetSize(),
+         text = SizeToString
+                (
+                  hi->GetSize(),
                                          hi->GetLines(),
-                                         GetSettings().showSize);
+                  (MessageSizeShow)GetSettings().showSize
+                );
          break;
 
@@ -3414,6 +3420,5 @@
        READ_CONFIG_BOOL(profile, MP_FVIEW_NAMES_ONLY);
 
-   settings->showSize =
-      (MessageSizeShow)(long)READ_CONFIG(profile, MP_FVIEW_SIZE_FORMAT);
+   settings->showSize = READ_CONFIG(profile, MP_FVIEW_SIZE_FORMAT);
 
    settings->replaceFromWithTo =

Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.374
retrieving revision 1.375
diff -b -u -2 -r1.374 -r1.375
--- wxMDialogs.cpp      20 Jun 2002 18:12:18 -0000      1.374
+++ wxMDialogs.cpp      4 Jul 2002 17:22:37 -0000       1.375
@@ -64,4 +64,5 @@
 
 #include "MFolder.h"
+#include "MSearch.h"
 
 #include "gui/wxIconManager.h"
@@ -1754,5 +1755,5 @@
 /* Configuration dialog for searching messages. */
 extern
-bool ConfigureSearchMessages(class SearchCriterium *crit,
+bool ConfigureSearchMessages(SearchCriterium *crit,
                              Profile *profile, wxWindow *parent)
 {

Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.281
retrieving revision 1.282
diff -b -u -2 -r1.281 -r1.282
--- wxMessageView.cpp   18 Jun 2002 11:22:02 -0000      1.281
+++ wxMessageView.cpp   4 Jul 2002 17:22:37 -0000       1.282
@@ -55,4 +55,6 @@
 #include "FolderView.h"
 
+#include "UIdArray.h"
+
 #include "MessageTemplate.h"
 #include "Composer.h"

Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- wxMsgCmdProc.cpp    4 Jul 2002 15:13:11 -0000       1.26
+++ wxMsgCmdProc.cpp    4 Jul 2002 17:22:37 -0000       1.27
@@ -37,4 +37,6 @@
 #include "MFolder.h"
 
+#include "UIdArray.h"
+
 #include "ASMailFolder.h"
 #include "HeaderInfo.h"



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Caffeinated soap. No kidding.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates