[Pingus-CVS] r4035 - trunk/pingus/src/components

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-05 19:47:22 +0100 (Thu, 05 Nov 2009)
New Revision: 4035

Modified:
   trunk/pingus/src/components/action_button.cpp
   trunk/pingus/src/components/button_panel.cpp
   trunk/pingus/src/components/check_box.cpp
   trunk/pingus/src/components/choice_box.cpp
   trunk/pingus/src/components/label.cpp
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/components/pingus_counter.cpp
   trunk/pingus/src/components/playfield.cpp
   trunk/pingus/src/components/slider_box.cpp
   trunk/pingus/src/components/smallmap.cpp
   trunk/pingus/src/components/time_display.cpp
   trunk/pingus/src/components/time_display.hpp
Log:
#include cleanup

Modified: trunk/pingus/src/components/action_button.cpp
===================================================================
--- trunk/pingus/src/components/action_button.cpp       2009-11-05 18:46:04 UTC 
(rev 4034)
+++ trunk/pingus/src/components/action_button.cpp       2009-11-05 18:47:22 UTC 
(rev 4035)
@@ -14,8 +14,9 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/action_button.hpp"
+
 #include "pingus/globals.hpp"
-#include "components/action_button.hpp"
 #include "pingus/server.hpp"
 #include "pingus/game_session.hpp"
 #include "pingus/world.hpp"

Modified: trunk/pingus/src/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/components/button_panel.cpp        2009-11-05 18:46:04 UTC 
(rev 4034)
+++ trunk/pingus/src/components/button_panel.cpp        2009-11-05 18:47:22 UTC 
(rev 4035)
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/button_panel.hpp"
+
 #include <iostream>
 #include <algorithm>
 
@@ -24,7 +26,6 @@
 #include "pingus/server.hpp"
 #include "pingus/game_session.hpp"
 #include "display/drawing_context.hpp"
-#include "components/button_panel.hpp"
 
 using namespace Actions;
 

Modified: trunk/pingus/src/components/check_box.cpp
===================================================================
--- trunk/pingus/src/components/check_box.cpp   2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/check_box.cpp   2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,10 +14,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/check_box.hpp"
+
 #include "pingus/globals.hpp"
 #include "pingus/fonts.hpp"
 #include "display/drawing_context.hpp"
-#include "components/check_box.hpp"
 
 CheckBox::CheckBox(const Rect& rect_) :
   RectComponent(rect_),

Modified: trunk/pingus/src/components/choice_box.cpp
===================================================================
--- trunk/pingus/src/components/choice_box.cpp  2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/choice_box.cpp  2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,10 +14,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/choice_box.hpp"
+
 #include "pingus/globals.hpp"
 #include "pingus/fonts.hpp"
 #include "display/drawing_context.hpp"
-#include "components/choice_box.hpp"
 
 ChoiceBox::ChoiceBox(const Rect& rect_) :
   RectComponent(rect_),

Modified: trunk/pingus/src/components/label.cpp
===================================================================
--- trunk/pingus/src/components/label.cpp       2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/label.cpp       2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,10 +14,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/label.hpp"
+
 #include "pingus/globals.hpp"
 #include "pingus/fonts.hpp"
 #include "display/drawing_context.hpp"
-#include "components/label.hpp"
 
 Label::Label(const std::string& label_, const Rect& rect_)
   : RectComponent(rect_),

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/menu_button.cpp 2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/menu_button.hpp"
+
 #include "pingus/globals.hpp"
 #include "pingus/debug.hpp"
 #include "pingus/fonts.hpp"
@@ -22,7 +24,6 @@
 #include "pingus/gettext.h"
 #include "pingus/pingus_menu.hpp"
 
-#include "components/menu_button.hpp"
 
 MenuButton::MenuButton(PingusMenu* menu_,
                        const Vector2i& pos_,

Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp      2009-11-05 18:46:04 UTC 
(rev 4034)
+++ trunk/pingus/src/components/pingus_counter.cpp      2009-11-05 18:47:22 UTC 
(rev 4035)
@@ -14,9 +14,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/pingus_counter.hpp"
+
 #include <stdio.h>
 
-#include "components/pingus_counter.hpp"
 #include "pingus/gettext.h"
 #include "pingus/fonts.hpp"
 #include "pingus/globals.hpp"

Modified: trunk/pingus/src/components/playfield.cpp
===================================================================
--- trunk/pingus/src/components/playfield.cpp   2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/playfield.cpp   2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/playfield.hpp"
+
 #include <stdio.h>
 #include <iostream>
 #include "pingus/globals.hpp"
@@ -25,7 +27,6 @@
 #include "pingus/pingu.hpp"
 #include "display/display.hpp"
 #include "pingus/game_session.hpp"
-#include "components/playfield.hpp"
 
 Playfield::Playfield(Server* server_, GameSession* session_, const Rect& 
rect_) :
   RectComponent(rect_),

Modified: trunk/pingus/src/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/components/slider_box.cpp  2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/slider_box.cpp  2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,11 +14,12 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/slider_box.hpp"
+
 #include "math/math.hpp"
 #include "pingus/globals.hpp"
 #include "pingus/fonts.hpp"
 #include "display/drawing_context.hpp"
-#include "components/slider_box.hpp"
 
 SliderBox::SliderBox(const Rect& rect_)
   : RectComponent(rect_),

Modified: trunk/pingus/src/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp    2009-11-05 18:46:04 UTC (rev 
4034)
+++ trunk/pingus/src/components/smallmap.cpp    2009-11-05 18:47:22 UTC (rev 
4035)
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/smallmap.hpp"
+
 #include "pingus/game_session.hpp"
 #include "pingus/pingu_holder.hpp"
 #include "display/display.hpp"
@@ -27,7 +29,6 @@
 #include "math/vector3f.hpp"
 #include "pingus/globals.hpp"
 #include "components/playfield.hpp"
-#include "components/smallmap.hpp"
 
 SmallMap::SmallMap(Server* server_, Playfield* playfield_, const Rect& rect_) :
   RectComponent(rect_), 

Modified: trunk/pingus/src/components/time_display.cpp
===================================================================
--- trunk/pingus/src/components/time_display.cpp        2009-11-05 18:46:04 UTC 
(rev 4034)
+++ trunk/pingus/src/components/time_display.cpp        2009-11-05 18:47:22 UTC 
(rev 4035)
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "components/time_display.hpp"
+
 #include <assert.h>
 #include <stdio.h>
 
@@ -27,7 +29,6 @@
 #include "util/string_util.hpp"
 #include "pingus/fonts.hpp"
 
-#include "components/time_display.hpp"
 
 TimeDisplay::TimeDisplay (GameSession* c) :
   server(c->get_server()),

Modified: trunk/pingus/src/components/time_display.hpp
===================================================================
--- trunk/pingus/src/components/time_display.hpp        2009-11-05 18:46:04 UTC 
(rev 4034)
+++ trunk/pingus/src/components/time_display.hpp        2009-11-05 18:47:22 UTC 
(rev 4035)
@@ -18,6 +18,8 @@
 #define HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
 
 #include "gui/component.hpp"
+#include "pingus/sprite.hpp"
+#include "pingus/font.hpp"
 
 class Font;
 class Server;