[WIN32] changed: use const and init lists where appropriated + cosmet…

…ics.
xbmc · Jan 29, 2012 · be630d3 · be630d3
1 parent c3a1fef
commit be630d3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -1033,10 +1033,7 @@ bool CApplication::InitDirectoriesWin32()
   VECSOURCES::const_iterator it;
   for(it=vShare.begin();it!=vShare.end();++it)
     if(g_mediaManager.GetDriveStatus(it->strPath) == DRIVE_CLOSED_MEDIA_PRESENT)
-    {
-      CDetectDisc* discdetection = new CDetectDisc(it->strPath, false);
-      CJobManager::GetInstance().AddJob(discdetection, NULL);
-    }
+      CJobManager::GetInstance().AddJob(new CDetectDisc(it->strPath, false), NULL);
   // remove end
 
   return true;

diff --git a/xbmc/storage/DetectDVDType.cpp b/xbmc/storage/DetectDVDType.cpp
@@ -530,10 +530,9 @@ const CStdString &CDetectDVDMedia::GetDVDPath()
   return m_diskPath;
 }
 
-CDetectDisc::CDetectDisc(const CStdString &strPath, bool bautorun)
+CDetectDisc::CDetectDisc(const CStdString &strPath, const bool bautorun)
+  : m_strPath(strPath), m_bautorun(bautorun)
 {
-  m_strPath  = strPath;
-  m_bautorun = bautorun;
 }
 
 bool CDetectDisc::DoWork()

diff --git a/xbmc/storage/DetectDVDType.h b/xbmc/storage/DetectDVDType.h
@@ -97,7 +97,7 @@ class CDetectDVDMedia : public CThread
 class CDetectDisc : public CJob
 {
 public:
-  CDetectDisc(const CStdString &strPath, bool bautorun);
+  CDetectDisc(const CStdString &strPath, const bool bautorun);
   bool DoWork();
 
 private:

diff --git a/xbmc/windowing/windows/WinEventsWin32.cpp b/xbmc/windowing/windows/WinEventsWin32.cpp
@@ -642,10 +642,7 @@ LRESULT CALLBACK CWinEventsWin32::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
             case SHCNE_MEDIAINSERTED:
               CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media has arrived.", drivePath);
               if (GetDriveType(drivePath) == DRIVE_CDROM)
-              {
-                CDetectDisc* discdetection = new CDetectDisc(drivePath, true);
-                CJobManager::GetInstance().AddJob(discdetection, NULL);
-              }
+                CJobManager::GetInstance().AddJob(new CDetectDisc(drivePath, true), NULL);
               else
                 CWin32StorageProvider::SetEvent();
               break;