[brlcad-commits] SF.net SVN: brlcad:[32220]
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <ra...@us...> - 2008-08-02 10:53:44
|
Revision: 32220 http://brlcad.svn.sourceforge.net/brlcad/?rev=32220&view=rev Author: ralith Date: 2008-08-02 10:53:48 +0000 (Sat, 02 Aug 2008) Log Message: ----------- Reordered #includes as recommended by HACKING Modified Paths: -------------- rt^3/trunk/src/g3d/Application.cxx rt^3/trunk/src/g3d/CameraManager.cxx rt^3/trunk/src/g3d/CameraManager.h rt^3/trunk/src/g3d/CameraMode.cxx rt^3/trunk/src/g3d/CameraModeBlender.cxx rt^3/trunk/src/g3d/CameraModeMGED.cxx rt^3/trunk/src/g3d/CommandInterpreter.cxx rt^3/trunk/src/g3d/GeometryConversion.cxx rt^3/trunk/src/g3d/GeometryConversion.h rt^3/trunk/src/g3d/GuiBaseWindow.cxx rt^3/trunk/src/g3d/GuiCamera.cxx rt^3/trunk/src/g3d/GuiCamera.h rt^3/trunk/src/g3d/GuiCommandOverlay.cxx rt^3/trunk/src/g3d/GuiCommandOverlay.h rt^3/trunk/src/g3d/GuiConsole.cxx rt^3/trunk/src/g3d/GuiConsole.h rt^3/trunk/src/g3d/GuiWidgetRotation.cxx rt^3/trunk/src/g3d/GuiWindowManager.cxx rt^3/trunk/src/g3d/History.h rt^3/trunk/src/g3d/Logger.h Modified: rt^3/trunk/src/g3d/Application.cxx =================================================================== --- rt^3/trunk/src/g3d/Application.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/Application.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,18 +27,6 @@ * (g3d), along with some internal classes. */ -#include "Application.h" - -#include "Logger.h" -#include "CameraManager.h" -#include "CameraMode.h" -#include "GuiBaseWindow.h" -#include "GuiCamera.h" -#include "GuiCommandOverlay.h" -#include "GuiConsole.h" -#include "GuiWindowManager.h" -#include "GuiWidgetRotation.h" - #include <Mocha/DataSection.h> #include <Mocha/Stream.h> #include <Mocha/Timer.h> @@ -75,6 +63,18 @@ #error "No platform manager available" #endif +#include "Application.h" + +#include "Logger.h" +#include "CameraManager.h" +#include "CameraMode.h" +#include "GuiBaseWindow.h" +#include "GuiCamera.h" +#include "GuiCommandOverlay.h" +#include "GuiConsole.h" +#include "GuiWindowManager.h" +#include "GuiWidgetRotation.h" + using namespace std; Modified: rt^3/trunk/src/g3d/CameraManager.cxx =================================================================== --- rt^3/trunk/src/g3d/CameraManager.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CameraManager.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,6 +27,9 @@ * Editor (g3d). */ +#include <OGRE/OgreCamera.h> +#include <OGRE/OgreSceneNode.h> + #include "CameraManager.h" #include "Logger.h" @@ -35,10 +38,7 @@ #include "CameraModeMGED.h" #include "CameraModeOrbital.h" -#include <OGRE/OgreCamera.h> -#include <OGRE/OgreSceneNode.h> - /******************************************************************************* * CameraManager ******************************************************************************/ Modified: rt^3/trunk/src/g3d/CameraManager.h =================================================================== --- rt^3/trunk/src/g3d/CameraManager.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CameraManager.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -31,14 +31,14 @@ #define __G3D_CAMERAMANAGER_H__ -#include "Observer.h" -#include "CameraMode.h" +#include <deque> +#include <list> #include <OIS/OISKeyboard.h> #include <OIS/OISMouse.h> -#include <deque> -#include <list> +#include "Observer.h" +#include "CameraMode.h" namespace Ogre { Modified: rt^3/trunk/src/g3d/CameraMode.cxx =================================================================== --- rt^3/trunk/src/g3d/CameraMode.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CameraMode.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,15 +27,15 @@ * Geometry Editor (g3d). */ +#include <OGRE/OgreCamera.h> +#include <OGRE/OgreSceneNode.h> +#include <OGRE/OgreViewport.h> + #include "CameraMode.h" #include "Logger.h" -#include <OGRE/OgreCamera.h> -#include <OGRE/OgreSceneNode.h> -#include <OGRE/OgreViewport.h> - /******************************************************************************* * CameraMode ******************************************************************************/ Modified: rt^3/trunk/src/g3d/CameraModeBlender.cxx =================================================================== --- rt^3/trunk/src/g3d/CameraModeBlender.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CameraModeBlender.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,13 +27,13 @@ * Editor (g3d). */ +#include <OGRE/OgreCamera.h> + #include "CameraModeBlender.h" #include "Logger.h" -#include <OGRE/OgreCamera.h> - /******************************************************************************* * CameraModeBlender ******************************************************************************/ Modified: rt^3/trunk/src/g3d/CameraModeMGED.cxx =================================================================== --- rt^3/trunk/src/g3d/CameraModeMGED.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CameraModeMGED.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,16 +27,16 @@ * (g3d). */ -#include "CameraModeMGED.h" +#include <cmath> -#include "Logger.h" - #include <OGRE/OgreCamera.h> #include <OGRE/OgreRay.h> -#include <cmath> +#include "CameraModeMGED.h" +#include "Logger.h" + /******************************************************************************* * CameraModeMGED ******************************************************************************/ Modified: rt^3/trunk/src/g3d/CommandInterpreter.cxx =================================================================== --- rt^3/trunk/src/g3d/CommandInterpreter.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/CommandInterpreter.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,14 +27,14 @@ * Console-like windows. */ +#include <vector> + #include "CommandInterpreter.h" #include "Logger.h" #include "Commands.h" -#include <vector> - /******************************************************************************* * CommandOutput ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GeometryConversion.cxx =================================================================== --- rt^3/trunk/src/g3d/GeometryConversion.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GeometryConversion.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,12 +27,12 @@ * the rest of the program. */ +#include <OGRE/OgreColourValue.h> +#include <OGRE/OgreMesh.h> + #include "GeometryConversion.h" -#include "OGRE/OgreColourValue.h" -#include "OGRE/OgreMesh.h" - SampleTetrahedron::SampleTetrahedron(float scale) : _manualObject(Ogre::String("tetrahedron")) { Modified: rt^3/trunk/src/g3d/GeometryConversion.h =================================================================== --- rt^3/trunk/src/g3d/GeometryConversion.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GeometryConversion.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -31,9 +31,9 @@ #define __G3D_GEOMETRYCONVERSION_H__ -#include "OGRE/OgreSceneNode.h" -#include "OGRE/OgreManualObject.h" -#include "OGRE/OgreString.h" +#include <OGRE/OgreSceneNode.h> +#include <OGRE/OgreManualObject.h> +#include <OGRE/OgreString.h> /** @brief Tetrahedron geometry Modified: rt^3/trunk/src/g3d/GuiBaseWindow.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiBaseWindow.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiBaseWindow.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -26,14 +26,14 @@ * */ +#include <RBGui/GuiManager.h> +#include <RBGui/Window.h> + #include "GuiBaseWindow.h" #include "Logger.h" -#include <RBGui/GuiManager.h> -#include <RBGui/Window.h> - /******************************************************************************* * GuiBaseWindow ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GuiCamera.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiCamera.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiCamera.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,13 +27,6 @@ * (g3d). */ -#include "GuiCamera.h" - -#include "Logger.h" -#include "CameraManager.h" -#include "GuiWindowManager.h" -#include "GuiWidgetRotation.h" - #include <OIS/OISKeyboard.h> #include <OGRE/OgreRenderWindow.h> #include <RBGui/GuiDefines.h> @@ -45,7 +38,14 @@ #include <RBGui/Widgets/TextWidget.h> #include <RBGui/Widgets/TextEntryWidget.h> +#include "GuiCamera.h" +#include "Logger.h" +#include "CameraManager.h" +#include "GuiWindowManager.h" +#include "GuiWidgetRotation.h" + + /******************************************************************************* * GuiCamera ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GuiCamera.h =================================================================== --- rt^3/trunk/src/g3d/GuiCamera.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiCamera.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -30,12 +30,12 @@ #define __G3D_GUICAMERA_H__ +#include <Mocha/Value.h> + #include "GuiBaseWindow.h" #include "Observer.h" -#include <Mocha/Value.h> - class GuiWidgetRotation; namespace RBGui { class ButtonWidget; Modified: rt^3/trunk/src/g3d/GuiCommandOverlay.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiCommandOverlay.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiCommandOverlay.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,13 +27,6 @@ * Editor (g3d). */ -#include "GuiCommandOverlay.h" - -#include "Logger.h" -#include "History.h" -#include "CommandInterpreter.h" -#include "GuiWindowManager.h" - #include <OIS/OISKeyboard.h> #include <OGRE/OgreRenderWindow.h> #include <RBGui/GuiDefines.h> @@ -42,7 +35,14 @@ #include <RBGui/Widgets/TextWidget.h> #include <RBGui/Widgets/TextEntryWidget.h> +#include "GuiCommandOverlay.h" +#include "Logger.h" +#include "History.h" +#include "CommandInterpreter.h" +#include "GuiWindowManager.h" + + /******************************************************************************* * GuiCommandOverlay ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GuiCommandOverlay.h =================================================================== --- rt^3/trunk/src/g3d/GuiCommandOverlay.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiCommandOverlay.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -30,12 +30,12 @@ #define __G3D_GUICOMMANDOVERLAY_H__ +#include <Mocha/Value.h> + #include "GuiBaseWindow.h" #include "History.h" -#include <Mocha/Value.h> - namespace RBGui { class GuiElement; class TextEntryWidget; Modified: rt^3/trunk/src/g3d/GuiConsole.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiConsole.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiConsole.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,13 +27,6 @@ * (g3d). */ -#include "GuiConsole.h" - -#include "Logger.h" -#include "History.h" -#include "CommandInterpreter.h" -#include "GuiWindowManager.h" - #include <OIS/OISKeyboard.h> #include <OGRE/OgreRenderWindow.h> #include <RBGui/GuiDefines.h> @@ -42,7 +35,14 @@ #include <RBGui/Widgets/TextWidget.h> #include <RBGui/Widgets/TextEntryWidget.h> +#include "GuiConsole.h" +#include "Logger.h" +#include "History.h" +#include "CommandInterpreter.h" +#include "GuiWindowManager.h" + + /******************************************************************************* * GuiConsole ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GuiConsole.h =================================================================== --- rt^3/trunk/src/g3d/GuiConsole.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiConsole.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -30,12 +30,12 @@ #define __G3D_GUICONSOLE_H__ +#include <Mocha/Value.h> + #include "GuiBaseWindow.h" #include "History.h" -#include <Mocha/Value.h> - namespace RBGui { class GuiElement; class TextEntryWidget; Modified: rt^3/trunk/src/g3d/GuiWidgetRotation.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiWidgetRotation.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiWidgetRotation.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,12 +27,12 @@ * Editor (g3d). */ -#include "GuiWidgetRotation.h" - #include <RBGui/Widget.h> #include <RBGui/GuiManager.h> +#include "GuiWidgetRotation.h" + /******************************************************************************* * GuiWidgetRotation ******************************************************************************/ Modified: rt^3/trunk/src/g3d/GuiWindowManager.cxx =================================================================== --- rt^3/trunk/src/g3d/GuiWindowManager.cxx 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/GuiWindowManager.cxx 2008-08-02 10:53:48 UTC (rev 32220) @@ -27,13 +27,6 @@ * Editor (g3d), along with some internal classes. */ -#include "GuiWindowManager.h" - -#include "Logger.h" -#include "Application.h" -#include "CameraManager.h" -#include "GuiBaseWindow.h" - #include <OGRE/OgreRenderWindow.h> #include <OGRE/OgreRoot.h> #include <OGRE/OgreWindowEventUtilities.h> @@ -45,7 +38,14 @@ #include <RBGui/Widgets/TextWidget.h> #include <RBGui/Widgets/TextEntryWidget.h> +#include "GuiWindowManager.h" +#include "Logger.h" +#include "Application.h" +#include "CameraManager.h" +#include "GuiBaseWindow.h" + + /******************************************************************************* * GuiWindowManager ******************************************************************************/ Modified: rt^3/trunk/src/g3d/History.h =================================================================== --- rt^3/trunk/src/g3d/History.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/History.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -30,12 +30,12 @@ #define __G3D_HISTORY_H__ -#include "Observer.h" - #include <string> #include <vector> +#include "Observer.h" + /** * @brief ObserverEvent for History * Modified: rt^3/trunk/src/g3d/Logger.h =================================================================== --- rt^3/trunk/src/g3d/Logger.h 2008-08-02 10:49:28 UTC (rev 32219) +++ rt^3/trunk/src/g3d/Logger.h 2008-08-02 10:53:48 UTC (rev 32220) @@ -55,12 +55,12 @@ #endif -#include "Observer.h" - #include <string> #include <vector> +#include "Observer.h" + /** * @brief ObserverEvent for Logger * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |