From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 14 Mar 2016 21:35:49 +0000 (+0000)
Subject: Indented code properly in contacteditor/frmImportContacts.cpp
X-Git-Tag: release-0.11~57^2~9
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=7c3e8906f87480353c78723f8da8fd3835d6f82c;p=xestiaab%2F.git

Indented code properly in contacteditor/frmImportContacts.cpp
---

diff --git a/source/import/frmImportContacts.cpp b/source/import/frmImportContacts.cpp
index c71341e..5cc53fe 100644
--- a/source/import/frmImportContacts.cpp
+++ b/source/import/frmImportContacts.cpp
@@ -64,88 +64,87 @@ frmImportContactsADT( parent )
 	
 	treAccounts->AssignImageList(AccImgList);
 
-    // Load the preferences.
+	// Load the preferences.
     
 	wxString preffilename = GetUserPrefDir();
     
-    XABPreferences preferences(preffilename);
+	XABPreferences preferences(preffilename);
 
-    // Setup the main window position (if needed).
+	// Setup the main window position (if needed).
     
-    bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
-    bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
+	bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
+	bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
     
-    if (SaveWindowPos == TRUE){
+	if (SaveWindowPos == TRUE){
     
-	this->SetSize(preferences.GetMainWindowData());
+		this->SetSize(preferences.GetMainWindowData());
     
-    }
+	}
     
-    treAccounts->DeleteAllItems();
+	treAccounts->DeleteAllItems();
     
-    wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"));
-
-    /*    
-    for (int i = (preferences.accounts.GetCount() - 1); i > 0; --i){
-	treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i));
-    }
-    */
-
-    wxString AccDir;
-    wxString AccDirFull;
-    wxString AccDirFullSfx;
-    wxString AccName;
-    wxString AccType;
-    wxString AccDirFinal;
-    wxTreeItemId AccountTreeId;
-    wxTreeItemId GroupTreeId;
-
-    for (int i = 0; i < preferences.accounts.GetCount(); i++){
+	wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"));
+
+	/*    
+	for (int i = (preferences.accounts.GetCount() - 1); i > 0; --i){
+		treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i));
+	}
+	*/
+
+	wxString AccDir;
+	wxString AccDirFull;
+	wxString AccDirFullSfx;
+	wxString AccName;
+	wxString AccType;
+	wxString AccDirFinal;
+	wxTreeItemId AccountTreeId;
+	wxTreeItemId GroupTreeId;
+
+	for (int i = 0; i < preferences.accounts.GetCount(); i++){
     
-	if ((preferences.accounts.GetAccountType(i) == wxT("Local") || 
-		preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
+		if ((preferences.accounts.GetAccountType(i) == wxT("Local") || 
+			preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
+			continue;
 		
-		continue;
-		
-	}
+		}
     
-	AccDir = preferences.accounts.GetAccountDirectory(i);
-	AccDirFull = preferences.accounts.GetAccountDirectory(i);
-	AccDirFull.Trim();
-	AccDirFull.Append(wxT("."));
-	AccDirFullSfx.Append(preferences.accounts.GetAccountType(i));
-	AccDirFullSfx.LowerCase();
-	AccDirFullSfx.Trim();
-	AccDirFull.Append(AccDirFullSfx);
-	AccName = preferences.accounts.GetAccountName(i);
-	AccName.Trim();
-	AccType = preferences.accounts.GetAccountType(i);
-	AccType.Trim();
-	AccountAccDirList.insert(std::make_pair(i, AccDirFull));
-	AccountAccTypeList.insert(std::make_pair(i, AccType));
+		AccDir = preferences.accounts.GetAccountDirectory(i);
+		AccDirFull = preferences.accounts.GetAccountDirectory(i);
+		AccDirFull.Trim();
+		AccDirFull.Append(wxT("."));
+		AccDirFullSfx.Append(preferences.accounts.GetAccountType(i));
+		AccDirFullSfx.LowerCase();
+		AccDirFullSfx.Trim();
+		AccDirFull.Append(AccDirFullSfx);
+		AccName = preferences.accounts.GetAccountName(i);
+		AccName.Trim();
+		AccType = preferences.accounts.GetAccountType(i);
+		AccType.Trim();
+		AccountAccDirList.insert(std::make_pair(i, AccDirFull));
+		AccountAccTypeList.insert(std::make_pair(i, AccType));
 	
-	if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
-	preferences.accounts.GetAccountType(i) == wxT("carddav")){
+		if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
+			preferences.accounts.GetAccountType(i) == wxT("carddav")){
 	
-		AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountNetID, -1);
+			AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountNetID, -1);
 	
-	} else {
+		} else {
 		
-		AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountID, -1);
+			AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountID, -1);
 	
-	}
+		}
 	
-	// Clearup for next account.
+		// Clearup for next account.
 	
-	AccDir.clear();
-	AccDirFull.clear();
-	AccDirFullSfx.clear();
-	AccDirFinal.clear();
-	AccName.clear();
+		AccDir.clear();
+		AccDirFull.clear();
+		AccDirFullSfx.clear();
+		AccDirFinal.clear();
+		AccName.clear();
 	
-    }
+	}
     
-    DialogResult = FALSE;
+	DialogResult = FALSE;
 
 }
 
@@ -186,11 +185,11 @@ void frmImportContacts::ImportContacts( wxCommandEvent& event )
 void frmImportContacts::SetupList(std::map<int,ImportDataContact>* ContactDataInc)
 {
 	 
-	 // Go through the list and setup each contact for the list.
+	// Go through the list and setup each contact for the list.
 	 
-	 int Seek = 0;
+	int Seek = 0;
 	 
-	 for (std::map<int,ImportDataContact>::iterator iter = ContactDataInc->begin();
+	for (std::map<int,ImportDataContact>::iterator iter = ContactDataInc->begin();
 		iter != ContactDataInc->end(); iter++){
 
 		ImportDataContact *Moo = &iter->second;
@@ -207,7 +206,7 @@ void frmImportContacts::SetupList(std::map<int,ImportDataContact>* ContactDataIn
 	 
 		Seek++;
 	 
-	 }
+	}
 
 	for (int i = 0; i < lstContacts->GetCount(); i++){
 	
@@ -250,16 +249,20 @@ wxString frmImportContacts::GetAccount()
 	
 	wxTreeItemIdValue cookie;
 	wxTreeItemId next = treAccounts->GetRootItem();
-
+	
 	wxTreeItemId selectedChild = treAccounts->GetSelection();
 	wxTreeItemId nextChild;
 
 	for (int i = 0; i < preferences.accounts.GetCount(); i++){
 
 		if (!nextChild){
+			
 			nextChild = treAccounts->GetFirstChild(next, cookie);
+			
 		} else {
+			
 			nextChild = treAccounts->GetNextSibling(nextChild);
+			
 		}
 		
 		if (nextChild == selectedChild){
@@ -270,7 +273,6 @@ wxString frmImportContacts::GetAccount()
 	
 		}
 	
-
 	}
 	
 	return AccountName;
@@ -297,9 +299,13 @@ wxString frmImportContacts::GetAccountType()
 	for (int i = 0; i < preferences.accounts.GetCount(); i++){
 
 		if (!nextChild){
+			
 			nextChild = treAccounts->GetFirstChild(next, cookie);
+			
 		} else {
+			
 			nextChild = treAccounts->GetNextSibling(nextChild);
+			
 		}
 		
 		if (nextChild == selectedChild){