X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fcommon%2Ftext.cpp;h=5ef23f136111d1aee7093b0a8ea979a9259f84a7;hp=4581e385961a9961ff219456940db8bc25584aa1;hb=1fe6e43892e5c572949a293a9e19704b5debadad;hpb=2e304ff435c80c07daaf0d3fbe8a9ab7d1ae70b1 diff --git a/source/common/text.cpp b/source/common/text.cpp index 4581e38..5ef23f1 100644 --- a/source/common/text.cpp +++ b/source/common/text.cpp @@ -20,7 +20,7 @@ using namespace std; -multimap ProcessTextVectors(vector *TextProperties, +multimap ProcessTextVectors(vector *textProperties, vector *textValues, bool searchMultiple, string property){ @@ -60,7 +60,7 @@ multimap ProcessTextVectors(vector *TextProperties, break; } - PropertyName += bufferChar; + propertyName += bufferChar; textSeekCount++; @@ -169,7 +169,7 @@ PropertyNameValue SplitNameValue(string inputData){ finalNameValue.name = inputData.substr(0, seekCount); try{ - finalNameValue.Value = inputData.substr((seekCount + 1)); + finalNameValue.value = inputData.substr((seekCount + 1)); } catch (const out_of_range &oor){ @@ -186,7 +186,7 @@ PropertyNameValue SplitNameValue(string inputData){ if (dataFound == false){ - finalNameValue.Name = inputData; + finalNameValue.name = inputData; } @@ -316,11 +316,11 @@ void SplitPathFilename(string *calendarEntryHREF, string *entryURIPath, // Get the string before the last hash for the path. - (*entryURIPath) = calendarEntryHREF->substr(0, (LastForwardSlash + 1)); + (*entryURIPath) = calendarEntryHREF->substr(0, (lastForwardSlash + 1)); // Get the string after the last hash for the filename. - (*entryFilename) = calendarEntryHREF->substr((LastForwardSlash + 1)); + (*entryFilename) = calendarEntryHREF->substr((lastForwardSlash + 1)); } @@ -332,7 +332,7 @@ string OutputText(string *textInput){ int lineSeek = 0; int maxLineSeek = 77; - for (charSeek = 0; charSeek < TextInput->size(); charSeek++){ + for (charSeek = 0; charSeek < textInput->size(); charSeek++){ lineSeek++; @@ -342,7 +342,7 @@ string OutputText(string *textInput){ outputLine += textInput->substr(charSeek, 1); } outputLine += "\n"; - outputTextData += OutputLine; + outputTextData += outputLine; outputLine = " "; lineSeek = 0; maxLineSeek = 76;