Resolved merge conflict with actmgr/frmActivityMgr.h

[xestiaab/.git] / source / actmgr / frmActivityMgr-tasks.cpp

diff --git a/source/actmgr/frmActivityMgr-tasks.cpp b/source/actmgr/frmActivityMgr-tasks.cpp
index 72135db..fe6eb3d 100644 (file)
--- a/source/actmgr/frmActivityMgr-tasks.cpp
+++ b/source/actmgr/frmActivityMgr-tasks.cpp
@@ -79,15 +79,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
        
        }
        
-       ActivityMgrAccountSettings AccountSettings;
-       AccountSettings.Address = AccountAddress;
-       AccountSettings.Port = AccountPort;
-       AccountSettings.Username = AccountUsername;
-       AccountSettings.Password = AccountPassword;
-       AccountSettings.SSL = AccountSSL;
-       AccountSettings.Prefix = AccountPrefix;
-       AccountSettings.Dir = AccountDir;
-       
        CardDAVConn->SetupConnection(AccountAddress, AccountPort, AccountUsername, AccountPassword, AccountSSL, AccountPrefix, AccountDir);
        CardDAVConn->SetupVariables(&ActivityList, ActivityTaskID);
        CardDAVConn->SetupResultBools(&BlankBool, &BlankBool);          
@@ -121,7 +112,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
-               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
                
                ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
                ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -149,7 +139,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListFullFilename.insert(std::make_pair(ActivityTaskID, TaskFullFilename));
-               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
                
                ActivityListETag.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETag(TaskFilename)));
                ActivityListETagOriginal.insert(std::make_pair(ActivityTaskID, ETagDBPtr->GetETagOriginal(TaskFilename)));
@@ -172,7 +161,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListConn.insert(std::make_pair(ActivityTaskID, CardDAVConn));
                ActivityListFilename.insert(std::make_pair(ActivityTaskID, TaskFilename));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
-               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
        } else if (TaskType == 3){
 
@@ -189,7 +177,6 @@ int frmActivityMgr::AddTask(int TaskType, wxString TaskDetail, wxString TaskAcco
                ActivityListTaskDetail.insert(std::make_pair(ActivityTaskID, AccountPrefix));
                ActivityListAccount.insert(std::make_pair(ActivityTaskID, TaskAccount));
                ActivityListIndex.insert(std::make_pair(ActivityTaskID, itemindex));
-               ActivityListAccSettings.insert(std::make_pair(ActivityTaskID, AccountSettings));
        
        }