Merge branch 'master' of ssh://gelforn.xestia.co.uk:/scmrepos/xestiaab

Conflicts:
	source/contacteditor/frmContactEditor-Business.cpp

diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp
index 61531df..86791e4 100644 (file)
--- a/source/common/getcontactinfo.cpp
+++ b/source/common/getcontactinfo.cpp
@@ -95,7 +95,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        // MAke sure new session ID doesn't conflict with existing
        // data. If there is a match, generate a new one and check again.
        
-       bool SIDMatch = FALSE;
        wxString SIDTemp;
        
        for (std::map<wxString, wxString>::iterator striter = MemoryFSList->begin();
@@ -494,13 +493,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        }
        
-       bool MultiLogoIcon = FALSE;
-       bool MultiPhotoIcon = FALSE;
-       bool SoundIcon = FALSE;
-       bool KeyIcon = FALSE;
-       bool VendorIcon = FALSE;
-       bool XTokenIcon = FALSE;
-       
        // Process Birthday
        
        ContactData = vCardObj->GetByPartial(wxT("BDAY"));

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index e3751df..f28510e 100644 (file)
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -48,10 +48,6 @@ wxString GenerateUUID()
        char strdata[64];
        std::string uuidout;
     
-       size_t readsize;
-       int size = 0;
-       int maxsize = 63;
-    
        while (fgets(strdata, sizeof(strdata), uuid_hdl) != NULL){
                uuidout.append(strdata);
        }

diff --git a/source/vcard/vcard.cpp b/source/vcard/vcard.cpp
index b6a9ee9..bc9cd81 100644 (file)
--- a/source/vcard/vcard.cpp
+++ b/source/vcard/vcard.cpp
@@ -198,7 +198,6 @@ vCardName vCard::GetName(){
        // Process the name data to get the required information.
        
        int intPropertyLen = NameDataGet.Len();
-       int intSplitSeek = 0;
        int intSplitsFound = 0;
        int intSplitSize = 0;
        int intPrevValue = 0;                                   
@@ -388,10 +387,8 @@ int vCard::WriteFile(wxString WriteFilename){
     
                int SettingLineLen = SettingLine.Len();
                int intDivider = 74;
-               int intTimes = floor((SettingLine.Len() / intDivider));
                int intSeek = 0;
                int intLineSeek = 0;
-               int intPrevLine;
                bool FirstLine = TRUE;
     
                // Remember to round down the calculation.
@@ -405,7 +402,6 @@ int vCard::WriteFile(wxString WriteFilename){
                                intSeek = intSeek + 3;
                                SettingLineLen = SettingLineLen + 3;
                                intLineSeek = 0;
-                               intPrevLine = intSeek;
                                FirstLine = FALSE;
                
                        }
@@ -414,26 +410,6 @@ int vCard::WriteFile(wxString WriteFilename){
                        intLineSeek++;
        
                }
-
-       /*
-
-       for (int x = 0; x < intTimes; x++){     
-       
-           if (x == 0){
-               SettingLine.insert((intDivider - 1), wxT("\r\n "));
-           } else if (x == intTimes){
-           
-           } else {
-               if (x < intDivider){
-                       SettingLine.insert((intDivider * (x+1)) + (x * 3), wxT("\r\n "));
-               }
-           }
-           
-           intTimes = floor(SettingLine.Len() / intDivider);
-       
-       }
-       
-       */
        
                ContactFile.Write(SettingLine);
        
@@ -511,7 +487,6 @@ void vCard::ProcessString(wxString *ContactDataInc){
        wxString wxSPropertySeg2;
     
        bool FoundBegin = FALSE;
-       bool FoundEnd = FALSE;
        bool FirstContact = TRUE;
        wxString FirstContactData;
        wxString ContactData;
@@ -712,10 +687,8 @@ wxString vCard::WriteString(){
     
                int SettingLineLen = SettingLine.Len();
                int intDivider = 74;
-               int intTimes = floor((SettingLine.Len() / intDivider));
                int intSeek = 0;
                int intLineSeek = 0;
-               int intPrevLine;
                bool FirstLine = TRUE;
     
                // Remember to round down the calculation.
@@ -729,7 +702,6 @@ wxString vCard::WriteString(){
                                intSeek = intSeek + 3;
                                SettingLineLen = SettingLineLen + 3;
                                intLineSeek = 0;
-                               intPrevLine = intSeek;
                                FirstLine = FALSE;
                
                        }

diff --git a/source/vcard/vcard34conv-v3conv.cpp b/source/vcard/vcard34conv-v3conv.cpp
index 67d69e9..362ed85 100644 (file)
--- a/source/vcard/vcard34conv-v3conv.cpp
+++ b/source/vcard/vcard34conv-v3conv.cpp
@@ -78,12 +78,9 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
 
        bool QuoteMode = FALSE;
        bool PropertyFind = TRUE;
-       bool HasExtraNicknames = FALSE;
-       bool IgnoreGender = FALSE;
        bool ExtraLineSeek = TRUE;
        bool BirthdayProcessed = FALSE;
        bool AnniversaryProcessed = FALSE;
-       bool FNProcessed = FALSE;
        bool GenderProcessed = FALSE;
        bool NameProcessed = FALSE;
        bool KindProcessed = FALSE;
@@ -93,40 +90,12 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
        bool OrganisationFirst = FALSE;
        bool NoteFirst = FALSE;
        bool PhotoFirst = FALSE;
-       bool LogoFirst = FALSE;
-       int intExtraNickname = 0;
        wxString wxSProperty;
        wxString wxSPropertySeg1;
        wxString wxSPropertySeg2;
        wxString wxSPropertyNextLine;
        size_t ContactLineLen = 0;
        int QuoteBreakPoint = 0;
-       int FNCount = 0;
-       int NameCount = 0;
-       int NicknameCount = 0;
-       int ADRCount = 0;
-       int EmailCount = 0;
-       int IMPPCount = 0;
-       int TelCount = 0;
-       int LangCount = 0;
-       int TZCount = 0;
-       int GeoCount = 0;
-       int URLCount = 0;
-       int RelatedCount = 0;
-       int TitleCount = 0;
-       int RoleCount = 0;
-       int OrgCount = 0;
-       int NoteCount = 0;
-       int CategoryCount = 0;
-       int PhotoCount = 0;
-       int LogoCount = 0;
-       int SoundCount = 0;
-       int CalAdrCount = 0;
-       int CalReqAdrCount = 0;
-       int FreeBusyCount = 0;
-       int KeyCount = 0;
-       int VendorCount = 0;
-       int XTokenCount = 0;
        int ItemSeek = 1;
        
        wxString strVer;
@@ -307,9 +276,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        wxString PropertyName;
                        wxString PropertyValue;
                        wxString PropertyTokens;
-                       int intPrevValue = 5;
-
-                       intPrevValue = 4;
                
                        ContactDatav3.AddRaw(wxT("X-ADDRESSBOOKSERVER-KIND"), wxSPropertySeg2);
                
@@ -326,9 +292,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        wxString PropertyName;
                        wxString PropertyValue;
                        wxString PropertyTokens;
-                       int intPrevValue = 7;
-
-                       intPrevValue = 6;
 
                        ContactDatav3.AddRaw(wxT("X-ADDRESSBOOKSERVER-MEMBER"), wxSPropertySeg2);
                
@@ -746,7 +709,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                        int intSplitsFound = 0;
                        int intSplitSize = 0;
                        int intPrevValue = 5;
-                       int intType = 0;
                        int intSplitPoint = 0;
 
                        intPrevValue = 4;
@@ -845,16 +807,6 @@ bool vCard34Conv::ConvertToV3(wxString Filename, wxString *wxSData){
                                                        TelTypeUI.Append(wxT(","));                                                     
                                                
                                                }
-                                       
-                                               if (TypePropertyName == wxT("home")){
-                                               
-                                                       intType = 1;
-                                               
-                                               } else if (TypePropertyName == wxT("work")){
-                                               
-                                                       intType = 2;
-                                               
-                                               }
                                                
                                                if (TypePropertyName == wxT("text")){                                           
 

diff --git a/source/vcard/vcard34conv-v4conv.cpp b/source/vcard/vcard34conv-v4conv.cpp
index 3e0ff06..f9a70ca 100644 (file)
--- a/source/vcard/vcard34conv-v4conv.cpp
+++ b/source/vcard/vcard34conv-v4conv.cpp
@@ -57,21 +57,13 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){
        bool PropertyFind = TRUE;
        bool ExtraLineSeek = TRUE;
        bool ExtraLineSeekSub = TRUE;
-       bool BirthdayProcessed = FALSE;
-       bool AnniversaryProcessed = FALSE;
-       bool FNProcessed = FALSE;
-       bool GenderProcessed = FALSE;
-       bool NameProcessed = FALSE;
        bool FNFirst = FALSE;
        bool NicknameFirst = FALSE;
        bool TitleFirst = FALSE;
        bool OrganisationFirst = FALSE;
        bool NoteFirst = FALSE;
        bool PhotoFirst = FALSE;
-       bool LogoFirst = FALSE;
-       bool NameFirst = FALSE;
        bool FoundData = FALSE;
-       int intExtraNickname = 0;
        wxString wxSProperty;
        wxString wxSPropertyVCARD4;
        wxString wxSPropertySeg1;
@@ -107,7 +99,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){
        
        bool XVCard4Value = FALSE;
        bool VCard3Value = FALSE;
-       bool SeekItemData = FALSE;
        
        wxString strVer;
     
@@ -855,40 +846,7 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){
        
        }
        
-       int FNCount = 0;
-       int NameCount = 0;
-       int NicknameCount = 0;
-       int ADRCount = 0;
-       int EmailCount = 0;
-       int IMPPCount = 0;
-       int TelCount = 0;
-       int LangCount = 0;
-       int TZCount = 0;
-       int GeoCount = 0;
-       int URLCount = 0;
-       int RelatedCount = 0;
-       int TitleCount = 0;
-       int RoleCount = 0;
-       int OrgCount = 0;
-       int NoteCount = 0;
-       int CategoryCount = 0;
-       int PhotoCount = 0;
-       int LogoCount = 0;
-       int SoundCount = 0;
-       int CalAdrCount = 0;
-       int CalReqAdrCount = 0;
-       int FreeBusyCount = 0;
-       int KeyCount = 0;
-       int VendorCount = 0;
-       int XTokenCount = 0;
-       int ItemSeek = 1;
-       int MaxItemNumber = 0;
-       int ItemOrdered = 0;
-       int ItemUnordered = 0;
-       int ItemNumber = 0;
        size_t ItemStringSeekLen = 0;
-       int ItemSeekSub = 0;
-       int ItemSeekSecSub = 0;
        
        std::map<int, wxString> NumberedName;
        std::map<int, wxString> NumberedData;
@@ -929,7 +887,6 @@ bool vCard34Conv::ConvertToV4(wxString *wxSData, vCard *vCardOut){
        
        XVCard4Value = FALSE;
        VCard3Value = FALSE;
-       SeekItemData = FALSE;
        
        std::map<wxString, void*> ItemMapIndex;