cppcheck performance fixes

xbmc/Application.cpp

@@ -3204,7 +3204,7 @@ bool CApplication::ProcessEventServer(float frameTime)
     }
   }
 
-  if (m_lastAxisMap.size() > 0)
+  if (!m_lastAxisMap.empty())
   {
     // Process all the stored axis.
     for (map<std::string, map<int, float> >::iterator iter = m_lastAxisMap.begin(); iter != m_lastAxisMap.end(); ++iter)

xbmc/ApplicationMessenger.cpp

@@ -118,7 +118,7 @@ void CApplicationMessenger::Cleanup()
 {
   CSingleLock lock (m_critSection);
 
-  while (m_vecMessages.size() > 0)
+  while (!m_vecMessages.empty())
   {
     ThreadMessage* pMsg = m_vecMessages.front();
 
@@ -129,7 +129,7 @@ void CApplicationMessenger::Cleanup()
     m_vecMessages.pop();
   }
 
-  while (m_vecWindowMessages.size() > 0)
+  while (!m_vecWindowMessages.empty())
   {
     ThreadMessage* pMsg = m_vecWindowMessages.front();
 
@@ -203,7 +203,7 @@ void CApplicationMessenger::ProcessMessages()
 {
   // process threadmessages
   CSingleLock lock (m_critSection);
-  while (m_vecMessages.size() > 0)
+  while (!m_vecMessages.empty())
   {
     ThreadMessage* pMsg = m_vecMessages.front();
     //first remove the message from the queue, else the message could be processed more then once
@@ -871,7 +871,7 @@ void CApplicationMessenger::ProcessWindowMessages()
 {
   CSingleLock lock (m_critSection);
   //message type is window, process window messages
-  while (m_vecWindowMessages.size() > 0)
+  while (!m_vecWindowMessages.empty())
   {
     ThreadMessage* pMsg = m_vecWindowMessages.front();
     //first remove the message from the queue, else the message could be processed more then once

xbmc/CueDocument.cpp

@@ -69,9 +69,6 @@ using namespace XFILE;
 
 CCueDocument::CCueDocument(void)
 {
-  m_strArtist = "";
-  m_strAlbum = "";
-  m_strGenre = "";
   m_iYear = 0;
   m_replayGainAlbumPeak = 0.0f;
   m_replayGainAlbumGain = 0.0f;
@@ -249,7 +246,7 @@ void CCueDocument::GetMediaFiles(vector<std::string>& mediaFiles)
   for (int i = 0; i < m_iTotalTracks; i++)
     uniqueFiles.insert(m_Track[i].strFile);
 
-  for (set<std::string>::iterator it = uniqueFiles.begin(); it != uniqueFiles.end(); it++)
+  for (set<std::string>::iterator it = uniqueFiles.begin(); it != uniqueFiles.end(); ++it)
     mediaFiles.push_back(*it);
 }
 

xbmc/DynamicDll.cpp

@@ -31,9 +31,9 @@ DllDynamic::DllDynamic()
   m_DelayUnload=true;
 }
 
-DllDynamic::DllDynamic(const std::string& strDllName)
+DllDynamic::DllDynamic(const std::string& strDllName):
+  m_strDllName(strDllName)
 {
-  m_strDllName=strDllName;
   m_dll=NULL;
   m_DelayUnload=true;
 }

xbmc/GUIInfoManager.cpp

@@ -5662,7 +5662,7 @@ std::string CGUIInfoManager::GetSkinVariableString(int info,
 
 bool CGUIInfoManager::ConditionsChangedValues(const std::map<INFO::InfoPtr, bool>& map)
 {
-  for (std::map<INFO::InfoPtr, bool>::const_iterator it = map.begin() ; it != map.end() ; it++)
+  for (std::map<INFO::InfoPtr, bool>::const_iterator it = map.begin() ; it != map.end() ; ++it)
   {
     if (it->first->Get() != it->second)
       return true;

xbmc/GUILargeTextureManager.cpp

@@ -32,9 +32,9 @@
 using namespace std;
 
 
-CImageLoader::CImageLoader(const std::string &path, const bool useCache)
+CImageLoader::CImageLoader(const std::string &path, const bool useCache):
+  m_path(path)
 {
-  m_path = path;
   m_texture = NULL;
   m_use_cache = useCache;
 }
@@ -78,9 +78,9 @@ bool CImageLoader::DoWork()
   return true;
 }
 
-CGUILargeTextureManager::CLargeTexture::CLargeTexture(const std::string &path)
+CGUILargeTextureManager::CLargeTexture::CLargeTexture(const std::string &path):
+  m_path(path)
 {
-  m_path = path;
   m_refCount = 1;
   m_timeToDelete = 0;
 }

xbmc/LangInfo.cpp

@@ -44,28 +44,25 @@ using namespace PVR;
 
 #define SPEED_UNIT_STRINGS 20200
 
-CLangInfo::CRegion::CRegion(const CRegion& region)
-{
-  m_strName=region.m_strName;
-  m_forceUnicodeFont=region.m_forceUnicodeFont;
-  m_strGuiCharSet=region.m_strGuiCharSet;
-  m_strSubtitleCharSet=region.m_strSubtitleCharSet;
-  m_strDVDMenuLanguage=region.m_strDVDMenuLanguage;
-  m_strDVDAudioLanguage=region.m_strDVDAudioLanguage;
-  m_strDVDSubtitleLanguage=region.m_strDVDSubtitleLanguage;
-  m_strLangLocaleName = region.m_strLangLocaleName;
-  m_strLangLocaleCodeTwoChar = region.m_strLangLocaleCodeTwoChar;
-  m_strRegionLocaleName = region.m_strRegionLocaleName;
-
-  m_strDateFormatShort=region.m_strDateFormatShort;
-  m_strDateFormatLong=region.m_strDateFormatLong;
-  m_strTimeFormat=region.m_strTimeFormat;
+CLangInfo::CRegion::CRegion(const CRegion& region):
+  m_strGuiCharSet(region.m_strGuiCharSet),
+  m_strSubtitleCharSet(region.m_strSubtitleCharSet),
+  m_strDVDMenuLanguage(region.m_strDVDMenuLanguage),
+  m_strDVDAudioLanguage(region.m_strDVDAudioLanguage),
+  m_strDVDSubtitleLanguage(region.m_strDVDSubtitleLanguage),
+  m_strLangLocaleName(region.m_strLangLocaleName),
+  m_strLangLocaleCodeTwoChar(region.m_strLangLocaleCodeTwoChar),
+  m_strRegionLocaleName(region.m_strRegionLocaleName),
+  m_strName(region.m_strName),
+  m_strDateFormatLong(region.m_strDateFormatLong),
+  m_strDateFormatShort(region.m_strDateFormatShort),
+  m_strTimeFormat(region.m_strTimeFormat),
+  m_strTimeZone(region.m_strTimeZone)
+{
   m_strMeridiemSymbols[MERIDIEM_SYMBOL_PM]=region.m_strMeridiemSymbols[MERIDIEM_SYMBOL_PM];
   m_strMeridiemSymbols[MERIDIEM_SYMBOL_AM]=region.m_strMeridiemSymbols[MERIDIEM_SYMBOL_AM];
-  m_strTimeFormat=region.m_strTimeFormat;
   m_tempUnit=region.m_tempUnit;
   m_speedUnit=region.m_speedUnit;
-  m_strTimeZone = region.m_strTimeZone;
 }
 
 CLangInfo::CRegion::CRegion()

xbmc/PartyModeManager.cpp

@@ -610,7 +610,7 @@ bool CPartyModeManager::AddInitialSongs(vector<pair<int,int> > &songIDs)
     std::string sqlWhereMusic = "songview.idSong IN (";
     std::string sqlWhereVideo = "idMVideo IN (";
 
-    for (vector< pair<int,int> >::iterator it = chosenSongIDs.begin(); it != chosenSongIDs.end(); it++)
+    for (vector< pair<int,int> >::iterator it = chosenSongIDs.begin(); it != chosenSongIDs.end(); ++it)
     {
       std::string song = StringUtils::Format("%i,", it->second);
       if (it->first == 1)

xbmc/TextureCacheJob.cpp

@@ -37,11 +37,11 @@
 #include "cores/omxplayer/OMXImage.h"
 #endif
 
-CTextureCacheJob::CTextureCacheJob(const std::string &url, const std::string &oldHash)
+CTextureCacheJob::CTextureCacheJob(const std::string &url, const std::string &oldHash):
+  m_url(url),
+  m_oldHash(oldHash),
+  m_cachePath(CTextureCache::GetCacheFile(m_url))
 {
-  m_url = url;
-  m_oldHash = oldHash;
-  m_cachePath = CTextureCache::GetCacheFile(m_url);
 }
 
 CTextureCacheJob::~CTextureCacheJob()
@@ -208,9 +208,9 @@ std::string CTextureCacheJob::GetImageHash(const std::string &url)
   return "";
 }
 
-CTextureDDSJob::CTextureDDSJob(const std::string &original)
+CTextureDDSJob::CTextureDDSJob(const std::string &original):
+  m_original(original)
 {
-  m_original = original;
 }
 
 bool CTextureDDSJob::operator==(const CJob* job) const

xbmc/dialogs/GUIDialogContextMenu.cpp

@@ -208,7 +208,7 @@ float CGUIDialogContextMenu::GetWidth() const
     return CGUIDialog::GetWidth();
 }
 
-bool CGUIDialogContextMenu::SourcesMenu(const std::string &strType, const CFileItemPtr item, float posX, float posY)
+bool CGUIDialogContextMenu::SourcesMenu(const std::string &strType, const CFileItemPtr& item, float posX, float posY)
 {
   // TODO: This should be callable even if we don't have any valid items
   if (!item)
@@ -224,7 +224,7 @@ bool CGUIDialogContextMenu::SourcesMenu(const std::string &strType, const CFileI
   return false;
 }
 
-void CGUIDialogContextMenu::GetContextButtons(const std::string &type, const CFileItemPtr item, CContextButtons &buttons)
+void CGUIDialogContextMenu::GetContextButtons(const std::string &type, const CFileItemPtr& item, CContextButtons &buttons)
 {
   // Add buttons to the ContextMenu that should be visible for both sources and autosourced items
   if (item && item->IsRemovable())
@@ -301,7 +301,7 @@ void CGUIDialogContextMenu::GetContextButtons(const std::string &type, const CFi
     buttons.Add(CONTEXT_BUTTON_REACTIVATE_LOCK, 12353);
 }
 
-bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFileItemPtr item, CONTEXT_BUTTON button)
+bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFileItemPtr& item, CONTEXT_BUTTON button)
 {
   // Add Source doesn't require a valid share
   if (button == CONTEXT_BUTTON_ADD_SOURCE)

xbmc/dialogs/GUIDialogContextMenu.h

@@ -158,11 +158,11 @@ class CGUIDialogContextMenu :
   virtual bool OnAction(const CAction& action);
   virtual void SetPosition(float posX, float posY);
 
-  static bool SourcesMenu(const std::string &strType, const CFileItemPtr item, float posX, float posY);
+  static bool SourcesMenu(const std::string &strType, const CFileItemPtr& item, float posX, float posY);
   static void SwitchMedia(const std::string& strType, const std::string& strPath);
 
-  static void GetContextButtons(const std::string &type, const CFileItemPtr item, CContextButtons &buttons);
-  static bool OnContextButton(const std::string &type, const CFileItemPtr item, CONTEXT_BUTTON button);
+  static void GetContextButtons(const std::string &type, const CFileItemPtr& item, CContextButtons &buttons);
+  static bool OnContextButton(const std::string &type, const CFileItemPtr& item, CONTEXT_BUTTON button);
 
   /*! \brief Show the context menu with the given choices
    \param choices the choices available for the user.

xbmc/filesystem/test/TestFileFactory.cpp

@@ -39,10 +39,10 @@ class TestFileFactory : public testing::Test
         CXBMCTestUtils::Instance().getGUISettingsFiles();
 
       std::vector<std::string>::iterator it;
-      for (it = guisettings.begin(); it < guisettings.end(); it++)
+      for (it = guisettings.begin(); it < guisettings.end(); ++it)
         CSettings::Get().Load(*it);
 
-      for (it = advancedsettings.begin(); it < advancedsettings.end(); it++)
+      for (it = advancedsettings.begin(); it < advancedsettings.end(); ++it)
         g_advancedSettings.ParseSettingsFile(*it);
 
       CSettings::Get().SetLoaded();
@@ -74,7 +74,7 @@ TEST_F(TestFileFactory, Read)
     CXBMCTestUtils::Instance().getTestFileFactoryReadUrls();
 
   std::vector<std::string>::iterator it;
-  for (it = urls.begin(); it < urls.end(); it++)
+  for (it = urls.begin(); it < urls.end(); ++it)
   {
     std::cout << "Testing URL: " << *it << std::endl;
     ASSERT_TRUE(file.Open(*it));
@@ -128,7 +128,7 @@ TEST_F(TestFileFactory, Write)
     CXBMCTestUtils::Instance().getTestFileFactoryWriteUrls();
 
   std::vector<std::string>::iterator it;
-  for (it = urls.begin(); it < urls.end(); it++)
+  for (it = urls.begin(); it < urls.end(); ++it)
   {
     std::cout << "Testing URL: " << *it << std::endl;
     std::cout << "Writing...";

xbmc/guilib/GUIFont.cpp

@@ -58,9 +58,9 @@ float CScrollInfo::GetPixelsPerFrame()
 }
 
 CGUIFont::CGUIFont(const std::string& strFontName, uint32_t style, color_t textColor,
-		   color_t shadowColor, float lineSpacing, float origHeight, CGUIFontTTFBase *font)
+                  color_t shadowColor, float lineSpacing, float origHeight, CGUIFontTTFBase *font):
+  m_strFontName(strFontName)
 {
-  m_strFontName = strFontName;
   m_style = style & FONT_STYLE_MASK;
   m_textColor = textColor;
   m_shadowColor = shadowColor;

xbmc/guilib/GUILabel.h

@@ -33,15 +33,15 @@
 class CLabelInfo
 {
 public:
-  CLabelInfo()
+  CLabelInfo():
+    scrollSuffix(" | ")
   {
     font = NULL;
     align = XBFONT_LEFT;
     offsetX = offsetY = 0;
     width = 0;
     angle = 0;
     scrollSpeed = CScrollInfo::defaultSpeed;
-    scrollSuffix = " | ";
   };
   bool UpdateColors()
   {

xbmc/guilib/GUIMultiSelectText.cpp

@@ -28,9 +28,9 @@ using namespace std;
 
 CGUIMultiSelectTextControl::CSelectableString::CSelectableString(CGUIFont *font, const std::string &text, bool selectable, const std::string &clickAction)
  : m_text(font, false)
+ , m_clickAction(clickAction)
 {
   m_selectable = selectable;
-  m_clickAction = clickAction;
   StringUtils::TrimLeft(m_clickAction, " =");
   StringUtils::TrimRight(m_clickAction);
   m_text.Update(text);

xbmc/guilib/GUIRSSControl.cpp

@@ -31,14 +31,13 @@ using namespace std;
 
 CGUIRSSControl::CGUIRSSControl(int parentID, int controlID, float posX, float posY, float width, float height, const CLabelInfo& labelInfo, const CGUIInfoColor &channelColor, const CGUIInfoColor &headlineColor, std::string& strRSSTags)
 : CGUIControl(parentID, controlID, posX, posY, width, height),
+  m_strRSSTags(strRSSTags),
   m_label(labelInfo),
   m_channelColor(channelColor),
   m_headlineColor(headlineColor),
   m_scrollInfo(0,0,labelInfo.scrollSpeed,""),
   m_dirty(true)
 {
-  m_strRSSTags = strRSSTags;
-
   m_pReader = NULL;
   m_rtl = false;
   m_stopped = false;
@@ -49,6 +48,7 @@ CGUIRSSControl::CGUIRSSControl(int parentID, int controlID, float posX, float po
 CGUIRSSControl::CGUIRSSControl(const CGUIRSSControl &from)
   : CGUIControl(from),
   m_feed(),
+  m_strRSSTags(from.m_strRSSTags),
   m_label(from.m_label),
   m_channelColor(from.m_channelColor),
   m_headlineColor(from.m_headlineColor),
@@ -57,7 +57,6 @@ CGUIRSSControl::CGUIRSSControl(const CGUIRSSControl &from)
   m_scrollInfo(from.m_scrollInfo),
   m_dirty(true)
 {
-  m_strRSSTags = from.m_strRSSTags;
   m_pReader = NULL;
   m_rtl = from.m_rtl;
   m_stopped = from.m_stopped;

xbmc/guilib/GUITexture.cpp

@@ -32,11 +32,11 @@ CTextureInfo::CTextureInfo()
   useLarge = false;
 }
 
-CTextureInfo::CTextureInfo(const std::string &file)
+CTextureInfo::CTextureInfo(const std::string &file):
+  filename(file)
 {
   orientation = 0;
   useLarge = false;
-  filename = file;
 }
 
 CTextureInfo& CTextureInfo::operator=(const CTextureInfo &right)

xbmc/guilib/JpegIO.cpp

@@ -235,7 +235,6 @@ CJpegIO::CJpegIO()
   m_orientation = 0;
   m_inputBuffSize = 0;
   m_inputBuff = NULL;
-  m_texturePath = "";
   memset(&m_cinfo, 0, sizeof(m_cinfo));
   m_thumbnailbuffer = NULL;
 }