Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv21540/src/mail
Modified Files:
ASMailFolder.cpp MailFolder.cpp MailFolderCC.cpp
MailFolderCmn.cpp Pop3.cpp SendMessageCC.cpp VFolder.cpp
Log Message:
fixes for VC++ 6 warnings not disabled any more in wx/defs.h
Index: ASMailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/ASMailFolder.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -b -u -2 -r1.66 -r1.67
--- ASMailFolder.cpp 8 Sep 2002 19:23:11 -0000 1.66
+++ ASMailFolder.cpp 22 Jul 2003 22:01:42 -0000 1.67
@@ -248,4 +248,6 @@
int m_Flag;
bool m_Set;
+
+ DECLARE_NO_COPY_CLASS(MT_SetSequenceFlag)
};
@@ -905,5 +907,5 @@
@return ResultInt boolean
*/
- virtual Ticket UnDeleteMessages(const UIdArray *messages, UserData ud)
+ virtual Ticket UnDeleteMessages(const UIdArray *messages, UserData /* ud */)
{
return SetFlag(messages, MailFolder::MSG_STAT_DELETED, false);
Index: MailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolder.cpp,v
retrieving revision 1.298
retrieving revision 1.299
diff -b -u -2 -r1.298 -r1.299
--- MailFolder.cpp 11 Apr 2003 22:28:45 -0000 1.298
+++ MailFolder.cpp 22 Jul 2003 22:01:42 -0000 1.299
@@ -417,5 +417,5 @@
/* static */
-bool MailFolder::CanExit(String *which)
+bool MailFolder::CanExit(String * /* which */)
{
bool rc = true;
@@ -865,5 +865,5 @@
const MailFolder::Params& params,
Profile *profile,
- wxWindow *parent,
+ wxWindow * /* parent */,
Composer *cv)
{
@@ -1067,5 +1067,5 @@
const MailFolder::Params& params,
Profile *profile,
- wxWindow *parent,
+ wxWindow * /* parent */,
Composer *cv)
{
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.670
retrieving revision 1.671
diff -b -u -2 -r1.670 -r1.671
--- MailFolderCC.cpp 17 Jul 2003 23:48:07 -0000 1.670
+++ MailFolderCC.cpp 22 Jul 2003 22:01:42 -0000 1.671
@@ -397,5 +397,10 @@
{
public:
+ ConnCloseTimer() { }
+
virtual void Notify() { ServerInfoEntryCC::CheckTimeoutAll(); }
+
+ private:
+ DECLARE_NO_COPY_CLASS(ConnCloseTimer)
} *ms_connCloseTimer;
@@ -716,4 +721,7 @@
// the base label of the progress dialog
String m_msgProgress;
+
+
+ DECLARE_NO_COPY_CLASS(OverviewData)
};
@@ -1710,5 +1718,5 @@
void
-MailFolderCC::Create(MFolderType type, int flags)
+MailFolderCC::Create(MFolderType /* type */, int /* flags */)
{
m_MailStream = NIL;
@@ -4925,7 +4933,7 @@
void
MailFolderCC::mm_lsub(MAILSTREAM * stream,
- char delim ,
- String name,
- long attrib)
+ char /* delim */,
+ String /* name */,
+ long /* attrib */)
{
MailFolderCC *mf = LookupObject(stream);
@@ -5139,5 +5147,5 @@
*/
long
-MailFolderCC::mm_diskerror(MAILSTREAM *stream,
+MailFolderCC::mm_diskerror(MAILSTREAM * /* stream */,
long /* errcode */,
long /* serious */)
@@ -5257,8 +5265,8 @@
static char gs_delimiter = '\0';
-static void GetDelimiterMMList(MAILSTREAM *stream,
+static void GetDelimiterMMList(MAILSTREAM * /* stream */,
char delim,
- String name,
- long attrib)
+ String /* name */,
+ long /* attrib */)
{
if ( delim )
@@ -5867,5 +5875,5 @@
#ifdef USE_READ_PROGRESS
-void mahogany_read_progress(GETS_DATA *md, unsigned long count)
+void mahogany_read_progress(GETS_DATA * /* md */, unsigned long count)
{
if ( gs_readProgressInfo )
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -b -u -2 -r1.114 -r1.115
--- MailFolderCmn.cpp 15 Jul 2003 00:47:34 -0000 1.114
+++ MailFolderCmn.cpp 22 Jul 2003 22:01:42 -0000 1.115
@@ -191,4 +191,6 @@
private:
MfCloser *m_mfCloser;
+
+ DECLARE_NO_COPY_CLASS(MfCloseTimer)
};
@@ -230,4 +232,6 @@
// the interval of this timer (in seconds)
int m_interval;
+
+ DECLARE_NO_COPY_CLASS(MfCloser)
};
@@ -273,4 +277,6 @@
/// the mailfolder to update
MailFolderCmn *m_mf;
+
+ DECLARE_NO_COPY_CLASS(MailFolderTimer)
};
@@ -1377,5 +1383,5 @@
void
-MailFolderCmn::OnOptionsChange(MEventOptionsChangeData::ChangeKind kind)
+MailFolderCmn::OnOptionsChange(MEventOptionsChangeData::ChangeKind /* kind */)
{
MFCmnOptions config;
Index: Pop3.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Pop3.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- Pop3.cpp 12 Sep 2002 02:36:51 -0000 1.4
+++ Pop3.cpp 22 Jul 2003 22:01:42 -0000 1.5
@@ -82,4 +82,6 @@
const wxArrayString *m_uidls;
+
+ DECLARE_NO_COPY_CLASS(PopFlagsCacheFile)
};
@@ -138,5 +140,5 @@
}
-bool PopFlagsCacheFile::DoLoad(const wxTextFile& file, int version)
+bool PopFlagsCacheFile::DoLoad(const wxTextFile& file, int /* version */)
{
String uidl;
Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -b -u -2 -r1.208 -r1.209
--- SendMessageCC.cpp 15 Jul 2003 00:47:34 -0000 1.208
+++ SendMessageCC.cpp 22 Jul 2003 22:01:42 -0000 1.209
@@ -527,5 +527,5 @@
String
-SendMessageCC::EncodeHeaderString(const String& header, bool isaddr)
+SendMessageCC::EncodeHeaderString(const String& header, bool /* isaddr */)
{
// if a header contains "=?", encode it anyhow to avoid generating invalid
Index: VFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/VFolder.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- VFolder.cpp 8 Sep 2002 19:23:11 -0000 1.10
+++ VFolder.cpp 22 Jul 2003 22:01:42 -0000 1.11
@@ -117,8 +117,8 @@
MailFolder *
MailFolderVirt::OpenFolder(const MFolder *folder,
- const String& login,
- const String& password,
+ const String& /* login */,
+ const String& /* password */,
OpenMode openmode,
- wxFrame *frame)
+ wxFrame * /* frame */)
{
CHECK( folder, NULL, _T("NULL folder in MailFolderVirt::OpenFolder") );
@@ -130,5 +130,5 @@
/* static */
-bool MailFolderVirt::CheckStatus(const MFolder *folder)
+bool MailFolderVirt::CheckStatus(const MFolder * /* folder */)
{
// the status of a virtual folder never changes from outside so this is a
@@ -138,5 +138,5 @@
/* static */
-bool MailFolderVirt::DeleteFolder(const MFolder *folder)
+bool MailFolderVirt::DeleteFolder(const MFolder * /* folder */)
{
FAIL_MSG( _T("TODO") );
@@ -146,5 +146,6 @@
/* static */
-bool MailFolderVirt::RenameFolder(const MFolder *folder, const String& name)
+bool MailFolderVirt::RenameFolder(const MFolder * /* folder */,
+ const String& /* name */)
{
FAIL_MSG( _T("TODO") );
@@ -154,5 +155,5 @@
/* static */
-long MailFolderVirt::ClearFolder(const MFolder *folder)
+long MailFolderVirt::ClearFolder(const MFolder * /* folder */)
{
FAIL_MSG( _T("TODO") );
@@ -163,5 +164,6 @@
/* static */
String
-MailFolderVirt::GetFullImapSpec(const MFolder *folder, const String& login)
+MailFolderVirt::GetFullImapSpec(const MFolder *folder,
+ const String& /* login */)
{
CHECK( folder, "", _T("NULL folder in MailFolderVirt::GetFullImapSpec") );
@@ -188,5 +190,5 @@
}
-bool MailFolderVirt::CanSetFlag(int flags) const
+bool MailFolderVirt::CanSetFlag(int /* flags */) const
{
// all flags can be set even though not all of them make sense for us
@@ -641,5 +643,5 @@
}
-bool MailFolderVirt::AppendMessage(const String& msg)
+bool MailFolderVirt::AppendMessage(const String& /* msg */)
{
FAIL_MSG( _T("AppendMessage(string) can't be used with virtual folder") );
@@ -700,10 +702,10 @@
void
-MailFolderVirt::ListFolders(class ASMailFolder *asmf,
- const String &pattern,
- bool subscribed_only,
- const String &reference,
- UserData ud,
- Ticket ticket)
+MailFolderVirt::ListFolders(class ASMailFolder * /* asmf */,
+ const String& /* pattern */,
+ bool /* subscribed_only */,
+ const String& /* reference */,
+ UserData /* ud */,
+ Ticket /* ticket */)
{
// we never have any subfolders
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
