X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftimers.h;h=0af0942401a035391d08fc77843f20e08369d622;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=5952a57654e822dcaf6821ccb36b3684086e3ff9;hpb=a4deb4d72448721584279013bedb6f9c8ceb23ac;p=xestiaab%2F.git

diff --git a/source/common/timers.h b/source/common/timers.h
index 5952a57..0af0942 100644
--- 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
@@ -72,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()
@@ -96,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();
     
 };