X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcommon%2Ftimers.h;h=8859e488f502a85010ed13de4a3b937239a63c4b;hp=abb0e334e87bd9ae87b8ec25e689daaf732f560c;hb=76214fdd5e820c60a468a62fa586749102310f21;hpb=87b1ab30b0f67dfa0457f9e946757d83cfb25106

diff --git a/source/common/timers.h b/source/common/timers.h
index abb0e33..8859e48 100644
--- a/source/common/timers.h
+++ b/source/common/timers.h
@@ -17,12 +17,26 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include <map>
-#include <wx/timer.h>
-#include <wx/wx.h>
 #include <mutex>
 #include <atomic>
-#include "../frmActivityMgr.h"
+#include <wx/timer.h>
+#include <wx/wx.h>
+#include <wx/mstream.h>
+#include <wx/file.h>
+#include <wx/ffile.h>
+#include <wx/filename.h>
+#include <wx/tokenzr.h>
+
+#include "../actmgr/frmActivityMgr.h"
 #include "../contacteditor/frmContactEditor.h"
+#include "../connobject/ConnectionObject.h"
+#include "../frmContact.h"
+#include "../frmMain.h"
+#include "../Bitmaps.h"
+#include "../enums.h"
+#include "../common/preferences.h"
+#include "../common/etag.h"
+#include "../common/dirs.h"
 #include "etag.h"
 
 #ifndef TIMERS_H
@@ -72,19 +86,20 @@ class wxActListProcTimer : public wxTimer
 {
     
 private:
-    std::map<int,int> *ActListPtr;
-    std::map<int,long> *ActListUIPtr;
-    std::map<int,wxString> *ActListDetailPtr;
-    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()
@@ -95,7 +110,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,wxDateTime> *ActListFinDT, std::map<int,ConnectionObject*> *ActListConnObjects);
     void EnableClearup();
     
 };
@@ -105,7 +120,7 @@ class wxETagProcessTimer : public wxTimer
 private:
     int intActivityProgress = 0;
     std::map<wxString,ETagDB> ETagDBList;
-    //std::map<int,ETagDB2> ETagDBListv3;
+
     std::mutex ReloadLock;
 public:
     wxETagProcessTimer():wxTimer()
@@ -115,7 +130,6 @@ public:
     void Notify();
     ETagDB* GetPointer(wxString Filename);
     void ReloadAccounts();
-    //void SetupPointers(frmActivityMgr *ActMgr);
     
 };
 
@@ -170,4 +184,4 @@ public:
 
 void SleepFor(unsigned long longSleepNanoSecs);
 
-#endif
\ No newline at end of file
+#endif