From 1441b8007ffdb9cb9bcb04c9d4a8895b5549ae15 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Dec 2013 14:15:30 +0000 Subject: [PATCH] [EXPLORER] * Add resource.h inclusion to the main header. * Remove some unneeded inclusions. CORE-7716 svn path=/trunk/; revision=61319 --- reactos/base/shell/explorer/desktop/desktop.cpp | 2 -- reactos/base/shell/explorer/dialogs/searchprogram.cpp | 2 -- reactos/base/shell/explorer/dialogs/settings.cpp | 2 -- reactos/base/shell/explorer/explorer.cpp | 4 ---- reactos/base/shell/explorer/precomp.h | 2 ++ reactos/base/shell/explorer/shell/filechild.cpp | 3 --- reactos/base/shell/explorer/shell/mainframe.cpp | 2 -- reactos/base/shell/explorer/shell/pane.cpp | 3 --- reactos/base/shell/explorer/shell/shellbrowser.cpp | 4 ---- reactos/base/shell/explorer/shell/shellfs.cpp | 6 ------ reactos/base/shell/explorer/shell/webchild.cpp | 7 ------- reactos/base/shell/explorer/taskbar/desktopbar.cpp | 2 -- reactos/base/shell/explorer/taskbar/quicklaunch.cpp | 2 -- reactos/base/shell/explorer/taskbar/startmenu.cpp | 2 -- reactos/base/shell/explorer/taskbar/traynotify.cpp | 3 --- reactos/base/shell/explorer/utility/window.cpp | 3 --- 16 files changed, 2 insertions(+), 47 deletions(-) diff --git a/reactos/base/shell/explorer/desktop/desktop.cpp b/reactos/base/shell/explorer/desktop/desktop.cpp index 94733c3e8b0..6bb12d2d723 100644 --- a/reactos/base/shell/explorer/desktop/desktop.cpp +++ b/reactos/base/shell/explorer/desktop/desktop.cpp @@ -28,8 +28,6 @@ #include -#include "../resource.h" - #include "../taskbar/desktopbar.h" #include "../taskbar/taskbar.h" // for PM_GET_LAST_ACTIVE diff --git a/reactos/base/shell/explorer/dialogs/searchprogram.cpp b/reactos/base/shell/explorer/dialogs/searchprogram.cpp index f1f639b2eef..0b497175a05 100644 --- a/reactos/base/shell/explorer/dialogs/searchprogram.cpp +++ b/reactos/base/shell/explorer/dialogs/searchprogram.cpp @@ -30,8 +30,6 @@ #include -#include "../resource.h" - #include "searchprogram.h" diff --git a/reactos/base/shell/explorer/dialogs/settings.cpp b/reactos/base/shell/explorer/dialogs/settings.cpp index 3e9c23429e4..3e449b82284 100644 --- a/reactos/base/shell/explorer/dialogs/settings.cpp +++ b/reactos/base/shell/explorer/dialogs/settings.cpp @@ -30,8 +30,6 @@ #include -#include "../resource.h" - #include "../taskbar/traynotify.h" #include "settings.h" diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp index b3de9a9932b..be15d96d98f 100644 --- a/reactos/base/shell/explorer/explorer.cpp +++ b/reactos/base/shell/explorer/explorer.cpp @@ -30,12 +30,8 @@ #include // 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 // for setlocale() -#include - #ifndef __WINE__ #include // for dup2() #include // for _O_RDONLY diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h index ccc73ff8381..0d05450ae49 100644 --- a/reactos/base/shell/explorer/precomp.h +++ b/reactos/base/shell/explorer/precomp.h @@ -48,3 +48,5 @@ #include "globals.h" #include "externals.h" + +#include "resource.h" diff --git a/reactos/base/shell/explorer/shell/filechild.cpp b/reactos/base/shell/explorer/shell/filechild.cpp index 2bb9af57614..26c8adc5500 100644 --- a/reactos/base/shell/explorer/shell/filechild.cpp +++ b/reactos/base/shell/explorer/shell/filechild.cpp @@ -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) diff --git a/reactos/base/shell/explorer/shell/mainframe.cpp b/reactos/base/shell/explorer/shell/mainframe.cpp index ecbaab3ba0a..748be6b8239 100644 --- a/reactos/base/shell/explorer/shell/mainframe.cpp +++ b/reactos/base/shell/explorer/shell/mainframe.cpp @@ -33,8 +33,6 @@ */ extern HWND create_webchildwindow(const WebChildWndInfo& info); -#include "../resource.h" - #include "../dialogs/settings.h" // for MdiSdiDlg //#define _NO_REBAR diff --git a/reactos/base/shell/explorer/shell/pane.cpp b/reactos/base/shell/explorer/shell/pane.cpp index 0273fb67802..6ce13b1ad98 100644 --- a/reactos/base/shell/explorer/shell/pane.cpp +++ b/reactos/base/shell/explorer/shell/pane.cpp @@ -28,9 +28,6 @@ #include -#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, diff --git a/reactos/base/shell/explorer/shell/shellbrowser.cpp b/reactos/base/shell/explorer/shell/shellbrowser.cpp index 50b95a3f655..3c8eccf0d53 100644 --- a/reactos/base/shell/explorer/shell/shellbrowser.cpp +++ b/reactos/base/shell/explorer/shell/shellbrowser.cpp @@ -28,15 +28,11 @@ #include -#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) : super(IID_IShellFolderViewCB), diff --git a/reactos/base/shell/explorer/shell/shellfs.cpp b/reactos/base/shell/explorer/shell/shellfs.cpp index 87ea0a128b7..d1115a2e27d 100644 --- a/reactos/base/shell/explorer/shell/shellfs.cpp +++ b/reactos/base/shell/explorer/shell/shellfs.cpp @@ -28,12 +28,6 @@ #include -//#include "shellfs.h" -//#include "winfs.h" - -#include - - 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()"); diff --git a/reactos/base/shell/explorer/shell/webchild.cpp b/reactos/base/shell/explorer/shell/webchild.cpp index 446c3441f8f..22d6d0f8f80 100644 --- a/reactos/base/shell/explorer/shell/webchild.cpp +++ b/reactos/base/shell/explorer/shell/webchild.cpp @@ -25,19 +25,12 @@ // Martin Fuchs, 08.02.2004 // - #include -#include "../resource.h" - #include "webchild.h" - #include -//#include - - Variant::Variant(const VARIANT& var) { VariantInit(this); diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.cpp b/reactos/base/shell/explorer/taskbar/desktopbar.cpp index c740ee94363..4353b060933 100644 --- a/reactos/base/shell/explorer/taskbar/desktopbar.cpp +++ b/reactos/base/shell/explorer/taskbar/desktopbar.cpp @@ -28,8 +28,6 @@ #include -#include "../resource.h" - #include "desktopbar.h" #include "taskbar.h" #include "startmenu.h" diff --git a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp index ce9ab23848d..015dbd5d43a 100644 --- a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp +++ b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp @@ -28,8 +28,6 @@ #include -#include "../resource.h" - #include "quicklaunch.h" diff --git a/reactos/base/shell/explorer/taskbar/startmenu.cpp b/reactos/base/shell/explorer/taskbar/startmenu.cpp index 56f51c48e3c..b1197205b6b 100644 --- a/reactos/base/shell/explorer/taskbar/startmenu.cpp +++ b/reactos/base/shell/explorer/taskbar/startmenu.cpp @@ -32,8 +32,6 @@ #include -#include "../resource.h" - #include "desktopbar.h" #include "startmenu.h" diff --git a/reactos/base/shell/explorer/taskbar/traynotify.cpp b/reactos/base/shell/explorer/taskbar/traynotify.cpp index 7e2690a9af6..802dcbc8bdb 100644 --- a/reactos/base/shell/explorer/taskbar/traynotify.cpp +++ b/reactos/base/shell/explorer/taskbar/traynotify.cpp @@ -28,11 +28,8 @@ #include -#include "../resource.h" - #include "traynotify.h" - #include "../notifyhook/notifyhook.h" NotifyHook::NotifyHook() diff --git a/reactos/base/shell/explorer/utility/window.cpp b/reactos/base/shell/explorer/utility/window.cpp index bb0814d07ef..d3cc80ddcc4 100644 --- a/reactos/base/shell/explorer/utility/window.cpp +++ b/reactos/base/shell/explorer/utility/window.cpp @@ -28,9 +28,6 @@ #include -#include "../resource.h" // for ID_GO_BACK, ... - - WindowClass::WindowClass(LPCTSTR classname, UINT style_, WNDPROC wndproc) { memset(this, 0, sizeof(WNDCLASSEX)); -- 2.17.1