From f77c6b549367c2196de1894c03c05c7978505b4b Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 10 Sep 2017 23:44:22 +0000 Subject: [PATCH] [RAPPS] Include cleanup. Patch by sanchaez+small changes by me. svn path=/trunk/; revision=75830 --- reactos/base/applications/rapps/aboutdlg.cpp | 2 +- reactos/base/applications/rapps/available.cpp | 2 +- reactos/base/applications/rapps/gui.cpp | 2 +- reactos/base/applications/rapps/installed.cpp | 2 +- reactos/base/applications/rapps/integrity.cpp | 2 +- reactos/base/applications/rapps/loaddlg.cpp | 2 +- reactos/base/applications/rapps/misc.cpp | 2 +- reactos/base/applications/rapps/settingsdlg.cpp | 4 +--- reactos/base/applications/rapps/unattended.cpp | 6 ++---- reactos/base/applications/rapps/winmain.cpp | 2 +- 10 files changed, 11 insertions(+), 15 deletions(-) diff --git a/reactos/base/applications/rapps/aboutdlg.cpp b/reactos/base/applications/rapps/aboutdlg.cpp index 541c2256409..4e57924bebc 100644 --- a/reactos/base/applications/rapps/aboutdlg.cpp +++ b/reactos/base/applications/rapps/aboutdlg.cpp @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) * Copyright 2017 Alexander Shaposhikov (sanchaez@reactos.org) */ -#include "defines.h" +#include "rapps.h" static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { diff --git a/reactos/base/applications/rapps/available.cpp b/reactos/base/applications/rapps/available.cpp index 2574270a8e3..fd1ba2bce36 100644 --- a/reactos/base/applications/rapps/available.cpp +++ b/reactos/base/applications/rapps/available.cpp @@ -7,7 +7,7 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "available.h" #include "misc.h" diff --git a/reactos/base/applications/rapps/gui.cpp b/reactos/base/applications/rapps/gui.cpp index e8ea7313923..66cb10a7cbb 100644 --- a/reactos/base/applications/rapps/gui.cpp +++ b/reactos/base/applications/rapps/gui.cpp @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2015 David Quintana (gigaherz@gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "rapps.h" #include "rosui.h" diff --git a/reactos/base/applications/rapps/installed.cpp b/reactos/base/applications/rapps/installed.cpp index 2ffe7d86ce6..e1325770da4 100644 --- a/reactos/base/applications/rapps/installed.cpp +++ b/reactos/base/applications/rapps/installed.cpp @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "installed.h" diff --git a/reactos/base/applications/rapps/integrity.cpp b/reactos/base/applications/rapps/integrity.cpp index 81c1baf4a4d..d0fda8af90e 100644 --- a/reactos/base/applications/rapps/integrity.cpp +++ b/reactos/base/applications/rapps/integrity.cpp @@ -6,7 +6,7 @@ * COPYRIGHT: Copyright Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Copyright Mark Jansen */ -#include "defines.h" +#include "rapps.h" #include diff --git a/reactos/base/applications/rapps/loaddlg.cpp b/reactos/base/applications/rapps/loaddlg.cpp index 7b6f2d40a95..6ef55b42c35 100644 --- a/reactos/base/applications/rapps/loaddlg.cpp +++ b/reactos/base/applications/rapps/loaddlg.cpp @@ -28,7 +28,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "defines.h" +#include "rapps.h" #include #include diff --git a/reactos/base/applications/rapps/misc.cpp b/reactos/base/applications/rapps/misc.cpp index 7a35440f4a6..b1c2938b6ba 100644 --- a/reactos/base/applications/rapps/misc.cpp +++ b/reactos/base/applications/rapps/misc.cpp @@ -7,7 +7,7 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" +#include "rapps.h" #include "gui.h" #include "misc.h" diff --git a/reactos/base/applications/rapps/settingsdlg.cpp b/reactos/base/applications/rapps/settingsdlg.cpp index b56923a57f0..9716948de25 100644 --- a/reactos/base/applications/rapps/settingsdlg.cpp +++ b/reactos/base/applications/rapps/settingsdlg.cpp @@ -6,9 +6,7 @@ * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" - -#include "dialogs.h" +#include "rapps.h" SETTINGS_INFO NewSettingsInfo; diff --git a/reactos/base/applications/rapps/unattended.cpp b/reactos/base/applications/rapps/unattended.cpp index 16edd409c40..328dbb5dc97 100644 --- a/reactos/base/applications/rapps/unattended.cpp +++ b/reactos/base/applications/rapps/unattended.cpp @@ -6,12 +6,10 @@ * COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ #include "rapps.h" + #include "unattended.h" -#include "defines.h" -#include "available.h" -#include "dialogs.h" -#include "setupapi.h" +#include #define MIN_ARGS 2 diff --git a/reactos/base/applications/rapps/winmain.cpp b/reactos/base/applications/rapps/winmain.cpp index 5531cd7c9cc..386023785ef 100644 --- a/reactos/base/applications/rapps/winmain.cpp +++ b/reactos/base/applications/rapps/winmain.cpp @@ -7,8 +7,8 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "defines.h" #include "rapps.h" + #include "unattended.h" #include -- 2.17.1