From 3c4b20954ac161e85084a6f5960b7d38d2d48396 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 29 Oct 2017 18:53:12 +0000
Subject: [PATCH] TODOs: Remove TODOs no longer needed from code

---
 source/actmgr/frmActivityMgr.cpp          |  2 --
 source/carddav2/carddav2.cpp              |  2 --
 source/contacteditor/frmContactEditor.cpp | 25 -----------------------
 source/tests/xestiaab_carddav.cpp         |  2 --
 4 files changed, 31 deletions(-)

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index a2168e2..17fb6ee 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -1706,8 +1706,6 @@ void frmActivityMgr::ProcessTasksThread()
 								break;
 							}
 							
-							// TODO: Continue from here!
-							
 							ETagServer = wxString::FromUTF8(ServerEntityTag.EntityTag.c_str());
 				
 							if (ETagOriginal != ETagServer){
diff --git a/source/carddav2/carddav2.cpp b/source/carddav2/carddav2.cpp
index 0f79c11..6e414c7 100644
--- a/source/carddav2/carddav2.cpp
+++ b/source/carddav2/carddav2.cpp
@@ -1268,8 +1268,6 @@ COContactList CardDAV2::GetContactList(std::string SyncToken){
 	
 	std::string SyncData;
 	
-	// TODO: Copy old code from CardDAV class as needed.
-	
 	if (SyncToken.size() > 0){
 		
 		SyncData = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index 4856537..ad16901 100644
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -65,11 +65,6 @@
 #include "../common/uuid.h"
 #include "../common/dirs.h"
 
-// TODO: Investigate problems with SFML & PulseAudio - CPU usage problems when
-// not being used.
-
-// Replace intResult with intValueSeek.
-
 BEGIN_EVENT_TABLE(frmContactEditor, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmContactEditor::ContactFileChanged)
 END_EVENT_TABLE()
@@ -180,18 +175,6 @@ void frmContactEditor::SetupAccountData(bool UnsupportedAccount){
 
 int frmContactEditor::GetLastInt(std::map<int, wxString> *MapData){
     
-	/*
-	int intResult = 0;
-     
-	std::map<int,wxString>::iterator iwxsit;
-     
-	for( iwxsit=(*MapData).begin(); iwxsit != (*MapData).end(); iwxsit++){
-	intResult = (*iwxsit).first;
-	}
-     
-	return intResult;
-	*/
-    
 	intValueSeek++;
 	return intValueSeek;
     
@@ -199,14 +182,6 @@ int frmContactEditor::GetLastInt(std::map<int, wxString> *MapData){
 
 int frmContactEditor::GetLastInt(std::map<int, std::string> *MapData){
     
-	/* int intResult = 0;
-     
-	std::map<int,std::string>::iterator iwxsit;
-     
-	for( iwxsit=(*MapData).begin(); iwxsit != (*MapData).end(); iwxsit++){
-	intResult = (*iwxsit).first;
-	}*/
-    
 	intValueSeek++;
 	return intValueSeek;
     
diff --git a/source/tests/xestiaab_carddav.cpp b/source/tests/xestiaab_carddav.cpp
index a4fa5ec..6dd7bab 100644
--- a/source/tests/xestiaab_carddav.cpp
+++ b/source/tests/xestiaab_carddav.cpp
@@ -21,8 +21,6 @@
 #include <chrono>
 #include <thread>
 
-// TODO: Add tests for the CardDAV object.
-
 TEST(CardDAV, Use_Fake_To_Setup_And_Check_Connection_Settings_With_TestMode_True){
 	
 	std::string ServerAddress1 = "gibberish.invalid";
-- 
2.39.2