X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Flibraries%2FCalendarDataStorage%2FCalendarDataStorage.cpp;h=5b24853ebbc8c4d1fb5ae44bace917052b6ef8af;hp=d6d335effb23714aad62d8c1643850fa906dea06;hb=49789773e2797383c866dca470fb99e80cb49e41;hpb=b604cc6ce09143a994ca364684cd276f78bd33da

diff --git a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
index d6d335e..5b24853 100644
--- a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
+++ b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
@@ -586,7 +586,8 @@ CDSCalendarResult CalendarDataStorage::AddCalendar(int accountID, string calenda
 		return CDSCALENDAR_FAILED;
 	}
 	
-	resultCode = sqlite3_bind_text(statementHandle, 4, ((string)calendarColour).c_str(), -1, SQLITE_STATIC);
+	string calendarColourString = (string)calendarColour;
+	resultCode = sqlite3_bind_text(statementHandle, 4, calendarColourString.c_str(), -1, SQLITE_STATIC);
 
 	if (resultCode != 0){
 		return CDSCALENDAR_FAILED;
@@ -858,7 +859,8 @@ CDSCalendarResult CalendarDataStorage::UpdateCalendar(int calendarID, string cal
 		return CDSCALENDAR_FAILED;
 	}
 
-	resultCode = sqlite3_bind_text(statementHandle, 2, string(calendarColour).c_str(), -1, SQLITE_STATIC);
+	string calendarColourString = calendarColour;
+	resultCode = sqlite3_bind_text(statementHandle, 2, calendarColourString.c_str(), -1, SQLITE_STATIC);
 	
 	if (resultCode != 0){
 		return CDSCALENDAR_FAILED;
@@ -984,9 +986,9 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
 	
 	// Load the event file.
 	
-	CalendarEventObject eventData;
+	CalendarEventObject eventData;	
 	CalendarObjectLoadResult eventLoadResult = eventData.LoadFile(filename);
-	
+
 	// Check the result of the event file load.
 	
 	switch (eventLoadResult){