Update of /cvsroot/mahogany/M/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/src/util
Modified Files:
miscutil.cpp ssl.cpp strutil.cpp sysutil.cpp upgrade.cpp
Log Message:
Include dependencies cleanup, stage two (final so far)
Index: miscutil.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/miscutil.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- miscutil.cpp 15 Sep 2003 17:01:42 -0000 1.40
+++ miscutil.cpp 18 Sep 2003 16:31:03 -0000 1.41
@@ -9,15 +9,17 @@
#include "Mpch.h"
-#include "Mcommon.h"
#ifndef USE_PCH
+# include "Mcommon.h"
# include "MApplication.h"
-#endif
-
-#include "gui/wxIconManager.h"
+# include "gui/wxIconManager.h"
+# include "Mdefaults.h"
+#endif // USE_PCH
#include "MFStatus.h"
#include "miscutil.h"
+
+class MOption;
extern const MOption MP_FOLDERSTATUS_STATBAR;
Index: ssl.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/ssl.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -2 -r1.31 -r1.32
--- ssl.cpp 23 Jun 2003 01:23:47 -0000 1.31
+++ ssl.cpp 18 Sep 2003 16:31:03 -0000 1.32
@@ -13,25 +13,24 @@
#include "Mpch.h"
-#ifndef USE_PCH
- #include "Mcommon.h"
-#endif // !USE_PCH
-
#ifdef USE_SSL
-// needed to get ssl_onceonlyinit() declaration
-#include "Mcclient.h"
+#ifndef USE_PCH
+ #include "Mcommon.h"
+ #include "Mdefaults.h"
-// under Unix we have to load libssl and libcrypto to provide access to them to
-// c-client
-#if defined(OS_UNIX) || defined(__CYGWIN__)
+ // needed to get ssl_onceonlyinit() declaration
+ #include "Mcclient.h"
-#ifndef USE_PCH
+ #if defined(OS_UNIX) || defined(__CYGWIN__)
#include "Profile.h"
#include "MApplication.h"
-#endif // !USE_PCH
+ #endif
+#endif // USE_PCH
-#include "Mdefaults.h"
+#include "gui/wxMDialogs.h"
-#include "MDialogs.h"
+// under Unix we have to load libssl and libcrypto to provide access to them to
+// c-client
+#if defined(OS_UNIX) || defined(__CYGWIN__)
#include <wx/dynlib.h>
Index: strutil.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/strutil.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -b -u -2 -r1.114 -r1.115
--- strutil.cpp 15 Sep 2003 17:01:42 -0000 1.114
+++ strutil.cpp 18 Sep 2003 16:31:03 -0000 1.115
@@ -21,7 +21,10 @@
# include "Mcommon.h"
# include "strutil.h"
-#endif
+# include "Profile.h"
+# include "Mcclient.h"
+# include "Mdefaults.h"
+#endif // USE_PCH
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
#include "Mpers.h"
@@ -33,9 +36,10 @@
#include <wx/regex.h>
-#include "Mcclient.h"
extern "C"
{
#include "utf8.h" // for utf8_text_utf7()
}
+
+class MOption;
// ----------------------------------------------------------------------------
Index: sysutil.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/sysutil.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- sysutil.cpp 11 Feb 1999 17:32:39 -0000 1.6
+++ sysutil.cpp 18 Sep 2003 16:31:03 -0000 1.7
@@ -9,17 +9,14 @@
#include "Mpch.h"
-#include "Mcommon.h"
#ifndef USE_PCH
+# include "Mcommon.h"
# include "sysutil.h"
# include "strutil.h"
-#endif
+#endif // USE_PCH
#ifdef OS_UNIX
-# include <sys/types.h>
-# include <sys/stat.h>
# include <unistd.h>
# include <fcntl.h>
-# include <errno.h>
#endif
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -b -u -2 -r1.213 -r1.214
--- upgrade.cpp 15 Sep 2003 17:01:42 -0000 1.213
+++ upgrade.cpp 18 Sep 2003 16:31:03 -0000 1.214
@@ -23,9 +23,21 @@
#ifndef USE_PCH
# include "Mcommon.h"
-# include "Mpers.h"
+# include "strutil.h"
+# include "Mdefaults.h"
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
+# if wxCHECK_VERSION(2,5,0)
+# include <wx/sizer.h> // for wxBoxSizer
+# endif
#endif //USE_PCH
+#include "Mpers.h"
+#include "SendMessage.h"
+
+#include <wx/version.h> // for wxCHECK_VERSION
+#include <wx/file.h> // for wxFile
+#include <wx/confbase.h> // Dumb fileconf.h doesn't pull dependencies
+#include <wx/fileconf.h>
+
// use wizard and not the old (and probably broken) dialog-based code
#define USE_WIZARD
@@ -44,6 +56,5 @@
#include "MailFolderCC.h"
-#include <wx/fileconf.h>
-#include <wx/file.h>
+#include <wx/confbase.h>
#ifdef USE_DIALUP
-------------------------------------------------------
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
