Index: src/ch/DirTreeCtrl.cpp
===================================================================
diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/ch/DirTreeCtrl.cpp	(.../DirTreeCtrl.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/DirTreeCtrl.cpp	(.../DirTreeCtrl.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -18,7 +18,6 @@
 ***************************************************************************/
 #include "stdafx.h"
 #include "DirTreeCtrl.h"
-#include "afxtempl.h"
 #include "memdc.h"
 #include "shlobj.h"
 
@@ -370,9 +369,7 @@
 		ULONG ulAttrib = 0;
 		TVITEM tvi = { 0 };
 		TVINSERTSTRUCT tvis = { 0 };
-		_SHELLITEMDATA *psid = nullptr;
 		TCHAR szText[ _MAX_PATH ];
-		HTREEITEM hCurrent = nullptr;
 
 		while (lpeid->Next(1, &lpiidl, nullptr) == NOERROR)
 		{
@@ -385,7 +382,7 @@
 				bFound=true;
 
 				// it's time to add everything
-				psid=new _SHELLITEMDATA;
+				_SHELLITEMDATA* psid=new _SHELLITEMDATA;
 				lpsf->BindToObject(lpiidl, nullptr, IID_IShellFolder, (void**)&psid->lpsf);
 				psid->lpiidl=ConcatPidls(lpidl, lpiidl);
 				psid->lpiidlRelative=CopyITEMID(lpm, lpiidl);
@@ -402,7 +399,7 @@
 
 				tvis.hParent=hParent;
 				tvis.item=tvi;
-				hCurrent=InsertItem(&tvis);
+				HTREEITEM hCurrent=InsertItem(&tvis);
 
 				if (hParent == GetRootItem() && lpsfDesktop)
 				{
@@ -592,8 +589,8 @@
 		lpsf->Release();
 		return true;
 	}
-	else
-		return false;
+
+	return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -614,14 +611,12 @@
 
 	if (!bNetwork)
 		return SetLocalPath(lpszPath);
-	else
-	{
-		// we don't look in net neighborhood for speed reasons
-		EnsureVisible(m_hNetwork);
+
+	// we don't look in net neighborhood for speed reasons
+	EnsureVisible(m_hNetwork);
 //		SelectItem(m_hNetwork);
 //		ExpandItem(m_hNetwork, TVE_EXPAND);
-		return true;
-	}
+	return true;
 }
 
 
@@ -709,8 +704,8 @@
 
 		return strSrc == strFnd;
 	}
-	else
-		return false;
+
+	return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -723,7 +718,7 @@
 
 	// get interface
 	IQueryInfo *pqi;
-	if (psid->lpsfParent->GetUIObjectOf(this->GetSafeHwnd(), 1, (const struct _ITEMIDLIST**)&psid->lpiidlRelative, IID_IQueryInfo, 0, (void**)&pqi) != NOERROR)
+	if (psid->lpsfParent->GetUIObjectOf(this->GetSafeHwnd(), 1, (const struct _ITEMIDLIST**)&psid->lpiidlRelative, IID_IQueryInfo, nullptr, (void**)&pqi) != NOERROR)
 		return false;
 
 	// get tip