Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1:/tmp/cvs-serv27168/src/mail
Modified Files:
MailFolder.cpp MailFolderCC.cpp MailFolderCmn.cpp Message.cpp
MessageCC.cpp SendMessageCC.cpp VFolder.cpp
Log Message:
gcc compilation fixes after smartp ointers change
Index: MailFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolder.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -b -u -2 -r1.302 -r1.303
--- MailFolder.cpp 19 Sep 2003 13:31:22 -0000 1.302
+++ MailFolder.cpp 30 Sep 2003 13:46:20 -0000 1.303
@@ -276,5 +276,5 @@
//
// FIXME: using GetLogin() here is wrong, see comments before MFPool::Find()
- MailFolder_obj mf = MFPool::Find(driver, folder, folder->GetLogin());
+ MailFolder_obj mf(MFPool::Find(driver, folder, folder->GetLogin()));
if ( !mf )
{
@@ -1114,5 +1114,5 @@
case MF_IMAP:
// for IMAP this depends on server
- MailFolder_obj mfTmp = OpenFolder(folder, HalfOpen);
+ MailFolder_obj mfTmp(OpenFolder(folder, HalfOpen));
if ( !mfTmp )
{
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.677
retrieving revision 1.678
diff -b -u -2 -r1.677 -r1.678
--- MailFolderCC.cpp 19 Sep 2003 21:48:48 -0000 1.677
+++ MailFolderCC.cpp 30 Sep 2003 13:46:21 -0000 1.678
@@ -3116,5 +3116,5 @@
// examine flags of all messages we copied
- HeaderInfoList_obj headers = GetHeaders();
+ HeaderInfoList_obj headers(GetHeaders());
for ( size_t n = 0; n < count; n++ )
{
@@ -3331,5 +3331,5 @@
CHECK_DEAD_RC(_T("Cannot access closed folder '%s'."), NULL);
- HeaderInfoList_obj headers = GetHeaders();
+ HeaderInfoList_obj headers(GetHeaders());
CHECK( headers, NULL, _T("GetMessage: failed to get headers") );
@@ -3656,5 +3656,5 @@
CHECK_RET( m_statusChangeData, "OnMsgStatusChanged() shouldn't be called!" );
- HeaderInfoList_obj headers = GetHeaders();
+ HeaderInfoList_obj headers(GetHeaders());
CHECK_RET( headers, _T("OnMsgStatusChanged(): couldn't get headers") );
@@ -3734,5 +3734,5 @@
return;
- HeaderInfoList_obj headers = GetHeaders();
+ HeaderInfoList_obj headers(GetHeaders());
CHECK_RET( headers, _T("HandleMsgFlags: couldn't get headers") );
@@ -4616,5 +4616,5 @@
m_uidLastNew = uidsNew->Last();
- HeaderInfoList_obj hil = GetHeaders();
+ HeaderInfoList_obj hil(GetHeaders());
if ( hil )
{
Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -b -u -2 -r1.120 -r1.121
--- MailFolderCmn.cpp 27 Sep 2003 16:33:59 -0000 1.120
+++ MailFolderCmn.cpp 30 Sep 2003 13:46:21 -0000 1.121
@@ -663,5 +663,5 @@
if ( count > 1 )
{
- HeaderInfoList_obj hil = GetHeaders();
+ HeaderInfoList_obj hil(GetHeaders());
CHECK_RET( hil, _T("Failed to cache messages because there are no headers") );
@@ -742,5 +742,5 @@
for ( int i = 0; i < n; i++ )
{
- Message_obj msg = GetMessage((*selections)[i]);
+ Message_obj msg(GetMessage((*selections)[i]));
if ( msg )
@@ -949,5 +949,5 @@
UIdArray *MailFolderCmn::SearchMessages(const SearchCriterium *crit, int flags)
{
- HeaderInfoList_obj hil = GetHeaders();
+ HeaderInfoList_obj hil(GetHeaders());
CHECK( hil, NULL, _T("no listing in SearchMessages") );
@@ -1005,5 +1005,5 @@
else
{
- Message_obj msg = GetMessage(hi->GetUId());
+ Message_obj msg(GetMessage(hi->GetUId()));
if ( !msg )
{
@@ -1272,5 +1272,5 @@
MailFolderCmn::SortMessages(MsgnoType *msgnos, const SortParams& sortParams)
{
- HeaderInfoList_obj hil = GetHeaders();
+ HeaderInfoList_obj hil(GetHeaders());
CHECK( hil, false, _T("no listing to sort") );
@@ -1315,5 +1315,5 @@
ThreadData *thrData)
{
- HeaderInfoList_obj hil = GetHeaders();
+ HeaderInfoList_obj hil(GetHeaders());
CHECK( hil, false, _T("no listing to sort") );
@@ -1848,5 +1848,5 @@
}
- MFolder_obj folder = folderWithNewMail;
+ MFolder_obj folder(folderWithNewMail);
return DoProcessNewMail
Index: Message.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/Message.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -u -2 -r1.34 -r1.35
--- Message.cpp 18 Sep 2003 16:31:00 -0000 1.34
+++ Message.cpp 30 Sep 2003 13:46:21 -0000 1.35
@@ -72,5 +72,5 @@
CHECK_RET( fullname, _T("SplitAddress(): fullname param can't be NULL") );
- AddressList_obj addrList = address;
+ AddressList_obj addrList(address);
fullname->clear();
@@ -102,5 +102,5 @@
CHECK_RET( email, _T("ExtractAddress(): email param can't be NULL") );
- AddressList_obj addrList = address;
+ AddressList_obj addrList(address);
Address *addr = addrList->GetFirst();
@@ -322,5 +322,5 @@
{
String address;
- AddressList_obj addrList = GetAddressList(type);
+ AddressList_obj addrList(GetAddressList(type));
if ( addrList )
{
Index: MessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MessageCC.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -b -u -2 -r1.145 -r1.146
--- MessageCC.cpp 19 Sep 2003 13:31:22 -0000 1.145
+++ MessageCC.cpp 30 Sep 2003 13:46:21 -0000 1.146
@@ -217,8 +217,8 @@
// this is almost surely wrong - but the old code was even more wrong
// than the current one! (FIXME)
- AddressList_obj addrListReplyTo = GetAddressList(MAT_REPLYTO);
+ AddressList_obj addrListReplyTo(GetAddressList(MAT_REPLYTO));
Address *addrReplyTo = addrListReplyTo ? addrListReplyTo->GetFirst() : NULL;
- AddressList_obj addrListFrom = GetAddressList(MAT_FROM);
+ AddressList_obj addrListFrom(GetAddressList(MAT_FROM));
Address *addrFrom = addrListFrom ? addrListFrom->GetFirst() : NULL;
if ( !addrFrom )
Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -b -u -2 -r1.213 -r1.214
--- SendMessageCC.cpp 19 Sep 2003 13:31:22 -0000 1.213
+++ SendMessageCC.cpp 30 Sep 2003 13:46:21 -0000 1.214
@@ -1917,5 +1917,5 @@
}
- MailFolder_obj mf = MailFolder::OpenFolder(folder);
+ MailFolder_obj mf(MailFolder::OpenFolder(folder));
if ( !mf )
{
Index: VFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/VFolder.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- VFolder.cpp 18 Sep 2003 16:31:00 -0000 1.13
+++ VFolder.cpp 30 Sep 2003 13:46:21 -0000 1.14
@@ -375,5 +375,5 @@
break;
- HeaderInfoList_obj hil = msg->mf->GetHeaders();
+ HeaderInfoList_obj hil(msg->mf->GetHeaders());
HeaderInfo * const hiDst = headers[n - 1]; // -1 to make index from msgno
@@ -575,5 +575,5 @@
CHECK( msgno != MSGNO_ILLEGAL, false, _T("SetMessageFlag: invalid UID") );
- HeaderInfoList_obj headers = GetHeaders();
+ HeaderInfoList_obj headers(GetHeaders());
CHECK( headers, false, _T("SetMessageFlag: couldn't get headers") );
@@ -625,5 +625,5 @@
return false;
- HeaderInfoList_obj hil = mf->GetHeaders();
+ HeaderInfoList_obj hil(mf->GetHeaders());
if ( !hil )
return false;
-------------------------------------------------------
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
