adb AdbDialogs.cpp,1.25,1.26 AdbExport.cpp,1.4,1.5 AdbFrame.cpp,1.111,1.112 AdbImport.cpp,1.20,1.21 AdbManager.cpp,1.40,1.41 AdbModule.cpp,1.4,1.5 AdbProvider.cpp,1.7,1.8 Collect.cpp,1.17,1.18 ExportPalm.cpp,1.12,1.13 ExportText.cpp,1.9,1.10 ExportVCard.cpp,1.1,1.2 ImportEudora.cpp,1.7,1.8 ImportMailrc.cpp,1.8,1.9 ImportPine.cpp,1.9,1.10 ImportText.cpp,1.9,1.10 ImportVCard.cpp,1.7,1.8 ImportXFMail.cpp,1.9,1.10 ProvBbdb.cpp,1.34,1.35 ProvDummy.cpp,1.25,1.26 ProvFC.cpp,1.41,1.42 ProvLine.cpp,1.4,1.5 ProvPalm.cpp,1.21,1.22 ProvPasswd.cpp,1.14,1.15

Robert Vazan Thu, 18 Sep 2003 09:32:40 -0700

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


Modified Files:
        AdbDialogs.cpp AdbExport.cpp AdbFrame.cpp AdbImport.cpp 
        AdbManager.cpp AdbModule.cpp AdbProvider.cpp Collect.cpp 
        ExportPalm.cpp ExportText.cpp ExportVCard.cpp ImportEudora.cpp 
        ImportMailrc.cpp ImportPine.cpp ImportText.cpp ImportVCard.cpp 
        ImportXFMail.cpp ProvBbdb.cpp ProvDummy.cpp ProvFC.cpp 
        ProvLine.cpp ProvPalm.cpp ProvPasswd.cpp 
Log Message:
Include dependencies cleanup, stage two (final so far)

Index: AdbDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbDialogs.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- AdbDialogs.cpp      31 Aug 2003 13:04:04 -0000      1.25
+++ AdbDialogs.cpp      18 Sep 2003 16:30:46 -0000      1.26
@@ -24,16 +24,14 @@
 #   include "Mcommon.h"
 #   include "MApplication.h"
-#   include "guidef.h"
 
 #   include <wx/layout.h>
-#   include <wx/listbox.h>
-#   include <wx/stattext.h>
+#   include <wx/listbox.h>              // for wxListBox
+#   include <wx/stattext.h>             // for wxStaticText
 #   include <wx/statbmp.h>
 #   include <wx/statbox.h>
 #   include <wx/choicdlg.h>
+#   include <wx/filedlg.h>
 #endif //USE_PCH
 
-#include "Mdefaults.h"
-
 #include "adb/AdbImport.h"
 #include "adb/AdbExport.h"
@@ -41,8 +39,8 @@
 #include "adb/AdbManager.h"
 
-#include "gui/wxIconManager.h"
-#include "gui/wxBrowseButton.h"
 #include "gui/wxDialogLayout.h"
 #include "gui/wxMDialogs.h"
+
+#include <wx/confbase.h>
 
 // ----------------------------------------------------------------------------

Index: AdbExport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbExport.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- AdbExport.cpp       28 Dec 2002 02:28:33 -0000      1.4
+++ AdbExport.cpp       18 Sep 2003 16:30:46 -0000      1.5
@@ -27,6 +27,4 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-
-   #include <wx/log.h>
 #endif // USE_PCH
 

Index: AdbFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbFrame.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -b -u -2 -r1.111 -r1.112
--- AdbFrame.cpp        14 Sep 2003 16:10:45 -0000      1.111
+++ AdbFrame.cpp        18 Sep 2003 16:30:46 -0000      1.112
@@ -23,23 +23,15 @@
 
 #ifndef  USE_PCH
-#   include "kbList.h"
-
-#   include "guidef.h"
-#   include "strutil.h"
-
 #   include "Mcommon.h"
-#   include "MFrame.h"
-#   include "gui/wxMFrame.h"
-
+#   include "strutil.h"
 #   include "MApplication.h"
-#   include "gui/wxMApp.h"
 #   include "MHelp.h"
-#   include <ctype.h>
+#   include "Profile.h"
+#   include "Mdefaults.h"
 #endif //USE_PCH
 
-#include "MDialogs.h"
-#include "Mdefaults.h"
+#include "wx/persctrl.h"
 #include "gui/wxMenuDefs.h"
-#include "gui/wxIconManager.h"
+#include "gui/wxMDialogs.h"
 
 #undef   CreateListBox
@@ -47,8 +39,5 @@
 // wxWindows
 #ifndef USE_PCH
-#   include <wx/frame.h>
-#   include <wx/log.h>
-#   include <wx/confbase.h>
-#   include <wx/dynarray.h>
+#   include <wx/log.h>          // for wxLogError
 #   include <wx/toolbar.h>
 #   include <wx/menu.h>
@@ -56,13 +45,15 @@
 #   include <wx/statbox.h>
 #   include <wx/choicdlg.h>
-#   include <wx/stattext.h>
+#   include <wx/stattext.h>     // for wxStaticText
+#   include <wx/textctrl.h>
+#   include <wx/button.h>       // for wxButton
+#   include <wx/filedlg.h>
 #endif // USE_PCH
 
-#include <wx/notebook.h>
-#include <wx/treectrl.h>
-#include <wx/file.h>
-#include <wx/imaglist.h>
-
-#include "wx/persctrl.h"
+#include <wx/notebook.h>        // for wxNotebook
+#include <wx/treectrl.h>        // for wxTreeCtrl
+#include <wx/file.h>            // for wxFile
+#include <wx/imaglist.h>        // for wxImageList
+#include <wx/confbase.h>        // for wxConfigBase
 
 #include "adb/AdbManager.h"
@@ -77,4 +68,9 @@
 // our public interface
 #include "adb/AdbFrame.h"
+
+class MPersMsgBox;
+class MOption;
+class wxPTextEntry;
+class WXDLLEXPORT wxFrame;
 
 // ----------------------------------------------------------------------------

Index: AdbImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbImport.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- AdbImport.cpp       28 Dec 2002 02:28:33 -0000      1.20
+++ AdbImport.cpp       18 Sep 2003 16:30:46 -0000      1.21
@@ -30,8 +30,8 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
+   #include <wx/log.h>          // for wxLogDebug
 #endif // USE_PCH
 
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
 
 #include "adb/AdbDataProvider.h"

Index: AdbManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbManager.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- AdbManager.cpp      14 Sep 2003 16:10:45 -0000      1.40
+++ AdbManager.cpp      18 Sep 2003 16:30:46 -0000      1.41
@@ -26,7 +26,7 @@
 #  include "MApplication.h"
 
-#  include <wx/log.h>
+#  include <wx/log.h>           // for wxLogStatus
 #  include <wx/config.h>
-#  include <wx/dynarray.h>
+#  include <wx/dynarray.h>      // for wxArrayString
 #endif // USE_PCH
 

Index: AdbModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbModule.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- AdbModule.cpp       13 Sep 2002 01:27:47 -0000      1.4
+++ AdbModule.cpp       18 Sep 2003 16:30:46 -0000      1.5
@@ -32,5 +32,5 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
+   #include <wx/log.h>          // for wxLogDebug
 #endif // USE_PCH
 

Index: AdbProvider.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbProvider.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- AdbProvider.cpp     28 Dec 2002 02:28:33 -0000      1.7
+++ AdbProvider.cpp     18 Sep 2003 16:30:46 -0000      1.8
@@ -19,7 +19,7 @@
 // ----------------------------------------------------------------------------
 #include "Mpch.h"
-#ifndef M_PCH
+#ifndef USE_PCH
 #   include "Mcommon.h"
-#endif
+#endif // USE_PCH
 
 #include "adb/AdbDataProvider.h"

Index: Collect.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/Collect.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- Collect.cpp 28 Dec 2002 02:28:33 -0000      1.17
+++ Collect.cpp 18 Sep 2003 16:30:46 -0000      1.18
@@ -26,12 +26,11 @@
 
    #include <wx/log.h>
-
-   #include "Message.h"
 #endif // USE_PCH
 
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
 
 #include "Address.h"
 #include "Collect.h"
+#include "Message.h"
 
 #include "adb/AdbManager.h"

Index: ExportPalm.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportPalm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- ExportPalm.cpp      13 Sep 2002 01:27:47 -0000      1.12
+++ ExportPalm.cpp      18 Sep 2003 16:30:46 -0000      1.13
@@ -24,17 +24,12 @@
 #   include "Mcommon.h"
 
-#   include <wx/log.h>
-#   include <wx/dynarray.h>
-
 #   include "MApplication.h"
-#   include "guidef.h"
 
+#   include <wx/log.h>                  // for wxLogMessage
 #   include <wx/layout.h>
-#   include <wx/stattext.h>
 #endif // USE_PCH
 
 #include <wx/textfile.h>
 #include <wx/ffile.h>
-#include "wx/persctrl.h"
 
 #include "gui/wxDialogLayout.h"

Index: ExportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportText.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- ExportText.cpp      22 Jul 2003 22:01:39 -0000      1.9
+++ ExportText.cpp      18 Sep 2003 16:30:47 -0000      1.10
@@ -26,18 +26,14 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>                  // for wxLogMessage
 
    #include "MApplication.h"
 
-   #include "guidef.h"
-
    #include <wx/layout.h>
-   #include <wx/stattext.h>
+   #include <wx/stattext.h>             // for wxStaticText
 #endif // USE_PCH
 
 #include <wx/textfile.h>
 #include <wx/ffile.h>
-#include "wx/persctrl.h"
 
 #include "gui/wxDialogLayout.h"

Index: ExportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ExportVCard.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- ExportVCard.cpp     19 May 2000 17:16:00 -0000      1.1
+++ ExportVCard.cpp     18 Sep 2003 16:30:47 -0000      1.2
@@ -26,4 +26,7 @@
 
    #include "guidef.h"
+
+   #include <wx/dirdlg.h>
+   #include <wx/filedlg.h>
 #endif // USE_PCH
 
@@ -32,5 +35,4 @@
 
 #include <wx/dir.h>
-#include <wx/dirdlg.h>
 #include <wx/datetime.h>
 #include <wx/vcard.h>

Index: ImportEudora.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportEudora.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ImportEudora.cpp    30 Jul 2003 00:08:06 -0000      1.7
+++ ImportEudora.cpp    18 Sep 2003 16:30:47 -0000      1.8
@@ -60,10 +60,8 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>                  // for wxLogWarning
 #endif // USE_PCH
 
 #include <wx/textfile.h>
-#include <wx/utils.h>
 
 #include "adb/AdbEntry.h"

Index: ImportMailrc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportMailrc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ImportMailrc.cpp    30 Jul 2003 00:08:07 -0000      1.8
+++ ImportMailrc.cpp    18 Sep 2003 16:30:47 -0000      1.9
@@ -25,11 +25,9 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>          // for wxLogWarning
 #endif // USE_PCH
 
 #include <wx/confbase.h>      // for wxExpandEnvVars
 #include <wx/textfile.h>
-#include <wx/utils.h>
 
 #include "adb/AdbEntry.h"

Index: ImportPine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportPine.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- ImportPine.cpp      22 Jul 2003 22:01:39 -0000      1.9
+++ ImportPine.cpp      18 Sep 2003 16:30:47 -0000      1.10
@@ -29,9 +29,9 @@
    #include <wx/log.h>
    #include <wx/dynarray.h>
+   #include <wx/utils.h>
 #endif // USE_PCH
 
 #include <wx/confbase.h>      // for wxExpandEnvVars
 #include <wx/textfile.h>
-#include <wx/utils.h>
 
 #include "adb/AdbEntry.h"

Index: ImportText.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportText.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- ImportText.cpp      22 Jul 2003 22:01:39 -0000      1.9
+++ ImportText.cpp      18 Sep 2003 16:30:47 -0000      1.10
@@ -34,10 +34,9 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>                  // for wxLogDebug
+   #include <wx/utils.h>                   // for wxMin
 #endif // USE_PCH
 
 #include <wx/textfile.h>
-#include <wx/utils.h>
 
 #include "adb/AdbEntry.h"

Index: ImportVCard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportVCard.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- ImportVCard.cpp     22 Jul 2003 22:01:39 -0000      1.7
+++ ImportVCard.cpp     18 Sep 2003 16:30:47 -0000      1.8
@@ -24,6 +24,5 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>                  // for wxLogNull
 #endif // USE_PCH
 

Index: ImportXFMail.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportXFMail.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- ImportXFMail.cpp    30 Jul 2003 00:08:07 -0000      1.9
+++ ImportXFMail.cpp    18 Sep 2003 16:30:47 -0000      1.10
@@ -26,11 +26,9 @@
    #include "Mcommon.h"
 
-   #include <wx/log.h>
-   #include <wx/dynarray.h>
+   #include <wx/log.h>          // for wxLogVerbose
 #endif // USE_PCH
 
 #include <wx/confbase.h>      // for wxExpandEnvVars
 #include <wx/textfile.h>
-#include <wx/utils.h>
 
 #include "adb/AdbEntry.h"

Index: ProvBbdb.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvBbdb.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -u -2 -r1.34 -r1.35
--- ProvBbdb.cpp        14 Sep 2003 16:10:46 -0000      1.34
+++ ProvBbdb.cpp        18 Sep 2003 16:30:47 -0000      1.35
@@ -28,19 +28,16 @@
 #ifndef  USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
 #  include "Profile.h"
 #  include "MApplication.h"
 #  include "strutil.h"
 #  include "sysutil.h"
+#  include "kbList.h"                   // for KBLIST_DEFINE
+#  include "Mdefaults.h"
 
-#  include <wx/string.h>
-#  include <wx/log.h>
-#  include <wx/dynarray.h>
-#  include <wx/filefn.h>
-#  include <wx/app.h>
+#  include <wx/string.h>                // for wxString
+#  include <wx/log.h>                   // for wxLogWarning
 #endif //USE_PCH
 
-#include "Mdefaults.h"
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
 
 #include "adb/AdbManager.h"
@@ -50,15 +47,13 @@
 
 // wxWindows
-#include <wx/utils.h>
-#include <wx/minifram.h>
 #include <wx/file.h>
 
-#include "kbList.h"
-
 #if wxUSE_IOSTREAMH
-#  include <fstream.h>
+#  include <fstream.h>                  // for ifstream
 #else
-#  include <fstream>
+#  include <fstream>                    // for ifstream
 #endif
+
+class MOption;
 
 // ----------------------------------------------------------------------------

Index: ProvDummy.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvDummy.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- ProvDummy.cpp       22 Aug 2003 09:53:42 -0000      1.25
+++ ProvDummy.cpp       18 Sep 2003 16:30:47 -0000      1.26
@@ -28,12 +28,7 @@
 #ifndef  USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
 
-#  include <wx/string.h>
-#  include <wx/log.h>
-#  include <wx/dynarray.h>
+#  include <wx/string.h>                // for wxString
 #endif //USE_PCH
-
-#include "MDialogs.h"
 
 #include "adb/AdbManager.h"

Index: ProvFC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvFC.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- ProvFC.cpp  13 Sep 2003 16:03:15 -0000      1.41
+++ ProvFC.cpp  18 Sep 2003 16:30:47 -0000      1.42
@@ -45,18 +45,14 @@
 #ifndef  USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
 #  include "strutil.h"
 #  include "sysutil.h"
 #  include "MApplication.h"
-#  include <ctype.h>
 
-#  include <wx/string.h>
-#  include <wx/log.h>
-#  include <wx/dynarray.h>
+#  include <wx/string.h>                // for wxString
+#  include <wx/log.h>                   // for wxLogWarning
 #endif //USE_PCH
 
 // wxWindows
-#include <wx/file.h>
-#include <wx/textfile.h>
+#include <wx/file.h>                    // for wxFile
 #include <wx/confbase.h>
 #include <wx/fileconf.h>

Index: ProvLine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvLine.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- ProvLine.cpp        13 Sep 2003 16:03:15 -0000      1.4
+++ ProvLine.cpp        18 Sep 2003 16:30:47 -0000      1.5
@@ -29,6 +29,4 @@
 #endif //USE_PCH
 
-#include <ctype.h>
-
 #include <wx/file.h>
 

Index: ProvPalm.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPalm.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -u -2 -r1.21 -r1.22
--- ProvPalm.cpp        13 Sep 2003 16:03:15 -0000      1.21
+++ ProvPalm.cpp        18 Sep 2003 16:30:47 -0000      1.22
@@ -26,7 +26,9 @@
 #  include "sysutil.h"
 #  include "MApplication.h"
-#  include <ctype.h>
+#  include "kbList.h"
 #endif //USE_PCH
 
+#include <ctype.h>
+
 #include "adb/AdbManager.h"
 #include "adb/AdbEntry.h"
@@ -36,5 +38,4 @@
 #include <pi-address.h>
 #include "MModule.h"
-#include "kbList.h"
 #include "adb/ProvPalm.h"   // class declarations
 

Index: ProvPasswd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPasswd.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- ProvPasswd.cpp      13 Sep 2003 16:03:15 -0000      1.14
+++ ProvPasswd.cpp      18 Sep 2003 16:30:47 -0000      1.15
@@ -28,7 +28,11 @@
 #ifndef  USE_PCH
 #  include "Mcommon.h"
+// FIXME: we shouldn't use the apps functions from modules...
+#  include "MApplication.h"
+#  include "Profile.h"
+#  include "Mdefaults.h"
 
-#  include <wx/string.h>
-#  include <wx/dynarray.h>
+#  include <wx/string.h>                // for wxString
+#  include <wx/dynarray.h>              // for wxSortedArrayString
 #endif //USE_PCH
 
@@ -42,9 +46,4 @@
 #include <pwd.h>
 #include <sys/types.h>
-
-// FIXME: we shouldn't use the apps functions from modules...
-#include "MApplication.h"
-#include "Profile.h"
-#include "Mdefaults.h"
 
 extern const MOption MP_HOSTNAME;



-------------------------------------------------------
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