Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/src/classes
Modified Files:
CacheFile.cpp ComposeTemplate.cpp ConfigSource.cpp
FolderMonitor.cpp FolderView.cpp ListReceiver.cpp
MApplication.cpp MEvent.cpp MFilter.cpp MFolder.cpp
MModule.cpp MObject.cpp MessageTemplate.cpp MessageView.cpp
Moptions.cpp Mpers.cpp PGPClickInfo.cpp PathFinder.cpp
Profile.cpp Sequence.cpp XFace.cpp kbList.cpp
Log Message:
Include dependencies cleanup, stage two (final so far)
Index: CacheFile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/CacheFile.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- CacheFile.cpp 12 Jul 2003 16:10:18 -0000 1.7
+++ CacheFile.cpp 18 Sep 2003 16:30:47 -0000 1.8
@@ -29,9 +29,9 @@
#include "MApplication.h"
+
+ #include <wx/log.h> // for wxLogNull
#endif // USE_PCH
-#include <wx/log.h> // for wxLogNull
#include <wx/filefn.h> // for wxMkdir
-#include <wx/file.h>
#include <wx/textfile.h>
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -b -u -2 -r1.49 -r1.50
--- ComposeTemplate.cpp 4 Sep 2003 16:12:06 -0000 1.49
+++ ComposeTemplate.cpp 18 Sep 2003 16:30:48 -0000 1.50
@@ -23,16 +23,16 @@
#ifndef USE_PCH
-# include <wx/log.h>
-
+# include "Mcommon.h"
# include "sysutil.h"
# include "strutil.h"
-#endif
+# include "MApplication.h"
+# include "Profile.h"
+# include "Mdefaults.h"
+#endif // USE_PCH
#include "TemplateDialog.h"
-#include "MApplication.h"
#include "Composer.h"
-#include "MDialogs.h"
-#include "Mdefaults.h"
+#include "gui/wxMDialogs.h"
#include "Address.h"
@@ -43,5 +43,5 @@
#include <wx/confbase.h> // for wxExpandEnvVars()
-#include <wx/file.h>
+#include <wx/file.h> // for wxFile
#include <wx/ffile.h>
#include <wx/textfile.h>
Index: ConfigSource.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ConfigSource.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ConfigSource.cpp 15 Sep 2003 11:08:24 -0000 1.6
+++ ConfigSource.cpp 18 Sep 2003 16:30:48 -0000 1.7
@@ -27,17 +27,17 @@
#ifndef USE_PCH
#include "Mcommon.h"
+ #include "Mdefaults.h"
- #ifdef OS_WIN
+ #include <wx/utils.h> // for wxGetHomeDir
+#endif // USE_PCH
+
+#ifdef OS_WIN
#include <wx/msw/regconf.h>
- #else
- #include <wx/confbase.h>
- #endif
-
- #include <wx/config.h>
- #include <wx/dir.h>
- #include <wx/utils.h>
+#else
+ #include <wx/confbase.h> // for wxConfigBase
#endif
-#include <wx/fileconf.h>
+#include <wx/dir.h>
+#include <wx/fileconf.h> // for wxFileConfig
#ifdef OS_UNIX
@@ -52,5 +52,5 @@
#include "ConfigSource.h"
-#include "Mdefaults.h"
+class MOption;
// ----------------------------------------------------------------------------
Index: FolderMonitor.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/FolderMonitor.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -u -2 -r1.23 -r1.24
--- FolderMonitor.cpp 14 Sep 2003 16:10:46 -0000 1.23
+++ FolderMonitor.cpp 18 Sep 2003 16:30:48 -0000 1.24
@@ -27,20 +27,21 @@
#ifndef USE_PCH
- #include "Mcommon.h"
- #include "lists.h"
+# include "Mcommon.h"
+# include "Mdefaults.h"
+
+# ifdef USE_DIALUP
+# include "MApplication.h" // for IsOnline()
+# endif // USE_DIALUP
#endif // USE_PCH
+#include "MThread.h"
+#include "lists.h"
#include "MFolder.h"
#include "FolderMonitor.h"
-#include "MThread.h"
-
-#ifdef USE_DIALUP
- #include "MApplication.h" // for IsOnline()
-#endif // USE_DIALUP
+#include "gui/wxMDialogs.h" // MDialog_YesNoDialog
-#include "MDialogs.h" // MDialog_YesNoDialog
-#include "Mpers.h"
+class MOption;
// ----------------------------------------------------------------------------
Index: FolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/FolderView.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- FolderView.cpp 8 Sep 2002 19:23:09 -0000 1.12
+++ FolderView.cpp 18 Sep 2003 16:30:48 -0000 1.13
@@ -23,7 +23,7 @@
# include "Mcommon.h"
# include "MApplication.h"
+# include "Profile.h"
+# include "Mdefaults.h"
#endif // USE_PCH
-
-#include "Mdefaults.h"
#include "FolderView.h"
Index: ListReceiver.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ListReceiver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- ListReceiver.cpp 14 Oct 2002 21:47:44 -0000 1.2
+++ ListReceiver.cpp 18 Sep 2003 16:30:48 -0000 1.3
@@ -27,5 +27,5 @@
#ifndef USE_PCH
#include "Mcommon.h"
-#endif
+#endif // USE_PCH
#include "ListReceiver.h"
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.277
retrieving revision 1.278
diff -b -u -2 -r1.277 -r1.278
--- MApplication.cpp 16 Sep 2003 21:32:44 -0000 1.277
+++ MApplication.cpp 18 Sep 2003 16:30:48 -0000 1.278
@@ -26,10 +26,10 @@
# include "strutil.h"
# include "Profile.h"
-# include "kbList.h"
-# include "Mdefaults.h"
# include "MApplication.h"
+# include "Mcclient.h" // For env_parameters
+# include "Mdefaults.h"
-# include <wx/dynarray.h>
-# include <wx/file.h>
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY
+# include <wx/dirdlg.h> // wxDirDialog
#endif // USE_PCH
@@ -41,18 +41,13 @@
#include "HeaderInfo.h"
#include "FolderMonitor.h"
-#include "PathFinder.h"
+#include "PathFinder.h" // for PathFinder
#include "Composer.h" // for RestoreAll()
#include "gui/wxMainFrame.h"
-#include "gui/wxMApp.h"
-#include "MDialogs.h" // MDialog_YesNoDialog
-#include "gui/wxIconManager.h"
+#include "gui/wxMDialogs.h" // MDialog_YesNoDialog
#include "adb/AdbManager.h" // for AdbManager::Delete
#include "adb/AdbFrame.h" // for ShowAdbFrame
-#include "Mpers.h"
-
-#include "Mversion.h"
#include "Mupgrade.h"
@@ -61,12 +56,10 @@
#include "CmdLineOpts.h"
-#include <wx/confbase.h> // wxExpandEnvVars
#include <wx/mimetype.h> // wxMimeTypesManager
-
-#include <wx/dirdlg.h> // wxDirDialog
+#include <wx/confbase.h> // for wxConfigBase
#include "wx/persctrl.h" // for wxPControls::SetSettingsPath
-#include "Mcclient.h" // For env_parameters
+class MOption;
// ----------------------------------------------------------------------------
Index: MEvent.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MEvent.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -u -2 -r1.39 -r1.40
--- MEvent.cpp 14 Sep 2003 16:10:46 -0000 1.39
+++ MEvent.cpp 18 Sep 2003 16:30:49 -0000 1.40
@@ -23,16 +23,15 @@
# include "Mcommon.h"
# include "kbList.h"
+# include "Profile.h"
+# include "MApplication.h"
-# include <stdarg.h>
-
-# include <wx/dynarray.h>
-# include <wx/utils.h>
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY
#endif // USE_PCH
+#include <stdarg.h> // for va_start
+
#include "MEvent.h"
-#include "Profile.h"
#include "MailFolder.h"
#include "HeaderInfo.h"
-#include "MApplication.h"
// ----------------------------------------------------------------------------
Index: MFilter.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFilter.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -u -2 -r1.24 -r1.25
--- MFilter.cpp 30 Dec 2002 00:40:54 -0000 1.24
+++ MFilter.cpp 18 Sep 2003 16:30:49 -0000 1.25
@@ -30,8 +30,10 @@
# include "Profile.h"
# include "strutil.h"
-# include "Mdefaults.h"
-#endif
+
+# include <wx/dynarray.h> // for WX_DECLARE_OBJARRAY
+#endif // USE_PCH
#include "MFilter.h"
+#include "MFolder.h"
#include "modules/Filters.h"
@@ -463,5 +465,4 @@
}
-#include <wx/dynarray.h>
WX_DECLARE_OBJARRAY(MFDialogComponent, MFDComponentArray);
#include <wx/arrimpl.cpp>
Index: MFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFolder.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -b -u -2 -r1.99 -r1.100
--- MFolder.cpp 29 Aug 2003 00:10:01 -0000 1.99
+++ MFolder.cpp 18 Sep 2003 16:30:49 -0000 1.100
@@ -31,16 +31,16 @@
# include "MApplication.h"
# include "strutil.h"
+# include "Mdefaults.h"
-# include <wx/confbase.h> // for wxSplitPath
-# include <wx/dynarray.h>
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY
#endif // USE_PCH
-#include "Mdefaults.h"
-
#include "MFolder.h"
#include "MFilter.h"
#include "MFCache.h"
+#include "MFStatus.h"
#include <wx/dir.h>
+#include <wx/confbase.h> // for wxSplitPath
// ----------------------------------------------------------------------------
Index: MModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MModule.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -b -u -2 -r1.82 -r1.83
--- MModule.cpp 22 Jul 2003 12:07:38 -0000 1.82
+++ MModule.cpp 18 Sep 2003 16:30:49 -0000 1.83
@@ -26,20 +26,13 @@
#ifndef USE_PCH
-# include "Mconfig.h"
# include "Mcommon.h"
# include "MApplication.h"
-# include "gui/wxMApp.h"
-# include "kbList.h"
# include "strutil.h"
-#endif
-
-#include "MDialogs.h"
+#endif // USE_PCH
-#include "Mversion.h"
#include "MModule.h"
#include <wx/dynlib.h>
-#include <wx/utils.h>
-#include <wx/textfile.h>
+#include <wx/textfile.h> // for wxTextFile
// ----------------------------------------------------------------------------
@@ -912,3 +905,9 @@
return "";
+}
+
+MModuleCommon::~MModuleCommon()
+{
+ if ( m_MInterface )
+ m_MInterface->RemoveModule(this);
}
Index: MObject.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MObject.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- MObject.cpp 12 Sep 2002 02:36:49 -0000 1.22
+++ MObject.cpp 18 Sep 2003 16:30:49 -0000 1.23
@@ -20,4 +20,11 @@
#include "Mpch.h"
+#ifndef USE_PCH
+# ifdef DEBUG
+# include <wx/log.h>
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY
+# endif
+#endif // USE_PCH
+
// note: this source file is intentionally empty in release mode, all the code
// here is only for the debugging support, otherwise the functions are inline in
@@ -26,7 +33,4 @@
#ifdef DEBUG
-
-#include <wx/log.h>
-#include <wx/dynarray.h>
// ----------------------------------------------------------------------------
Index: MessageTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageTemplate.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -2 -r1.31 -r1.32
--- MessageTemplate.cpp 30 Dec 2002 00:40:54 -0000 1.31
+++ MessageTemplate.cpp 18 Sep 2003 16:30:50 -0000 1.32
@@ -27,12 +27,10 @@
# include "MApplication.h"
-# include <wx/string.h>
-# include <wx/log.h>
+# include <wx/string.h> // for wxString
+# include <wx/log.h> // for wxLogWarning
# include <wx/config.h>
#endif // USE_PCH
-#include <wx/textfile.h>
-
-#include "Mdefaults.h"
+#include <wx/textfile.h> // for wxTextFileType_Unix
#include "MessageTemplate.h"
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -b -u -2 -r1.130 -r1.131
--- MessageView.cpp 14 Sep 2003 16:10:46 -0000 1.130
+++ MessageView.cpp 18 Sep 2003 16:30:50 -0000 1.131
@@ -34,15 +34,15 @@
# include "Profile.h"
-# include "MFrame.h"
-
# include "gui/wxMApp.h" // for PrepareForPrinting()
+# include "MHelp.h"
+# include "sysutil.h"
+# include "gui/wxIconManager.h"
+# include "Mdefaults.h"
-# include <wx/menu.h>
-
-# include "gui/wxOptionsDlg.h"
+# include <wx/filedlg.h>
#endif //USE_PCH
-#include "Mdefaults.h"
-#include "MHelp.h"
+#include "gui/wxOptionsDlg.h"
+#include "MTextStyle.h"
#include "MModule.h"
@@ -57,14 +57,12 @@
#include "ASMailFolder.h"
#include "MFolder.h"
-#include "UIdArray.h"
+#include "gui/wxMenuDefs.h"
+#include "gui/wxMDialogs.h"
-#include "MDialogs.h"
-#include "Mpers.h"
+#include "wx/persctrl.h"
#include "XFace.h"
#include "Collect.h"
-#include "sysutil.h"
#include "miscutil.h" // for GetColourByName()
-#include "MessageTemplate.h"
#include "Composer.h"
@@ -74,8 +72,5 @@
#include "ClickAtt.h"
-#include "gui/wxIconManager.h"
-
-#include <wx/dynarray.h>
-#include <wx/file.h>
+#include <wx/file.h> // for wxFile
#include <wx/mimetype.h> // for wxFileType::MessageParameters
#include <wx/process.h>
@@ -85,5 +80,4 @@
#include <ctype.h> // for isspace
-#include <time.h> // for time stamping autocollected addresses
#ifdef OS_UNIX
@@ -92,4 +86,6 @@
#include <wx/dcps.h> // for wxThePrintSetupData
#endif
+
+class MPersMsgBox;
// ----------------------------------------------------------------------------
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -b -u -2 -r1.62 -r1.63
--- Moptions.cpp 4 Sep 2003 16:12:06 -0000 1.62
+++ Moptions.cpp 18 Sep 2003 16:30:50 -0000 1.63
@@ -24,10 +24,10 @@
#ifndef USE_PCH
#include "Mcommon.h"
-#endif
+ #include "Profile.h"
+ #include "Mdefaults.h"
+ #include "FolderType.h" // for MF_FILE used by MP_LAST_CREATED_FOLDER_TYPE
+#endif // USE_PCH
-#include "Mdefaults.h"
#include "Moptions.h"
-
-#include "FolderType.h" // for MF_FILE used by MP_LAST_CREATED_FOLDER_TYPE
// ----------------------------------------------------------------------------
Index: Mpers.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Mpers.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -u -2 -r1.15 -r1.16
--- Mpers.cpp 14 Sep 2003 14:10:12 -0000 1.15
+++ Mpers.cpp 18 Sep 2003 16:30:50 -0000 1.16
@@ -23,7 +23,5 @@
#ifndef USE_PCH
#include "Mcommon.h"
-
- #include <wx/intl.h>
-#endif
+#endif // USE_PCH
#include "Mpers.h"
Index: PGPClickInfo.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PGPClickInfo.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- PGPClickInfo.cpp 22 Jul 2003 22:01:39 -0000 1.3
+++ PGPClickInfo.cpp 18 Sep 2003 16:30:50 -0000 1.4
@@ -24,4 +24,6 @@
#ifndef USE_PCH
#include "Mcommon.h"
+ #include "MApplication.h"
+ #include "gui/wxIconManager.h"
#include <wx/menu.h>
@@ -29,4 +31,5 @@
#include "MessageView.h"
+#include "gui/wxMDialogs.h"
#include "modules/MCrypt.h"
Index: PathFinder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PathFinder.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- PathFinder.cpp 22 Jul 2003 12:07:38 -0000 1.20
+++ PathFinder.cpp 18 Sep 2003 16:30:50 -0000 1.21
@@ -21,17 +21,13 @@
#ifndef USE_PCH
# include "Mcommon.h"
-# include <guidef.h>
-# include <string.h>
# include "kbList.h"
+#endif // USE_PCH
+
#ifdef OS_WIN // cygwin and mingw
# include <io.h> // for access()
#endif
-#endif // USE_PCH
-
-#include <sys/stat.h>
#include "PathFinder.h"
-#include <wx/filefn.h>
#include <wx/file.h>
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -b -u -2 -r1.146 -r1.147
--- Profile.cpp 14 Sep 2003 13:43:48 -0000 1.146
+++ Profile.cpp 18 Sep 2003 16:30:50 -0000 1.147
@@ -31,14 +31,14 @@
#include "strutil.h"
#include "MApplication.h"
+ #include "Mdefaults.h"
+#endif // USE_PCH
- #include <wx/confbase.h>
-#endif
+#include <wx/confbase.h> // for wxExpandEnvVars
-#include "Mdefaults.h"
#include "lists.h"
#include "ConfigSource.h"
-#include <ctype.h>
+class wxConfigBase;
#ifdef DEBUG
Index: Sequence.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Sequence.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- Sequence.cpp 8 Sep 2002 19:23:09 -0000 1.6
+++ Sequence.cpp 18 Sep 2003 16:30:50 -0000 1.7
@@ -36,6 +36,4 @@
#include "Sequence.h"
-#include <ctype.h>
-
// ============================================================================
// Sequence implementation
Index: XFace.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/XFace.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- XFace.cpp 22 Jul 2003 22:01:39 -0000 1.28
+++ XFace.cpp 18 Sep 2003 16:30:50 -0000 1.29
@@ -12,21 +12,23 @@
#include "Mpch.h"
-#include "Mcommon.h"
+
+#ifndef USE_PCH
+# include "Mcommon.h"
+# include "strutil.h"
+# include "Mdefaults.h"
+# include "MApplication.h" // for mApplication
+# include "gui/wxIconManager.h" // for wxIconManager
+
+# ifdef XFACE_WITH_WXIMAGE
+# include "MApplication.h"
+# include "Profile.h"
+# endif
+#endif // USE_PCH
#include "XFace.h"
-#include "strutil.h"
-#include "kbList.h"
-#include <stdio.h>
#ifdef XFACE_WITH_WXIMAGE
-# include "guidef.h"
-# include "MDialogs.h"
-# include "gui/wxIconManager.h"
# include "PathFinder.h"
-# include "MApplication.h"
-# include "Profile.h"
#endif
-
-#include "Mdefaults.h"
extern const MOption MP_ICONPATH;
Index: kbList.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/kbList.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- kbList.cpp 29 Dec 2002 02:05:17 -0000 1.16
+++ kbList.cpp 18 Sep 2003 16:30:51 -0000 1.17
@@ -12,6 +12,9 @@
#endif
-#include "Mconfig.h"
-#include "kbList.h"
+#include "Mpch.h"
+
+#ifndef USE_PCH
+# include "kbList.h"
+#endif // USE_PCH
#ifdef DEBUG
-------------------------------------------------------
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
