Merge pull request xbmc#6573 from Montellese/fix_several_warnings

mkortstiege · Mar 3, 2015 · b7d1690 · b7d1690
2 parents a9b8c36 + ada3e90
commit b7d1690
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/xbmc/addons/AddonCallbacksGUI.cpp b/xbmc/addons/AddonCallbacksGUI.cpp
@@ -1723,10 +1723,10 @@ bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPa
 int CAddonCallbacksGUI::Dialog_Keyboard_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs)
 {
   std::string str = &strPassword;
-  int bRet = CGUIKeyboardFactory::ShowAndVerifyNewPassword(str, strHeading, iRetries, autoCloseMs);
-  if (bRet)
+  int iRet = CGUIKeyboardFactory::ShowAndVerifyPassword(str, strHeading, iRetries, autoCloseMs);
+  if (iRet)
     strncpy(&strPassword, str.c_str(), iMaxStringSize);
-  return bRet;
+  return iRet;
 }
 
 bool CAddonCallbacksGUI::Dialog_Keyboard_ShowAndGetFilter(char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs)

diff --git a/xbmc/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp
@@ -282,7 +282,7 @@ bool CPVRRecordings::RenameRecording(CFileItem &item, std::string &strNewName)
 
 bool CPVRRecordings::DeleteAllRecordingsFromTrash()
 {
-  return g_PVRClients->DeleteAllRecordingsFromTrash();
+  return g_PVRClients->DeleteAllRecordingsFromTrash() == PVR_ERROR_NO_ERROR;
 }
 
 bool CPVRRecordings::SetRecordingsPlayCount(const CFileItemPtr &item, int count)

diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
@@ -159,7 +159,7 @@ namespace MathUtils
   {
     assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
     assert(x < static_cast<double>(INT_MAX / 2) + 1.0);
-    return x;
+    return static_cast<int>(x);
   }
 
   inline int64_t abs(int64_t a)