Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv27168/src/classes
Modified Files:
ComposeTemplate.cpp ConfigSource.cpp MFolder.cpp
MessageView.cpp Profile.cpp
Log Message:
gcc compilation fixes after smartp ointers change
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -b -u -2 -r1.53 -r1.54
--- ComposeTemplate.cpp 26 Sep 2003 15:10:37 -0000 1.53
+++ ComposeTemplate.cpp 30 Sep 2003 13:46:19 -0000 1.54
@@ -1036,5 +1036,5 @@
VarExpander::GetNameForAddress(String *value, MessageAddressType type) const
{
- AddressList_obj addrList = m_msg->GetAddressList(type);
+ AddressList_obj addrList(m_msg->GetAddressList(type));
Address *addr = addrList ? addrList->GetFirst() : NULL;
if ( addr )
Index: ConfigSource.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ConfigSource.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ConfigSource.cpp 27 Sep 2003 23:10:35 -0000 1.8
+++ ConfigSource.cpp 30 Sep 2003 13:46:19 -0000 1.9
@@ -31,5 +31,5 @@
#include <wx/utils.h> // for wxGetHomeDir
- #include "Profiles.h" // for M_PROFILE_CONFIG_SECTION
+ #include "Profile.h" // for M_PROFILE_CONFIG_SECTION
#endif // USE_PCH
@@ -323,5 +323,6 @@
-ConfigSourceLocal *ConfigSourceLocal::CreateDefault(const String& filename)
+/* static */
+wxConfigBase *ConfigSourceLocal::CreateDefaultConfig(const String& filename)
{
wxConfigBase *config = NULL;
@@ -355,5 +356,5 @@
wxLogError(_("Cannot create the directory for configuration "
"files '%s'."), localFilePath.c_str());
- return;
+ return NULL;
}
@@ -515,5 +516,5 @@
}
- return new ConfigSourceLocal(config, _T(""));
+ return config;
}
Index: MFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFolder.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- MFolder.cpp 19 Sep 2003 13:31:20 -0000 1.101
+++ MFolder.cpp 30 Sep 2003 13:46:19 -0000 1.102
@@ -1464,5 +1464,5 @@
if ( folderType == MF_IMAP )
{
- MFolder_obj folderParent = folder->GetParent();
+ MFolder_obj folderParent(folder->GetParent());
// are we're the child of the IMAP server entry?
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -b -u -2 -r1.132 -r1.133
--- MessageView.cpp 19 Sep 2003 13:31:20 -0000 1.132
+++ MessageView.cpp 30 Sep 2003 13:46:19 -0000 1.133
@@ -2380,5 +2380,5 @@
name.Printf(_("Attached message '%s'"), filenameOrig.c_str());
- MFolder_obj mfolder = MFolder::CreateTempFile(name, filename);
+ MFolder_obj mfolder(MFolder::CreateTempFile(name, filename));
if ( mfolder )
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -b -u -2 -r1.149 -r1.150
--- Profile.cpp 27 Sep 2003 23:23:00 -0000 1.149
+++ Profile.cpp 30 Sep 2003 13:46:19 -0000 1.150
@@ -175,5 +175,5 @@
public:
ConfigSourceLocalOld(const String& filename, const String& name = _T(""))
- : ConfigSourceLocal(filename, name) { }
+ : ConfigSourceLocal(CreateDefaultConfig(filename), name) { }
virtual bool Read(const String& name, String *value) const
-------------------------------------------------------
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
