From: Steve Brokenshire Date: Fri, 11 Mar 2016 17:23:53 +0000 (+0000) Subject: Removed unused code from common/timers.cpp X-Git-Tag: release-0.11~143 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=2c0502228cdf4e5b42aa966c6a9b596b41003ebb Removed unused code from common/timers.cpp --- diff --git a/source/common/timers.cpp b/source/common/timers.cpp index a0f62c7..640997a 100644 --- a/source/common/timers.cpp +++ b/source/common/timers.cpp @@ -173,7 +173,6 @@ void wxActTimer::StopAnimation() wxCommandEvent actstop(ACTMGR_STOP); wxPostEvent(frmMainPtrProc, actstop); - //frmMainPtrProc->ActivityIconStop(); this->Stop(); bmpActivity->SetBitmap(*SleepBitmapPtr); @@ -236,17 +235,17 @@ void wxActListProcTimer::Notify(){ for (std::map::iterator iter = ActListPtr->begin(); iter != ActListPtr->end(); ++iter){ - // Check for any queued tasks and start one. + // Check for any queued tasks and start one. - // 0 = Queued. - // 1 = Processing. - // 2 = Failed. - // 3 = Stopped. - // 4 = Completed. - // 5 = Failed (UI Updated). - // 6 = Stopped (UI Updated). - // 7 = (Reserved) (UI Updated). - // 8 = Completed. (UI Updated). + // 0 = Queued. + // 1 = Processing. + // 2 = Failed. + // 3 = Stopped. + // 4 = Completed. + // 5 = Failed (UI Updated). + // 6 = Stopped (UI Updated). + // 7 = (Reserved) (UI Updated). + // 8 = Completed. (UI Updated). std::map::iterator LongIter = ActListUIPtr->find(iter->first); @@ -266,14 +265,8 @@ void wxActListProcTimer::Notify(){ ueventdata->ItemIndex = LongIter->second; ueventdata->ItemLabel = _("Processing..."); - //ueventdata->ItemDes = _("Adding Contact '") + DetailIter->second + _("'..."); wxPostEvent(static_cast(ActMgrPtr), uevent); - - /*lstActivityPtr->SetItem(LongIter->second, 2, _("Processing...")); - if (ActListDetailPtr->find(iter->first) != ActListDetailPtr->end()){ - lblDetailsPtr->SetLabel(_("Adding Contact '") + DetailIter->second + _("'...")); - }*/ } else if (iter->second == 2){ @@ -378,9 +371,6 @@ void wxETagProcessTimer::Notify(){ // Check each ETagDB and see if writing to file is required. - //ETagDB* ETagDBPtr; - //ETagDB ETagDBCopy; - std::map::iterator ETagIter; for (ETagIter = ETagDBList.begin(); @@ -447,46 +437,6 @@ void wxETagProcessTimer::ReloadAccounts(){ } - //raise(SIGABRT); - - /*for (int i = 0; i < PrefData.accounts.GetCount(); i++){ - - AccountDir = PrefData.accounts.GetAccountDirectory(i); - - AccountDir.Trim(); - AccountDir.Append(wxT(".carddav")); - - //AccountPrefix = PrefData.accounts.GetAccountDirPrefix(i); - - //ETagDB NewETagDB (AccountDir); - - ETagDB AccountDB; - AccountDB.SetupDB(AccountDir); - - //ETagDBList.insert(std::make_pair(AccountDir, Moo)); - - //std::pair Moo2; - - //ETagDB2 Meep; - - //ETagDBListv3.insert(std::make_pair(0,Meep)); - - //ETagDBListv2.insert(std::make_pair(0, Moo)); - - //ETagDBList.insert(Moo2); - - ETagDBList.insert(std::make_pair(AccountDir, AccountDB)); - - //Moo55.insert(std::make_pair(wxT("Meep"), wxT("Meep"))); - - //ETagDBList[AccountDir] = new ETagDB (AccountDir); - - }*/ - - //ETagDB Test (AccountDir); - - //ETagDBList.insert(std::make_pair(AccountDir, Test)); - ReloadLock.unlock(); this->Start(15000);