Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv27168/src/gui
Modified Files:
wxComposeView.cpp wxFolderMenu.cpp wxFolderTree.cpp
wxFolderView.cpp wxMainFrame.cpp wxMsgCmdProc.cpp
wxOptionsDlg.cpp wxSearchDialog.cpp wxWizards.cpp
Log Message:
gcc compilation fixes after smartp ointers change
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.345
retrieving revision 1.346
diff -b -u -2 -r1.345 -r1.346
--- wxComposeView.cpp 19 Sep 2003 19:23:25 -0000 1.345
+++ wxComposeView.cpp 30 Sep 2003 13:46:19 -0000 1.346
@@ -4194,5 +4194,5 @@
return false;
- SendMessage_obj msg = BuildDraftMessage();
+ SendMessage_obj msg(BuildDraftMessage());
if ( !msg )
{
@@ -4300,5 +4300,5 @@
}
- SendMessage_obj msg = BuildDraftMessage();
+ SendMessage_obj msg(BuildDraftMessage());
if ( !msg )
return false;
@@ -4403,5 +4403,5 @@
if ( folder )
{
- MailFolder_obj mf = MailFolder::OpenFolder(folder);
+ MailFolder_obj mf(MailFolder::OpenFolder(folder));
if ( mf )
{
Index: wxFolderMenu.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderMenu.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- wxFolderMenu.cpp 18 Sep 2003 16:30:52 -0000 1.11
+++ wxFolderMenu.cpp 30 Sep 2003 13:46:20 -0000 1.12
@@ -142,5 +142,5 @@
for ( size_t n = 0; n < nSubfolders; n++ )
{
- MFolder_obj subfolder = folder->GetSubfolder(n);
+ MFolder_obj subfolder(folder->GetSubfolder(n));
if ( !subfolder.IsOk() )
{
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.219
retrieving revision 1.220
diff -b -u -2 -r1.219 -r1.220
--- wxFolderTree.cpp 19 Sep 2003 13:31:21 -0000 1.219
+++ wxFolderTree.cpp 30 Sep 2003 13:46:20 -0000 1.220
@@ -2039,5 +2039,5 @@
void wxFolderTreeImpl::DoFolderClear()
{
- MFolder_obj folder = m_sink->GetSelection();
+ MFolder_obj folder(m_sink->GetSelection());
if ( !folder )
{
@@ -2052,5 +2052,5 @@
void wxFolderTreeImpl::DoFolderUpdate()
{
- MFolder_obj folder = m_sink->GetSelection();
+ MFolder_obj folder(m_sink->GetSelection());
if ( !folder.IsOk() )
{
@@ -2065,5 +2065,5 @@
void wxFolderTreeImpl::DoFolderClose()
{
- MFolder_obj folder = m_sink->GetSelection();
+ MFolder_obj folder(m_sink->GetSelection());
if ( !folder.IsOk() )
{
@@ -3053,5 +3053,5 @@
// we don't have the status right now, count the messages (the folder
// should be already opened, we don't want to open it just for this)
- MailFolder_obj mf = MailFolder::GetOpenedFolderFor(folder);
+ MailFolder_obj mf(MailFolder::GetOpenedFolderFor(folder));
if ( !mf )
{
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.644
retrieving revision 1.645
diff -b -u -2 -r1.644 -r1.645
--- wxFolderView.cpp 29 Sep 2003 14:22:10 -0000 1.644
+++ wxFolderView.cpp 30 Sep 2003 13:46:20 -0000 1.645
@@ -2385,5 +2385,5 @@
// been broken between the moment we realized we needed the headers
// and now
- MailFolder_obj mf = m_FolderView->GetMailFolder();
+ MailFolder_obj mf(m_FolderView->GetMailFolder());
if ( !mf || !mf->IsOpened() )
{
@@ -3270,5 +3270,5 @@
if ( m_nDeleted == UID_ILLEGAL )
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( !mf )
@@ -3314,5 +3314,5 @@
bool wxFolderView::SelectNextUnread(bool takeNextIfNoUnread)
{
- HeaderInfoList_obj hil = m_ASMailFolder->GetHeaders();
+ HeaderInfoList_obj hil(m_ASMailFolder->GetHeaders());
int idxFocused = m_FolderCtrl->GetFocusedItem();
@@ -3387,5 +3387,5 @@
// don't waste time looking for unread messages if we already know that
// there are none (as we often do)
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( mf )
@@ -3609,5 +3609,5 @@
wxFolderView::Update()
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK_RET( mf, _T("wxFolderView::Update(): no folder") );
@@ -3668,5 +3668,5 @@
// folder is still opened: otherwise we'd hit an assert in MailFolder
// because we'd call CountDeletedMessages() on a closed folder
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( !!mf && mf->IsOpened() && mf->CountDeletedMessages() > 0 )
{
@@ -3700,5 +3700,5 @@
// this folder is not associated with our frame any more
- MailFolder_obj mf = m_ASMailFolder->GetMailFolder();
+ MailFolder_obj mf(m_ASMailFolder->GetMailFolder());
mf->SetInteractiveFrame(NULL);
@@ -4066,5 +4066,5 @@
wxFolderListCtrlBlockOnSelect dontHandleOnSelect(m_FolderCtrl);
- HeaderInfoList_obj hil = GetFolder()->GetHeaders();
+ HeaderInfoList_obj hil(GetFolder()->GetHeaders());
CHECK_RET( hil, _T("can't select unread or flagged messages without folder
listing") );
@@ -4650,5 +4650,5 @@
if ( uid != UID_ILLEGAL && m_settings.updateStatus )
{
- HeaderInfoList_obj hil = GetFolder()->GetHeaders();
+ HeaderInfoList_obj hil(GetFolder()->GetHeaders());
CHECK_RET( hil, _T("failed to get headers") );
@@ -4701,5 +4701,5 @@
void wxFolderView::OnFolderClosedEvent(MEventFolderClosedData& event)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( event.GetFolder() == mf )
@@ -4729,5 +4729,5 @@
wxFolderView::OnFolderExpungeEvent(MEventFolderExpungeData& event)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( event.GetFolder() != mf )
@@ -4755,5 +4755,5 @@
(unsigned long)count, m_FolderCtrl->GetItemCount());
- HeaderInfoList_obj hil = GetFolder()->GetHeaders();
+ HeaderInfoList_obj hil(GetFolder()->GetHeaders());
long itemPreviewed = m_FolderCtrl->GetPreviewedItem();
@@ -4814,5 +4814,5 @@
wxFolderView::OnFolderUpdateEvent(MEventFolderUpdateData &event)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( event.GetFolder() == mf )
@@ -4826,9 +4826,9 @@
wxFolderView::OnMsgStatusEvent(MEventMsgStatusData& event)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
if ( event.GetFolder() == mf )
{
- HeaderInfoList_obj hil = GetFolder()->GetHeaders();
+ HeaderInfoList_obj hil(GetFolder()->GetHeaders());
CHECK_RET( hil, _T("no headers but msg status changed?") );
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -b -u -2 -r1.172 -r1.173
--- wxMainFrame.cpp 19 Sep 2003 13:31:21 -0000 1.172
+++ wxMainFrame.cpp 30 Sep 2003 13:46:20 -0000 1.173
@@ -310,5 +310,5 @@
// and append all matching messages to the results folder
- HeaderInfoList_obj hil = mf->GetHeaders();
+ HeaderInfoList_obj hil(mf->GetHeaders());
if ( hil )
{
@@ -318,5 +318,5 @@
for ( size_t n = 0; n < count; n++ )
{
- Message_obj msg = mf->GetMessage((*uidsMatching)[n]);
+ Message_obj msg(mf->GetMessage((*uidsMatching)[n]));
if ( msg )
{
@@ -617,5 +617,5 @@
// update the menu to match the initial selection
- MFolder_obj folder = m_FolderTree->GetSelection();
+ MFolder_obj folder(m_FolderTree->GetSelection());
if ( folder )
{
@@ -831,10 +831,10 @@
case WXMENU_FOLDER_OPEN_RO:
{
- MFolder_obj folder = MDialog_FolderChoose
+ MFolder_obj folder(MDialog_FolderChoose
(
this, // parent window
NULL, // parent folder
true // open
- );
+ ));
if ( folder )
{
@@ -852,5 +852,5 @@
case WXMENU_FOLDER_CREATE:
{
- MFolder_obj parent = m_FolderTree->GetSelection();
+ MFolder_obj parent(m_FolderTree->GetSelection());
wxWindow *winTop = ((wxMApp *)mApplication)->GetTopWindow();
@@ -878,5 +878,5 @@
case WXMENU_FOLDER_FILTERS:
{
- MFolder_obj folder = m_FolderTree->GetSelection();
+ MFolder_obj folder(m_FolderTree->GetSelection());
if ( folder )
ConfigureFiltersForFolder(folder, this);
@@ -935,5 +935,5 @@
case WXMENU_FOLDER_UPDATE:
{
- MFolder_obj folder = m_FolderTree->GetSelection();
+ MFolder_obj folder(m_FolderTree->GetSelection());
if ( folder )
{
@@ -1034,5 +1034,5 @@
Profile_obj profile(GetFolderProfile());
- MFolder_obj folder = m_FolderTree->GetSelection();
+ MFolder_obj folder(m_FolderTree->GetSelection());
if ( ConfigureSearchMessages(&crit, profile, folder, this) )
{
@@ -1045,5 +1045,5 @@
const String& name = folderNames[n];
- MFolder_obj folder = name;
+ MFolder_obj folder(name);
if ( !folder )
{
@@ -1222,5 +1222,5 @@
// this also allows to use the settings of a folder which you can't open now
// (e.g. because you're offline)
- MFolder_obj folder = GetFolderTree()->GetSelection();
+ MFolder_obj folder(GetFolderTree()->GetSelection());
if ( folder )
{
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -b -u -2 -r1.47 -r1.48
--- wxMsgCmdProc.cpp 19 Sep 2003 13:31:21 -0000 1.47
+++ wxMsgCmdProc.cpp 30 Sep 2003 13:46:20 -0000 1.48
@@ -206,5 +206,5 @@
{
// do it synchronously (FIXME should we?)
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK( mf, NULL, _T("no folder in MsgCmdProcImpl::GetMessage()") );
@@ -894,5 +894,5 @@
MsgCmdProcImpl::ShowUIDL(UIdType uid)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK_RET( mf, _T("no folder in MsgCmdProcImpl::ShowUIDL") );
@@ -933,5 +933,5 @@
{
// do it synchronously (FIXME should we?)
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK_RET( mf, _T("no folder in MsgCmdProcImpl::ShowMIMEDialog") );
@@ -1016,10 +1016,10 @@
}
- SendMessage_obj sendMsg = SendMessage::CreateResent
+ SendMessage_obj sendMsg(SendMessage::CreateResent
(
m_asmf->GetProfile(),
msg,
GetFrame()
- );
+ ));
if ( !sendMsg )
{
@@ -1071,5 +1071,5 @@
for ( size_t n = 0; n < count; n++ )
{
- Message_obj msg = GetMessage(messages[n]);
+ Message_obj msg(GetMessage(messages[n]));
if ( !msg )
{
@@ -1078,10 +1078,10 @@
}
- SendMessage_obj sendMsg = SendMessage::CreateResent
+ SendMessage_obj sendMsg(SendMessage::CreateResent
(
m_asmf->GetProfile(),
msg.Get(),
GetFrame()
- );
+ ));
if ( !sendMsg )
@@ -1232,8 +1232,8 @@
MsgCmdProcImpl::ToggleMessages(const UIdArray& messages)
{
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK_RET( mf, _T("no folder in MsgCmdProcImpl::ToggleMessages") );
- HeaderInfoList_obj hil = mf->GetHeaders();
+ HeaderInfoList_obj hil(mf->GetHeaders());
CHECK_RET( hil, _T("can't toggle messages without folder listing") );
@@ -1353,5 +1353,5 @@
// FIXME: should this be implemented as async operation?
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK_RET( mf, _T("message preview without folder?") );
@@ -1450,5 +1450,5 @@
bool didDrop = false;
- MailFolder_obj mf = GetMailFolder();
+ MailFolder_obj mf(GetMailFolder());
CHECK( mf, false, _T("no mail folder to drag messages from?") );
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.388
retrieving revision 1.389
diff -b -u -2 -r1.388 -r1.389
--- wxOptionsDlg.cpp 29 Sep 2003 12:06:25 -0000 1.388
+++ wxOptionsDlg.cpp 30 Sep 2003 13:46:20 -0000 1.389
@@ -560,8 +560,12 @@
ConfigField_SyncStore,
ConfigField_SyncRetrieve,
+#ifdef OS_WIN
ConfigField_SyncSeparator,
ConfigField_SyncConfigFileHelp,
ConfigField_SyncConfigFile,
ConfigField_SyncLast = ConfigField_SyncConfigFile,
+#else // !OS_WIN
+ ConfigField_SyncLast = ConfigField_SyncRetrieve,
+#endif // OS_WIN/!OS_WIN
// the end
Index: wxSearchDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSearchDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- wxSearchDialog.cpp 19 Sep 2003 13:31:21 -0000 1.10
+++ wxSearchDialog.cpp 30 Sep 2003 13:46:20 -0000 1.11
@@ -326,5 +326,5 @@
void wxMessageSearchDialog::OnButtonAdd(wxCommandEvent& /* event */)
{
- MFolder_obj folder = MDialog_FolderChoose(this, NULL, MDlg_Folder_NoFiles);
+ MFolder_obj folder(MDialog_FolderChoose(this, NULL, MDlg_Folder_NoFiles));
if ( folder )
{
Index: wxWizards.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxWizards.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -u -2 -r1.45 -r1.46
--- wxWizards.cpp 19 Sep 2003 13:31:22 -0000 1.45
+++ wxWizards.cpp 30 Sep 2003 13:46:20 -0000 1.46
@@ -1154,5 +1154,5 @@
CreateFolderWizard::FolderParams *params = wiz->GetParams();
- MFolder_obj f = wiz->GetParentFolder();
+ MFolder_obj f(wiz->GetParentFolder());
Profile *profile;
if ( f )
-------------------------------------------------------
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
