Update of /cvsroot/mahogany/M/src/mail
In directory usw-pr-cvs1:/tmp/cvs-serv1775/src/mail
Modified Files:
VFolder.cpp
Log Message:
renamed VirtualFolder to MailFolderVirt for consistency with MailFolderCC
Index: VFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/VFolder.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- VFolder.cpp 17 Jul 2002 00:06:29 -0000 1.2
+++ VFolder.cpp 17 Jul 2002 13:02:54 -0000 1.3
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
// Project: Mahogany - cross platform e-mail GUI client
-// File name: mail/VFolder.cpp: implementation of VirtualFolder class
+// File name: mail/VFolder.cpp: implementation of MailFolderVirt class
// Purpose: virtual folder provides MailFolder interface to the message
// physically living in other, different folders
@@ -61,12 +61,12 @@
(
"virtual",
- VirtualFolder::Init,
- VirtualFolder::OpenFolder,
- VirtualFolder::CheckStatus,
- VirtualFolder::DeleteFolder,
- VirtualFolder::RenameFolder,
- VirtualFolder::ClearFolder,
- VirtualFolder::GetFullImapSpec,
- VirtualFolder::Cleanup
+ MailFolderVirt::Init,
+ MailFolderVirt::OpenFolder,
+ MailFolderVirt::CheckStatus,
+ MailFolderVirt::DeleteFolder,
+ MailFolderVirt::RenameFolder,
+ MailFolderVirt::ClearFolder,
+ MailFolderVirt::GetFullImapSpec,
+ MailFolderVirt::Cleanup
);
@@ -76,8 +76,8 @@
// ----------------------------------------------------------------------------
-// VirtualFolder ctor/dtor
+// MailFolderVirt ctor/dtor
// ----------------------------------------------------------------------------
-VirtualFolder::VirtualFolder(const MFolder *folder, OpenMode openmode)
+MailFolderVirt::MailFolderVirt(const MFolder *folder, OpenMode openmode)
: m_folder((MFolder *)folder), m_openMode(openmode)
{
@@ -85,5 +85,5 @@
}
-VirtualFolder::~VirtualFolder()
+MailFolderVirt::~MailFolderVirt()
{
Close();
@@ -95,9 +95,9 @@
// ----------------------------------------------------------------------------
-// VirtualFolder driver methods
+// MailFolderVirt driver methods
// ----------------------------------------------------------------------------
/* static */
-bool VirtualFolder::Init()
+bool MailFolderVirt::Init()
{
return true;
@@ -105,5 +105,5 @@
/* static */
-void VirtualFolder::Cleanup()
+void MailFolderVirt::Cleanup()
{
// NOOP
@@ -112,5 +112,5 @@
/* static */
MailFolder *
-VirtualFolder::OpenFolder(const MFolder *folder,
+MailFolderVirt::OpenFolder(const MFolder *folder,
const String& login,
const String& password,
@@ -118,7 +118,7 @@
wxFrame *frame)
{
- CHECK( folder, NULL, "NULL folder in VirtualFolder::OpenFolder" );
+ CHECK( folder, NULL, "NULL folder in MailFolderVirt::OpenFolder" );
- VirtualFolder *vf = new VirtualFolder(folder, openmode);
+ MailFolderVirt *vf = new MailFolderVirt(folder, openmode);
return vf;
@@ -126,5 +126,5 @@
/* static */
-bool VirtualFolder::CheckStatus(const MFolder *folder)
+bool MailFolderVirt::CheckStatus(const MFolder *folder)
{
// the status of a virtual folder never changes from outside so this is a
@@ -134,5 +134,5 @@
/* static */
-bool VirtualFolder::DeleteFolder(const MFolder *folder)
+bool MailFolderVirt::DeleteFolder(const MFolder *folder)
{
FAIL_MSG( "TODO" );
@@ -142,5 +142,5 @@
/* static */
-bool VirtualFolder::RenameFolder(const MFolder *folder, const String& name)
+bool MailFolderVirt::RenameFolder(const MFolder *folder, const String& name)
{
FAIL_MSG( "TODO" );
@@ -150,5 +150,5 @@
/* static */
-long VirtualFolder::ClearFolder(const MFolder *folder)
+long MailFolderVirt::ClearFolder(const MFolder *folder)
{
FAIL_MSG( "TODO" );
@@ -159,7 +159,7 @@
/* static */
String
-VirtualFolder::GetFullImapSpec(const MFolder *folder, const String& login)
+MailFolderVirt::GetFullImapSpec(const MFolder *folder, const String& login)
{
- CHECK( folder, "", "NULL folder in VirtualFolder::GetFullImapSpec" );
+ CHECK( folder, "", "NULL folder in MailFolderVirt::GetFullImapSpec" );
return folder->GetFullName();
@@ -167,8 +167,8 @@
// ----------------------------------------------------------------------------
-// trivial VirtualFolder accessors
+// trivial MailFolderVirt accessors
// ----------------------------------------------------------------------------
-bool VirtualFolder::IsOpened() const
+bool MailFolderVirt::IsOpened() const
{
// we're always opened for as long as we exist
@@ -176,10 +176,10 @@
}
-bool VirtualFolder::IsReadOnly() const
+bool MailFolderVirt::IsReadOnly() const
{
return m_openMode == ReadOnly;
}
-bool VirtualFolder::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
@@ -187,5 +187,5 @@
}
-bool VirtualFolder::IsInCriticalSection() const
+bool MailFolderVirt::IsInCriticalSection() const
{
// we never do anything critical
@@ -193,5 +193,5 @@
}
-ServerInfoEntry *VirtualFolder::CreateServerInfo(const MFolder *folder) const
+ServerInfoEntry *MailFolderVirt::CreateServerInfo(const MFolder *folder) const
{
// we use the trivial server info implementation as we never reuse them and
@@ -200,5 +200,5 @@
}
-char VirtualFolder::GetFolderDelimiter() const
+char MailFolderVirt::GetFolderDelimiter() const
{
// the virtual folder name space is flat
@@ -206,20 +206,20 @@
}
-String VirtualFolder::GetName() const
+String MailFolderVirt::GetName() const
{
return m_folder->GetFullName();
}
-String VirtualFolder::GetImapSpec() const
+String MailFolderVirt::GetImapSpec() const
{
return GetName();
}
-MFolderType VirtualFolder::GetType() const
+MFolderType MailFolderVirt::GetType() const
{
return m_folder->GetType();
}
-int VirtualFolder::GetFlags() const
+int MailFolderVirt::GetFlags() const
{
return m_folder->GetFlags();
@@ -227,5 +227,5 @@
// the pointer returned by this function should *NOT* be DecRef()'d
-Profile *VirtualFolder::GetProfile() const
+Profile *MailFolderVirt::GetProfile() const
{
Profile *profile = m_folder->GetProfile();
@@ -241,25 +241,25 @@
// ----------------------------------------------------------------------------
-// VirtualFolder methods working with m_messages
+// MailFolderVirt methods working with m_messages
// ----------------------------------------------------------------------------
-VirtualFolder::Msg *VirtualFolder::GetMsgFromMsgno(MsgnoType msgno) const
+MailFolderVirt::Msg *MailFolderVirt::GetMsgFromMsgno(MsgnoType msgno) const
{
msgno--;
CHECK( 0 <= msgno && msgno < GetMsgCount(), NULL,
- "invalid msgno in VirtualFolder" );
+ "invalid msgno in MailFolderVirt" );
return m_messages[(size_t)msgno];
}
-void VirtualFolder::AddMsg(VirtualFolder::Msg *msg)
+void MailFolderVirt::AddMsg(MailFolderVirt::Msg *msg)
{
- CHECK_RET( msg, "NULL Msg in VirtualFolder?" );
+ CHECK_RET( msg, "NULL Msg in MailFolderVirt?" );
m_messages.Add(msg);
}
-VirtualFolder::Msg *VirtualFolder::GetFirstMsg(MsgCookie& cookie) const
+MailFolderVirt::Msg *MailFolderVirt::GetFirstMsg(MsgCookie& cookie) const
{
cookie = 0;
@@ -268,5 +268,5 @@
}
-VirtualFolder::Msg *VirtualFolder::GetNextMsg(MsgCookie& cookie) const
+MailFolderVirt::Msg *MailFolderVirt::GetNextMsg(MsgCookie& cookie) const
{
size_t count = GetMsgCount();
@@ -278,5 +278,5 @@
{
// shouldn't be > than it!
- ASSERT_MSG( cookie == count, "invalid msg index in VirtualFolder" );
+ ASSERT_MSG( cookie == count, "invalid msg index in MailFolderVirt" );
return NULL;
@@ -284,7 +284,7 @@
}
-void VirtualFolder::DeleteMsg(MsgCookie& cookie)
+void MailFolderVirt::DeleteMsg(MsgCookie& cookie)
{
- CHECK_RET( cookie < GetMsgCount(), "invalid UID in VirtualFolder" );
+ CHECK_RET( cookie < GetMsgCount(), "invalid UID in MailFolderVirt" );
delete m_messages[cookie];
@@ -294,5 +294,5 @@
}
-void VirtualFolder::ClearMsgs()
+void MailFolderVirt::ClearMsgs()
{
WX_CLEAR_ARRAY(m_messages);
@@ -300,17 +300,17 @@
// ----------------------------------------------------------------------------
-// VirtualFolder access control
+// MailFolderVirt access control
// ----------------------------------------------------------------------------
-bool VirtualFolder::Lock() const
+bool MailFolderVirt::Lock() const
{
return true;
}
-void VirtualFolder::UnLock() const
+void MailFolderVirt::UnLock() const
{
}
-bool VirtualFolder::IsLocked() const
+bool MailFolderVirt::IsLocked() const
{
return false;
@@ -318,9 +318,9 @@
// ----------------------------------------------------------------------------
-// VirtualFolder operations on headers
+// MailFolderVirt operations on headers
// ----------------------------------------------------------------------------
MsgnoType
-VirtualFolder::GetHeaderInfo(ArrayHeaderInfo& headers, const Sequence& seq)
+MailFolderVirt::GetHeaderInfo(ArrayHeaderInfo& headers, const Sequence& seq)
{
size_t count = 0;
@@ -365,10 +365,10 @@
-unsigned long VirtualFolder::GetMessageCount() const
+unsigned long MailFolderVirt::GetMessageCount() const
{
return GetMsgCount();
}
-unsigned long VirtualFolder::CountNewMessages() const
+unsigned long MailFolderVirt::CountNewMessages() const
{
unsigned long count = 0;
@@ -384,5 +384,5 @@
}
-unsigned long VirtualFolder::CountRecentMessages() const
+unsigned long MailFolderVirt::CountRecentMessages() const
{
unsigned long count = 0;
@@ -398,5 +398,5 @@
}
-unsigned long VirtualFolder::CountUnseenMessages() const
+unsigned long MailFolderVirt::CountUnseenMessages() const
{
unsigned long count = 0;
@@ -412,5 +412,5 @@
}
-unsigned long VirtualFolder::CountDeletedMessages() const
+unsigned long MailFolderVirt::CountDeletedMessages() const
{
unsigned long count = 0;
@@ -426,5 +426,5 @@
}
-bool VirtualFolder::DoCountMessages(MailFolderStatus *status) const
+bool MailFolderVirt::DoCountMessages(MailFolderStatus *status) const
{
status->Init();
@@ -458,5 +458,5 @@
}
-MsgnoType VirtualFolder::GetMsgnoFromUID(UIdType uid) const
+MsgnoType MailFolderVirt::GetMsgnoFromUID(UIdType uid) const
{
// UIDs are the same as msgnos for us for now...
@@ -465,8 +465,8 @@
// ----------------------------------------------------------------------------
-// other VirtualFolder operations
+// other MailFolderVirt operations
// ----------------------------------------------------------------------------
-bool VirtualFolder::Ping()
+bool MailFolderVirt::Ping()
{
// we never get any new mail
@@ -474,10 +474,10 @@
}
-void VirtualFolder::Checkpoint()
+void MailFolderVirt::Checkpoint()
{
// NOOP
}
-Message *VirtualFolder::GetMessage(unsigned long uid)
+Message *MailFolderVirt::GetMessage(unsigned long uid)
{
const Msg *msg = GetMsgFromUID(uid);
@@ -487,7 +487,5 @@
bool
-VirtualFolder::SetMessageFlag(unsigned long uid,
- int flag,
- bool set)
+MailFolderVirt::SetMessageFlag(unsigned long uid, int flag, bool set)
{
Msg *msg = GetMsgFromUID(uid);
@@ -505,5 +503,5 @@
bool
-VirtualFolder::SetSequenceFlag(SequenceKind kind,
+MailFolderVirt::SetSequenceFlag(SequenceKind kind,
const Sequence& seq,
int flag,
@@ -525,5 +523,5 @@
}
-bool VirtualFolder::AppendMessage(const Message& msg)
+bool MailFolderVirt::AppendMessage(const Message& msg)
{
MailFolder *mf = msg.GetFolder();
@@ -545,5 +543,5 @@
}
-bool VirtualFolder::AppendMessage(const String& msg)
+bool MailFolderVirt::AppendMessage(const String& msg)
{
FAIL_MSG( "AppendMessage(string) can't be used with virtual folder" );
@@ -552,5 +550,5 @@
}
-void VirtualFolder::ExpungeMessages()
+void MailFolderVirt::ExpungeMessages()
{
MsgCookie cookie;
@@ -565,5 +563,5 @@
MsgnoArray *
-VirtualFolder::SearchByFlag(MessageStatus flag,
+MailFolderVirt::SearchByFlag(MessageStatus flag,
int flags,
MsgnoType last) const
@@ -601,5 +599,5 @@
void
-VirtualFolder::ListFolders(class ASMailFolder *asmf,
+MailFolderVirt::ListFolders(class ASMailFolder *asmf,
const String &pattern,
bool subscribed_only,
-------------------------------------------------------
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
