From d653acf6bf03a8a713701c5ade6b246e3b506883 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 2 Aug 2015 19:43:24 +0100 Subject: [PATCH] Removed unused variables and cleaned up code for the Activity Manager. --- source/frmActivityMgr.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/source/frmActivityMgr.cpp b/source/frmActivityMgr.cpp index 39274fd..5638c70 100644 --- a/source/frmActivityMgr.cpp +++ b/source/frmActivityMgr.cpp @@ -45,8 +45,6 @@ frmActivityMgr::frmActivityMgr( wxWindow* parent ) frmActivityMgrADT( parent ) { - frmMain *frmMainPtrGet = static_cast(frmMainPtr); - wxMemoryInputStream istream(icons_activitywindow_png, sizeof(icons_activitywindow_png)); wxImage icons_activitywindow_pngi(istream, wxBITMAP_TYPE_PNG); wxBitmap activityiconbmp(icons_activitywindow_pngi, -1); @@ -354,7 +352,7 @@ void frmActivityMgr::StopTask( wxCommandEvent& event ){ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - intSelectedData = lstActivity->GetItemData(longSelected); + intSelectedData = (int)lstActivity->GetItemData(longSelected); if (longSelected == -1){ return; @@ -383,7 +381,7 @@ void frmActivityMgr::StopAllTasks( wxCommandEvent& event ){ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - intSelectedData = lstActivity->GetItemData(longSelected); + intSelectedData = (int)lstActivity->GetItemData(longSelected); if (longSelected == -1){ return; @@ -413,7 +411,7 @@ void frmActivityMgr::RetryTask( wxCommandEvent& event ){ wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - intSelectedData = lstActivity->GetItemData(longSelected); + intSelectedData = (int)lstActivity->GetItemData(longSelected); if (longSelected == -1){ return; @@ -553,7 +551,6 @@ void frmActivityMgr::ProcessTasksThread() vCard Moo1; vCard Moo2; - int intResult; frmMain *frmMainPtrGet = static_cast(frmMainPtr); @@ -660,10 +657,6 @@ void frmActivityMgr::ProcessTasksThread() // This is a conflict which the user will now // need to resolve. - vCard Moo1; - vCard Moo2; - int intResult; - frmMain *frmMainPtrGet = (frmMain *)frmMainPtr; //ContactConflictEvent event(ContactConflictCmdEnv); @@ -1209,7 +1202,6 @@ void frmActivityMgr::ProcessTasksThread() wxString vCardInputData; wxString ETagFileData; wxFFile vCardFile; - bool vCardProcessError; for (std::map::iterator additer = vCardDownloadData.begin(); additer != vCardDownloadData.end(); additer++){ @@ -1348,10 +1340,6 @@ void frmActivityMgr::ProcessTasksThread() // Server ETag is different from original ETag. // This is a conflict which the user will now // need to resolve. - - vCard Moo1; - vCard Moo2; - int intResult; frmMain *frmMainPtrGet = static_cast(frmMainPtr); @@ -1495,10 +1483,6 @@ void frmActivityMgr::ProcessTasksThread() // Server ETag is different from original ETag. // This is a conflict which the user will now // need to resolve. - - vCard Moo1; - vCard Moo2; - int intResult; frmMain *frmMainPtrGet = (frmMain *)frmMainPtr; @@ -1647,8 +1631,6 @@ void frmActivityMgr::ProcessTasksThread() ETagDBPtr->RemoveETag(vCardDelete[vi]); } - - frmMain *frmMainPtrGet = static_cast(frmMainPtr); } -- 2.39.5