From 494b1cdcdc5ca90d73249b760e8f35bbf5528d67 Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 19 Jan 2007 21:53:27 +0000 Subject: [PATCH] Made the header ordering for WinCE the default for all ports. Ideally, we really need to figure out *why* the WinCE compiler doesn't like the old order, since a compiler shouldn't really care (and it makes it more difficult on the other ports to have to maintain this inconsistency). git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1296 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/EventHandler.cxx | 7 ++----- stella/src/emucore/FSNode.cxx | 8 ++------ stella/src/emucore/OSystem.cxx | 8 ++------ stella/src/gui/BrowserDialog.cxx | 8 ++------ stella/src/gui/FileSnapDialog.cxx | 8 ++------ stella/src/gui/Launcher.cxx | 8 ++------ stella/src/gui/LauncherDialog.cxx | 11 +++-------- 7 files changed, 15 insertions(+), 43 deletions(-) diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx index cfbeaed95..3ddb1c9b0 100644 --- a/stella/src/emucore/EventHandler.cxx +++ b/stella/src/emucore/EventHandler.cxx @@ -14,16 +14,13 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: EventHandler.cxx,v 1.197 2007-01-18 16:45:21 knakos Exp $ +// $Id: EventHandler.cxx,v 1.198 2007-01-19 21:53:25 stephena Exp $ //============================================================================ #include #include -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" -#endif +#include "FSNode.hxx" #include "Event.hxx" #include "EventHandler.hxx" #include "EventStreamer.hxx" diff --git a/stella/src/emucore/FSNode.cxx b/stella/src/emucore/FSNode.cxx index 143f956dc..c3d6d2e27 100644 --- a/stella/src/emucore/FSNode.cxx +++ b/stella/src/emucore/FSNode.cxx @@ -13,19 +13,15 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FSNode.cxx,v 1.8 2007-01-18 16:45:21 knakos Exp $ +// $Id: FSNode.cxx,v 1.9 2007-01-19 21:53:26 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project //============================================================================ -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" -#endif +#include "FSNode.hxx" #include "bspf.hxx" #include "GuiUtils.hxx" -#include "FSNode.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FSList::sort() diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx index 6c34b5bcc..5d3180376 100644 --- a/stella/src/emucore/OSystem.cxx +++ b/stella/src/emucore/OSystem.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.cxx,v 1.93 2007-01-18 16:45:21 knakos Exp $ +// $Id: OSystem.cxx,v 1.94 2007-01-19 21:53:26 stephena Exp $ //============================================================================ #include @@ -30,13 +30,9 @@ #include "CheatManager.hxx" #endif -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" -#endif +#include "FSNode.hxx" #include "unzip.h" #include "MD5.hxx" -#include "FSNode.hxx" #include "Settings.hxx" #include "PropsSet.hxx" #include "EventHandler.hxx" diff --git a/stella/src/gui/BrowserDialog.cxx b/stella/src/gui/BrowserDialog.cxx index e72ad852e..88afc14fe 100644 --- a/stella/src/gui/BrowserDialog.cxx +++ b/stella/src/gui/BrowserDialog.cxx @@ -13,21 +13,17 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: BrowserDialog.cxx,v 1.25 2007-01-18 16:45:22 knakos Exp $ +// $Id: BrowserDialog.cxx,v 1.26 2007-01-19 21:53:27 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project //============================================================================ -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" -#endif +#include "FSNode.hxx" #include "OSystem.hxx" #include "Widget.hxx" #include "StringListWidget.hxx" #include "Dialog.hxx" -#include "FSNode.hxx" #include "GuiObject.hxx" #include "GuiUtils.hxx" #include "GameList.hxx" diff --git a/stella/src/gui/FileSnapDialog.cxx b/stella/src/gui/FileSnapDialog.cxx index 390728aa4..5875b0249 100644 --- a/stella/src/gui/FileSnapDialog.cxx +++ b/stella/src/gui/FileSnapDialog.cxx @@ -13,20 +13,16 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FileSnapDialog.cxx,v 1.4 2007-01-18 16:45:22 knakos Exp $ +// $Id: FileSnapDialog.cxx,v 1.5 2007-01-19 21:53:27 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project //============================================================================ -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" -#endif +#include "FSNode.hxx" #include "DialogContainer.hxx" #include "BrowserDialog.hxx" #include "TabWidget.hxx" -#include "FSNode.hxx" #include "bspf.hxx" #include "LauncherDialog.hxx" #include "FileSnapDialog.hxx" diff --git a/stella/src/gui/Launcher.cxx b/stella/src/gui/Launcher.cxx index 81eafa81c..263c0b5d9 100644 --- a/stella/src/gui/Launcher.cxx +++ b/stella/src/gui/Launcher.cxx @@ -13,18 +13,14 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Launcher.cxx,v 1.13 2007-01-18 16:45:22 knakos Exp $ +// $Id: Launcher.cxx,v 1.14 2007-01-19 21:53:27 stephena Exp $ //============================================================================ -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "LauncherDialog.hxx" -#endif +#include "LauncherDialog.hxx" #include "Version.hxx" #include "OSystem.hxx" #include "Settings.hxx" #include "FrameBuffer.hxx" -#include "LauncherDialog.hxx" #include "bspf.hxx" #include "Launcher.hxx" diff --git a/stella/src/gui/LauncherDialog.cxx b/stella/src/gui/LauncherDialog.cxx index ca7f2e038..fe2e5d89d 100644 --- a/stella/src/gui/LauncherDialog.cxx +++ b/stella/src/gui/LauncherDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: LauncherDialog.cxx,v 1.67 2007-01-18 16:45:22 knakos Exp $ +// $Id: LauncherDialog.cxx,v 1.68 2007-01-19 21:53:27 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -21,23 +21,18 @@ #include -#ifdef _WIN32_WCE - // different include order for the ce compiler - #include "FSNode.hxx" - #include "BrowserDialog.hxx" -#endif +#include "FSNode.hxx" +#include "BrowserDialog.hxx" #include "OSystem.hxx" #include "Settings.hxx" #include "PropsSet.hxx" #include "Props.hxx" #include "MD5.hxx" -#include "FSNode.hxx" #include "Widget.hxx" #include "StringListWidget.hxx" #include "Dialog.hxx" #include "DialogContainer.hxx" #include "GuiUtils.hxx" -#include "BrowserDialog.hxx" #include "ProgressDialog.hxx" #include "OptionsDialog.hxx" #include "LauncherDialog.hxx"