[akhaldi] 61319: [EXPLORER] * Add resource.h inclusion to the main header. * Remove some unneeded inclusions. CORE-7716
Author: akhaldi Date: Sat Dec 21 14:15:30 2013 New Revision: 61319
URL: http://svn.reactos.org/svn/reactos?rev=61319&view=rev Log: [EXPLORER] * Add resource.h inclusion to the main header. * Remove some unneeded inclusions. CORE-7716
Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp trunk/reactos/base/shell/explorer/dialogs/settings.cpp trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/shell/filechild.cpp trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/pane.cpp trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp trunk/reactos/base/shell/explorer/shell/shellfs.cpp trunk/reactos/base/shell/explorer/shell/webchild.cpp trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp trunk/reactos/base/shell/explorer/utility/window.cpp
Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/desktop... ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,8 +28,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "../taskbar/desktopbar.h" #include "../taskbar/taskbar.h" // for PM_GET_LAST_ACTIVE
Modified: trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialogs... ============================================================================== --- trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/dialogs/searchprogram.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -30,8 +30,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "searchprogram.h"
Modified: trunk/reactos/base/shell/explorer/dialogs/settings.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/dialogs... ============================================================================== --- trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/dialogs/settings.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -30,8 +30,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "../taskbar/traynotify.h" #include "settings.h"
Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explore... ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -30,11 +30,7 @@
#include <precomp.h> // <precomp.h> instead of "precomp.h" because the ROS build system needs this to find the precompiled header file (*.gch) in the output directory tree
-#include "resource.h" - #include <locale.h> // for setlocale() - -#include <wincon.h>
#ifndef __WINE__ #include <io.h> // for dup2()
Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precomp... ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -48,3 +48,5 @@
#include "globals.h" #include "externals.h" + +#include "resource.h"
Modified: trunk/reactos/base/shell/explorer/shell/filechild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/f... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -32,9 +32,6 @@ #include "regfs.h" #include "fatfs.h"
-#include "../resource.h" - - FileChildWndInfo::FileChildWndInfo(HWND hmdiclient, LPCTSTR path, ENTRY_TYPE etype) : super(hmdiclient), _etype(etype)
Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/m... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -33,8 +33,6 @@ */ extern HWND create_webchildwindow(const WebChildWndInfo& info);
-#include "../resource.h" - #include "../dialogs/settings.h" // for MdiSdiDlg
//#define _NO_REBAR
Modified: trunk/reactos/base/shell/explorer/shell/pane.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/p... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/pane.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,9 +28,6 @@
#include <precomp.h>
-#include "../resource.h" - - enum IMAGE { IMG_NONE=-1, IMG_FILE=0, IMG_DOCUMENT, IMG_EXECUTABLE, IMG_FOLDER, IMG_OPEN_FOLDER, IMG_FOLDER_PLUS,IMG_OPEN_PLUS, IMG_OPEN_MINUS,
Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/s... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,14 +28,10 @@
#include <precomp.h>
-#include "../resource.h" - - // work around GCC's wide string constant bug #ifdef __GNUC__ const LPCTSTR C_DRIVE = C_DRIVE_STR; #endif -
ShellBrowser::ShellBrowser(HWND hwnd, HWND hwndFrame, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info, BrowserCallback* cb, CtxMenuInterfaces& cm_ifs)
Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/s... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,12 +28,6 @@
#include <precomp.h>
-//#include "shellfs.h" -//#include "winfs.h" - -#include <shlwapi.h> - - bool ShellDirectory::fill_w32fdata_shell(LPCITEMIDLIST pidl, SFGAOF attribs, WIN32_FIND_DATA* pw32fdata, BY_HANDLE_FILE_INFORMATION* pbhfi, bool do_access) { CONTEXT("ShellDirectory::fill_w32fdata_shell()");
Modified: trunk/reactos/base/shell/explorer/shell/webchild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/w... ============================================================================== --- trunk/reactos/base/shell/explorer/shell/webchild.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/webchild.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -25,18 +25,11 @@ // Martin Fuchs, 08.02.2004 //
- #include <precomp.h>
-#include "../resource.h" - #include "webchild.h"
- #include <comutil.h> - -//#include <mshtml.h> -
Variant::Variant(const VARIANT& var) {
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,8 +28,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "desktopbar.h" #include "taskbar.h" #include "startmenu.h"
Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,8 +28,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "quicklaunch.h"
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -32,8 +32,6 @@
#include <precomp.h>
-#include "../resource.h" - #include "desktopbar.h" #include "startmenu.h"
Modified: trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/traynotify.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,10 +28,7 @@
#include <precomp.h>
-#include "../resource.h" - #include "traynotify.h" -
#include "../notifyhook/notifyhook.h"
Modified: trunk/reactos/base/shell/explorer/utility/window.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utility... ============================================================================== --- trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/window.cpp [iso-8859-1] Sat Dec 21 14:15:30 2013 @@ -28,9 +28,6 @@
#include <precomp.h>
-#include "../resource.h" // for ID_GO_BACK, ... - - WindowClass::WindowClass(LPCTSTR classname, UINT style_, WNDPROC wndproc) { memset(this, 0, sizeof(WNDCLASSEX));
-
akhaldi＠svn.reactos.org