Removed references of CardDAV and delete ConnectionObject when finished

[xestiaab/.git] / source / common / timers.h

diff --git a/source/common/timers.h b/source/common/timers.h
index 4bb4482..0af0942 100644 (file)
--- a/source/common/timers.h
+++ b/source/common/timers.h
@@ -23,6 +23,7 @@
 #include <atomic>
 #include "../actmgr/frmActivityMgr.h"
 #include "../contacteditor/frmContactEditor.h"
+#include "../connobject/ConnectionObject.h"
 #include "etag.h"
 
 #ifndef TIMERS_H
@@ -30,7 +31,6 @@
 
 struct ETagDB;
 struct frmContactEditor;
-struct CardDAV;
 
 class wxActTimer : public wxTimer
 {
@@ -73,20 +73,20 @@ class wxActListProcTimer : public wxTimer
 {
     
 private:
-    std::map<int,int> *ActListPtr;
-    std::map<int,long> *ActListUIPtr;
-    std::map<int,wxString> *ActListDetailPtr;
-    std::map<int,CardDAV*> *ActListConnPtr;
-    wxListCtrl *lstActivityPtr;
-    wxStaticText *lblDetailsPtr;
-    bool *TasksActivePtr;
-    wxGauge *GauProgressPtr;
-    void *ActMgrPtr;
+    std::map<int,int> *ActListPtr = nullptr;
+    std::map<int,long> *ActListUIPtr = nullptr;
+    std::map<int,wxString> *ActListDetailPtr = nullptr;
+    wxListCtrl *lstActivityPtr = nullptr;
+    wxStaticText *lblDetailsPtr = nullptr;
+    bool *TasksActivePtr = nullptr;
+    wxGauge *GauProgressPtr = nullptr;
+    void *ActMgrPtr = nullptr;
     int intActivityTotal = 0;
     int intActivityCompleted = 0;
-    wxActTimer *ActTimerPtr;
-    wxActProcessTimer *ActProcessTimerPtr;
-    std::map<int,wxDateTime> *ActListFinDTPtr;
+    wxActTimer *ActTimerPtr = nullptr;
+    wxActProcessTimer *ActProcessTimerPtr = nullptr;
+    std::map<int,wxDateTime> *ActListFinDTPtr = nullptr;
+    std::map<int,ConnectionObject*> *ActListConnObjectsPtr = nullptr;
     bool ClearupProcessed = FALSE;
 public:
     wxActListProcTimer():wxTimer()
@@ -97,7 +97,7 @@ public:
                        std::map<int,wxString> *ActListDetail, bool *TasksActive,
                        wxListCtrl *lstActivity, wxStaticText *lblDetails, wxGauge *GauProgress,
                        void *ActMgr, wxActTimer *ActTimer, wxActProcessTimer *ActProcessTimer,
-                       std::map<int,wxDateTime> *ActListFinDT, std::map<int, CardDAV*> *ActListConn);
+                       std::map<int,wxDateTime> *ActListFinDT, std::map<int,ConnectionObject*> *ActListConnObjects);
     void EnableClearup();
     
 };