Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv29429/include
Modified Files:
Profile.h Mdefaults.h
Log Message:
resolved circular header dependency
Index: Profile.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Profile.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -b -u -2 -r1.71 -r1.72
--- Profile.h 14 Apr 2002 12:16:54 -0000 1.71
+++ Profile.h 14 Apr 2002 12:46:00 -0000 1.72
@@ -28,4 +28,51 @@
// ----------------------------------------------------------------------------
+// profile-related constants
+// ----------------------------------------------------------------------------
+
+/** @name The sections of the configuration file. */
+///@{
+
+/**
+ The section in the global configuration file used for storing
+ profiles (without trailing '/')
+*/
+#ifndef M_PROFILE_CONFIG_SECTION
+ #define M_PROFILE_CONFIG_SECTION "/M/Profiles"
+ #define M_IDENTITY_CONFIG_SECTION "/M/Ids"
+ #define M_FILTERS_CONFIG_SECTION "/M/Filters"
+ #define M_FRAMES_CONFIG_SECTION "/M/Frames"
+ #define M_TEMPLATES_CONFIG_SECTION "/M/Templates"
+#endif
+
+/**
+ The section in the global configuration file used for storing
+ folder profiles (without trailing '/')
+*/
+#ifndef M_FOLDER_CONFIG_SECTION
+# define M_FOLDER_CONFIG_SECTION M_PROFILE_CONFIG_SECTION
+#endif
+
+/**
+ The section in the global configuration file used for storing
+ control settings.
+*/
+#define M_SETTINGS_CONFIG_SECTION "Settings"
+
+/// the root path for all ADB editor config entries
+#define ADB_CONFIG_PATH "AdbEditor"
+
+/** @name Keys where the template for messages of given type is stored */
+//@{
+#define MP_TEMPLATE_NEWMESSAGE "NewMessage"
+#define MP_TEMPLATE_NEWARTICLE "NewArticle"
+#define MP_TEMPLATE_REPLY "Reply"
+#define MP_TEMPLATE_FOLLOWUP "Followup"
+#define MP_TEMPLATE_FORWARD "Forward"
+//@}
+
+//@}
+
+// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
Index: Mdefaults.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mdefaults.h,v
retrieving revision 1.253
retrieving revision 1.254
diff -b -u -2 -r1.253 -r1.254
--- Mdefaults.h 14 Apr 2002 12:16:54 -0000 1.253
+++ Mdefaults.h 14 Apr 2002 12:46:01 -0000 1.254
@@ -18,47 +18,4 @@
#include "Profile.h"
-/** @name The sections of the configuration file. */
-///@{
-
-/**
- The section in the global configuration file used for storing
- profiles (without trailing '/')
-*/
-#ifndef M_PROFILE_CONFIG_SECTION
- #define M_PROFILE_CONFIG_SECTION "/M/Profiles"
- #define M_IDENTITY_CONFIG_SECTION "/M/Ids"
- #define M_FILTERS_CONFIG_SECTION "/M/Filters"
- #define M_FRAMES_CONFIG_SECTION "/M/Frames"
- #define M_TEMPLATES_CONFIG_SECTION "/M/Templates"
-#endif
-
-/**
- The section in the global configuration file used for storing
- folder profiles (without trailing '/')
-*/
-#ifndef M_FOLDER_CONFIG_SECTION
-# define M_FOLDER_CONFIG_SECTION M_PROFILE_CONFIG_SECTION
-#endif
-
-/**
- The section in the global configuration file used for storing
- control settings.
-*/
-#define M_SETTINGS_CONFIG_SECTION "Settings"
-
-/// the root path for all ADB editor config entries
-#define ADB_CONFIG_PATH "AdbEditor"
-
-/** @name Keys where the template for messages of given type is stored */
-//@{
-#define MP_TEMPLATE_NEWMESSAGE "NewMessage"
-#define MP_TEMPLATE_NEWARTICLE "NewArticle"
-#define MP_TEMPLATE_REPLY "Reply"
-#define MP_TEMPLATE_FOLLOWUP "Followup"
-#define MP_TEMPLATE_FORWARD "Forward"
-//@}
-
-//@}
-
// under Windows 12pt font looks too huge, letters are like in a book for
// children
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
