Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv27168/src/modules

Modified Files:
        Filters.cpp Migrate.cpp 
Log Message:
gcc compilation fixes after smartp ointers change

Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -b -u -2 -r1.156 -r1.157
--- Filters.cpp 26 Sep 2003 09:33:44 -0000      1.156
+++ Filters.cpp 30 Sep 2003 13:46:22 -0000      1.157
@@ -2417,5 +2417,5 @@
    }
 
-   Message_obj msg = p->GetMessage();
+   Message_obj msg(p->GetMessage());
    if ( !msg )
       return false;
@@ -2778,5 +2778,5 @@
    Value value = func_recipients(args, p);
 
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( !mf )
       return Value(false);
@@ -2792,5 +2792,5 @@
    // spammer could always add a bogus List-Id but for now I didn't see this
    // happen)
-   Message_obj msg = p->GetMessage();
+   Message_obj msg(p->GetMessage());
 
    if ( msg )
@@ -2815,5 +2815,5 @@
    if(flag_str.Length() != 1)
       return Value(false);
-   Message_obj msg = p->GetMessage();
+   Message_obj msg(p->GetMessage());
    if(! msg)
       return Value(false);
@@ -2977,11 +2977,11 @@
    int score = 0;
 #ifdef USE_HEADER_SCORE
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( mf )
    {
-      HeaderInfoList_obj hil = mf->GetHeaders();
+      HeaderInfoList_obj hil(mf->GetHeaders());
       if(hil)
       {
-         Message_obj msg = p->GetMessage();
+         Message_obj msg(p->GetMessage());
          if ( msg )
          {
@@ -3003,11 +3003,11 @@
 
 #ifdef USE_HEADER_SCORE
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( mf )
    {
-      HeaderInfoList_obj hil = mf->GetHeaders();
+      HeaderInfoList_obj hil(mf->GetHeaders());
       if(hil)
       {
-         Message_obj msg = p->GetMessage();
+         Message_obj msg(p->GetMessage());
          if ( msg )
          {
@@ -3032,11 +3032,11 @@
 
 #ifdef USE_HEADER_SCORE
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( mf )
    {
-      HeaderInfoList_obj hil = mf->GetHeaders();
+      HeaderInfoList_obj hil(mf->GetHeaders());
       if(hil)
       {
-         Message_obj msg = p->GetMessage();
+         Message_obj msg(p->GetMessage());
          if ( msg )
          {
@@ -3058,11 +3058,11 @@
    const Value c = args->GetArg(0)->Evaluate();
    String col = c.ToString();
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( mf )
    {
-      HeaderInfoList_obj hil = mf->GetHeaders();
+      HeaderInfoList_obj hil(mf->GetHeaders());
       if(hil)
       {
-         Message_obj msg = p->GetMessage();
+         Message_obj msg(p->GetMessage());
          if ( msg )
          {
@@ -3106,5 +3106,5 @@
 
    // Set or clear the selected flag
-   MailFolder_obj mf = p->GetFolder();
+   MailFolder_obj mf(p->GetFolder());
    if ( ! mf )
       return Value(false);

Index: Migrate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Migrate.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- Migrate.cpp 25 Sep 2003 15:13:09 -0000      1.20
+++ Migrate.cpp 30 Sep 2003 13:46:22 -0000      1.21
@@ -874,5 +874,5 @@
 void IMAPServerPanel::OnText(wxCommandEvent& event)
 {
-   MFolder_obj folder = m_btnFolder->GetFolder();
+   MFolder_obj folder(m_btnFolder->GetFolder());
    if ( folder != m_folder )
    {
@@ -1544,5 +1544,5 @@
    uids.Add(UID_ILLEGAL);
 
-   HeaderInfoList_obj headers = mfSrc->GetHeaders();
+   HeaderInfoList_obj headers(mfSrc->GetHeaders());
 
    m_countMessages = headers->Count();
@@ -1618,6 +1618,6 @@
 
    // create the folder to save the messages to
-   MFolder_obj folderDst = GetDstFolder(name, flags);
-   MailFolder_obj mfDst = MailFolder::OpenFolder(folderDst);
+   MFolder_obj folderDst(GetDstFolder(name, flags));
+   MailFolder_obj mfDst(MailFolder::OpenFolder(folderDst));
    if ( !mfDst )
    {



-------------------------------------------------------
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

Reply via email to