[lmi-commits] [5871] Canonicalize #include directives

[Greg Chicares]

Revision: 5871
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5871
Author:   chicares
Date:     2014-03-07 15:45:42 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
Canonicalize #include directives

Modified Paths:
--------------
    lmi/trunk/main_wx.cpp
    lmi/trunk/main_wx_test.cpp
    lmi/trunk/skeleton.hpp
    lmi/trunk/view_ex.cpp

Modified: lmi/trunk/main_wx.cpp
===================================================================
--- lmi/trunk/main_wx.cpp       2014-03-07 15:02:09 UTC (rev 5870)
+++ lmi/trunk/main_wx.cpp       2014-03-07 15:45:42 UTC (rev 5871)
@@ -36,17 +36,17 @@
 #   pragma hdrstop
 #endif
 
-#include "skeleton.hpp"
-
-#include "fenv_guard.hpp"
 #include "fenv_lmi.hpp"
 #include "handle_exceptions.hpp"
-#include "main_common.hpp"
+#include "main_common.hpp"              // initialize_application()
 #include "msw_workarounds.hpp"
-#include "path_utility.hpp"
+#include "path_utility.hpp"             // initialize_filesystem()
+#include "skeleton.hpp"
 
-#include <wx/defs.h> // for wx_dependent_objects in workhorse.make
+#include <wx/init.h>                    // wxEntry()
 
+#include <string>
+
 IMPLEMENT_APP_NO_MAIN(Skeleton)
 IMPLEMENT_WX_THEME_SUPPORT
 

Modified: lmi/trunk/main_wx_test.cpp
===================================================================
--- lmi/trunk/main_wx_test.cpp  2014-03-07 15:02:09 UTC (rev 5870)
+++ lmi/trunk/main_wx_test.cpp  2014-03-07 15:45:42 UTC (rev 5871)
@@ -26,19 +26,14 @@
 #   pragma hdrstop
 #endif
 
+#include "main_common.hpp"              // initialize_application()
+#include "msw_workarounds.hpp"
+#include "path_utility.hpp"             // initialize_filesystem()
+#include "skeleton.hpp"
 #include "test_tools.hpp"
 
-#include "skeleton.hpp"
+#include <wx/init.h>                    // wxEntry()
 
-#include "fenv_guard.hpp"
-#include "fenv_lmi.hpp"
-#include "handle_exceptions.hpp"
-#include "main_common.hpp"
-#include "msw_workarounds.hpp"
-#include "path_utility.hpp"
-
-#include <wx/defs.h>
-
 class SkeletonTest;
 DECLARE_APP(SkeletonTest)
 

Modified: lmi/trunk/skeleton.hpp
===================================================================
--- lmi/trunk/skeleton.hpp      2014-03-07 15:02:09 UTC (rev 5870)
+++ lmi/trunk/skeleton.hpp      2014-03-07 15:45:42 UTC (rev 5871)
@@ -36,7 +36,6 @@
 
 #include "config.hpp"
 
-#include "obstruct_slicing.hpp"
 #include "uncopyable_lmi.hpp"
 
 #include <wx/app.h>

Modified: lmi/trunk/view_ex.cpp
===================================================================
--- lmi/trunk/view_ex.cpp       2014-03-07 15:02:09 UTC (rev 5870)
+++ lmi/trunk/view_ex.cpp       2014-03-07 15:45:42 UTC (rev 5871)
@@ -48,18 +48,19 @@
 #include "alert.hpp"
 #include "assert_lmi.hpp"
 #include "docmanager_ex.hpp"
-#include "skeleton.hpp" // Skeleton::CreateChildFrame()
 #include "safely_dereference_as.hpp"
+#include "skeleton.hpp"                 // Skeleton::CreateChildFrame()
 #include "wx_new.hpp"
 
 #include <boost/filesystem/path.hpp>
 
+#include <wx/app.h>                     // GetInstance()
 #include <wx/dc.h>
 #include <wx/icon.h>
 #include <wx/menu.h>
 #include <wx/xrc/xmlres.h>
 
-#include <cstdlib>     // std::exit(), EXIT_FAILURE
+#include <cstdlib>                      // std::exit(), EXIT_FAILURE
 
 IMPLEMENT_ABSTRACT_CLASS(ViewEx, wxView)