[Pingus-CVS] r4061 - trunk/pingus/src/editor

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-06 20:43:20 +0100 (Fri, 06 Nov 2009)
New Revision: 4061

Modified:
   trunk/pingus/src/editor/action_properties.cpp
   trunk/pingus/src/editor/action_properties.hpp
   trunk/pingus/src/editor/button.cpp
   trunk/pingus/src/editor/button.hpp
   trunk/pingus/src/editor/checkbox.cpp
   trunk/pingus/src/editor/checkbox.hpp
   trunk/pingus/src/editor/combobox.cpp
   trunk/pingus/src/editor/combobox.hpp
   trunk/pingus/src/editor/editor_level.cpp
   trunk/pingus/src/editor/editor_level.hpp
   trunk/pingus/src/editor/editor_screen.cpp
   trunk/pingus/src/editor/editor_screen.hpp
   trunk/pingus/src/editor/file_dialog.cpp
   trunk/pingus/src/editor/file_list.cpp
   trunk/pingus/src/editor/gui_style.cpp
   trunk/pingus/src/editor/gui_style.hpp
   trunk/pingus/src/editor/inputbox.cpp
   trunk/pingus/src/editor/inputbox.hpp
   trunk/pingus/src/editor/label.cpp
   trunk/pingus/src/editor/label.hpp
   trunk/pingus/src/editor/level_impl.hpp
   trunk/pingus/src/editor/level_objs.cpp
   trunk/pingus/src/editor/level_objs.hpp
   trunk/pingus/src/editor/level_properties.cpp
   trunk/pingus/src/editor/object_properties.cpp
   trunk/pingus/src/editor/object_selector.cpp
   trunk/pingus/src/editor/object_selector_list.cpp
   trunk/pingus/src/editor/object_selector_set.cpp
   trunk/pingus/src/editor/object_selector_set.hpp
   trunk/pingus/src/editor/panel.cpp
   trunk/pingus/src/editor/panel.hpp
Log:
Some cleanup

Modified: trunk/pingus/src/editor/action_properties.cpp
===================================================================
--- trunk/pingus/src/editor/action_properties.cpp       2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/action_properties.cpp       2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -16,8 +16,8 @@
 
 #include "editor/action_properties.hpp"
 
+#include <boost/bind.hpp>
 #include <iostream>
-#include <boost/bind.hpp>
 
 #include "editor/checkbox.hpp"
 #include "editor/editor_level.hpp"

Modified: trunk/pingus/src/editor/action_properties.hpp
===================================================================
--- trunk/pingus/src/editor/action_properties.hpp       2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/action_properties.hpp       2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -19,8 +19,8 @@
 
 #include <map>
 
+#include "engine/gui/group_component.hpp"
 #include "pingus/pingu_enums.hpp"
-#include "engine/gui/group_component.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/button.cpp
===================================================================
--- trunk/pingus/src/editor/button.cpp  2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/button.cpp  2009-11-06 19:43:20 UTC (rev 4061)
@@ -16,8 +16,8 @@
 
 #include "editor/button.hpp"
 
+#include "editor/gui_style.hpp"
 #include "pingus/fonts.hpp"
-#include "editor/gui_style.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/button.hpp
===================================================================
--- trunk/pingus/src/editor/button.hpp  2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/button.hpp  2009-11-06 19:43:20 UTC (rev 4061)
@@ -18,6 +18,7 @@
 #define HEADER_PINGUS_EDITOR_BUTTON_HPP
 
 #include <boost/signal.hpp>
+
 #include "engine/gui/rect_component.hpp"
 
 namespace Editor {

Modified: trunk/pingus/src/editor/checkbox.cpp
===================================================================
--- trunk/pingus/src/editor/checkbox.cpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/checkbox.cpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -16,8 +16,8 @@
 
 #include "editor/checkbox.hpp"
 
+#include "editor/gui_style.hpp"
 #include "pingus/fonts.hpp"
-#include "editor/gui_style.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/checkbox.hpp
===================================================================
--- trunk/pingus/src/editor/checkbox.hpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/checkbox.hpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,6 +18,7 @@
 #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
 
 #include <boost/signal.hpp>
+
 #include "engine/gui/rect_component.hpp"
 
 namespace Editor {

Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/combobox.cpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -17,13 +17,13 @@
 #include "editor/combobox.hpp"
 
 #include <iostream>
+#include <string>
 #include <vector>
-#include <string>
 
-#include "pingus/resource.hpp"
 #include "math/math.hpp"
+#include "math/vector2i.hpp"
 #include "pingus/fonts.hpp"
-#include "math/vector2i.hpp"
+#include "pingus/resource.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/combobox.hpp
===================================================================
--- trunk/pingus/src/editor/combobox.hpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/combobox.hpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,9 +18,10 @@
 #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
 #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
 
+#include <boost/signal.hpp>
+#include <string>
 #include <vector>
-#include <string>
-#include <boost/signal.hpp>
+
 #include "engine/display/sprite.hpp"
 #include "engine/gui/component.hpp"
 #include "engine/gui/rect_component.hpp"

Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp    2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/editor_level.cpp    2009-11-06 19:43:20 UTC (rev 
4061)
@@ -17,17 +17,18 @@
 
 #include "editor/editor_level.hpp"
 
-#include "config.h"
+#include <fstream>
 #include <iostream>
 #include <string>
-#include <fstream>
 
-#include "pingus/pingus_level.hpp"
+#include "config.h"
+
 #include "editor/level_impl.hpp"
 #include "editor/level_objs.hpp"
+#include "editor/viewport.hpp"
+#include "pingus/pingus_level.hpp"
 #include "util/pathname.hpp"
 #include "util/sexpr_file_writer.hpp"
-#include "editor/viewport.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/editor_level.hpp
===================================================================
--- trunk/pingus/src/editor/editor_level.hpp    2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/editor_level.hpp    2009-11-06 19:43:20 UTC (rev 
4061)
@@ -19,6 +19,7 @@
 #define HEADER_PINGUS_EDITOR_EDITOR_LEVEL_HPP
 
 #include <vector>
+
 #include "editor/level_impl.hpp"
 
 class Pathname;

Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp   2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/editor_screen.cpp   2009-11-06 19:43:20 UTC (rev 
4061)
@@ -20,30 +20,30 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
+#include "editor/action_properties.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/file_dialog.hpp"
+#include "editor/level_objs.hpp"
+#include "editor/level_properties.hpp"
+#include "editor/minimap.hpp"
+#include "editor/object_properties.hpp"
+#include "editor/object_selector.hpp"
+#include "editor/panel.hpp"
+#include "editor/panel.hpp"
+#include "editor/viewport.hpp"
 #include "engine/display/display.hpp"
-#include "util/system.hpp"
-#include "engine/sound/sound.hpp"
+#include "engine/display/drawing_context.hpp"
 #include "engine/gui/gui_manager.hpp"
 #include "engine/screen/screen_manager.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "pingus/res_descriptor.hpp"
-#include "pingus/resource.hpp"
+#include "engine/sound/sound.hpp"
 #include "pingus/fonts.hpp"
 #include "pingus/gettext.h"
-#include "editor/file_dialog.hpp"
 #include "pingus/path_manager.hpp"
+#include "pingus/res_descriptor.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/screens/game_session.hpp"
 #include "util/pathname.hpp"
-#include "pingus/screens/game_session.hpp"
-#include "editor/editor_level.hpp"
-#include "editor/panel.hpp"
-#include "editor/panel.hpp"
-#include "editor/minimap.hpp"
-#include "editor/viewport.hpp"
-#include "editor/level_objs.hpp"
-#include "editor/object_selector.hpp"
-#include "editor/object_properties.hpp"
-#include "editor/action_properties.hpp"
-#include "editor/level_properties.hpp"
+#include "util/system.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp   2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/editor_screen.hpp   2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,9 +18,9 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
 #define HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
 
+#include "editor/file_dialog.hpp"
 #include "engine/screen/gui_screen.hpp"
 #include "util/pathname.hpp"
-#include "editor/file_dialog.hpp"
 
 class DrawingContext;
 class FileDialog;

Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp     2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/file_dialog.cpp     2009-11-06 19:43:20 UTC (rev 
4061)
@@ -16,20 +16,20 @@
 
 #include "editor/file_dialog.hpp"
 
+#include <boost/bind.hpp>
 #include <iostream>
-#include <boost/bind.hpp>
 
+#include "editor/button.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/inputbox.hpp"
+#include "editor/label.hpp"
 #include "engine/display/drawing_context.hpp"
 #include "engine/gui/gui_manager.hpp"
-#include "editor/editor_screen.hpp"
-#include "util/system.hpp"
-#include "editor/gui_style.hpp"
 #include "pingus/fonts.hpp"
 #include "pingus/gettext.h"
-#include "editor/label.hpp"
-#include "editor/inputbox.hpp"
 #include "util/pathname.hpp"
-#include "editor/button.hpp"
+#include "util/system.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp       2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/file_list.cpp       2009-11-06 19:43:20 UTC (rev 
4061)
@@ -19,9 +19,9 @@
 #include <iostream>
 
 #include "editor/gui_style.hpp"
-#include "pingus/fonts.hpp"
 #include "math/math.hpp"
 #include "math/vector2i.hpp"
+#include "pingus/fonts.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/gui_style.cpp
===================================================================
--- trunk/pingus/src/editor/gui_style.cpp       2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/gui_style.cpp       2009-11-06 19:43:20 UTC (rev 
4061)
@@ -16,9 +16,8 @@
 
 #include "editor/gui_style.hpp"
 
-
 namespace Editor {
-
+
 void
 GUIStyle::draw_raised_box(DrawingContext& gc, const Rect& rect, const Color& 
color, int border)
 {
@@ -41,7 +40,7 @@
   gc.draw_fillrect(Rect(rect.left+border, rect.top+border, rect.right-border, 
rect.bottom-border),
                    color);  
 }
-
+
 } // namespace Editor
 
 /* EOF */

Modified: trunk/pingus/src/editor/gui_style.hpp
===================================================================
--- trunk/pingus/src/editor/gui_style.hpp       2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/gui_style.hpp       2009-11-06 19:43:20 UTC (rev 
4061)
@@ -17,12 +17,11 @@
 #ifndef HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
 #define HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
 
-#include "math/rect.hpp"
 #include "engine/display/drawing_context.hpp"
+#include "math/rect.hpp"
 
 namespace Editor {
-
-/** */
+
 class GUIStyle
 {
 private:
@@ -32,7 +31,7 @@
   static void draw_lowered_box(DrawingContext& gc, const Rect& rect, 
                                const Color& color = Color(237, 233, 227), int 
border = 1);
 };
-
+
 } // namespace Editor
 
 #endif

Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/inputbox.cpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,11 +18,11 @@
 
 #include <iostream>
 
+#include "engine/display/drawing_context.hpp"
 #include "pingus/fonts.hpp"
-#include "engine/display/drawing_context.hpp"
 
 namespace Editor {
-
+
 Inputbox::Inputbox(const Rect& rect_) :
   RectComponent(rect_),
   text(),
@@ -78,7 +78,7 @@
         }
     }
 }
-
+
 } // namespace Editor
 
 /* EOF */

Modified: trunk/pingus/src/editor/inputbox.hpp
===================================================================
--- trunk/pingus/src/editor/inputbox.hpp        2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/inputbox.hpp        2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,11 +18,11 @@
 #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
 
 #include <boost/signal.hpp>
+
 #include "engine/gui/rect_component.hpp"
 
 namespace Editor {
-
-/** */
+
 class Inputbox : public GUI::RectComponent
 {
 private:
@@ -46,7 +46,7 @@
   Inputbox (const Inputbox&);
   Inputbox& operator= (const Inputbox&);
 };
-
+
 } // namespace Editor
 
 #endif

Modified: trunk/pingus/src/editor/label.cpp
===================================================================
--- trunk/pingus/src/editor/label.cpp   2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/label.cpp   2009-11-06 19:43:20 UTC (rev 4061)
@@ -20,7 +20,7 @@
 #include "pingus/fonts.hpp"
 
 namespace Editor {
-
+
 Label::Label(const Rect& rect_, const std::string& text_)
   : RectComponent(rect_),
     text(text_)
@@ -39,7 +39,7 @@
 Label::update (float delta)
 {  
 }
-
+
 } // namespace Editor
 
 /* EOF */

Modified: trunk/pingus/src/editor/label.hpp
===================================================================
--- trunk/pingus/src/editor/label.hpp   2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/label.hpp   2009-11-06 19:43:20 UTC (rev 4061)
@@ -20,8 +20,7 @@
 #include "engine/gui/rect_component.hpp"
 
 namespace Editor {
-
-/** */
+
 class Label : public GUI::RectComponent
 {
 private:
@@ -37,7 +36,7 @@
 
   void set_text(const std::string& text_) { text = text_; }
 };
-
+
 } // namespace Editor
 
 #endif

Modified: trunk/pingus/src/editor/level_impl.hpp
===================================================================
--- trunk/pingus/src/editor/level_impl.hpp      2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/level_impl.hpp      2009-11-06 19:43:20 UTC (rev 
4061)
@@ -18,10 +18,11 @@
 #ifndef HEADER_PINGUS_EDITOR_LEVEL_IMPL_HPP
 #define HEADER_PINGUS_EDITOR_LEVEL_IMPL_HPP
 
+#include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
-#include <algorithm>
+
 #include "editor/editor_screen.hpp"
 #include "editor/level_objs.hpp"
 
@@ -82,7 +83,7 @@
 private:
   LevelImpl (const LevelImpl&);
   LevelImpl& operator= (const LevelImpl&);
-};     // LevelImpl class
+};
 
 } // namespace Editor
 

Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp      2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/level_objs.cpp      2009-11-06 19:43:20 UTC (rev 
4061)
@@ -19,15 +19,16 @@
 
 #include <string>
 #include <iostream>
+
 #include "editor/level_impl.hpp"
 #include "engine/display/blitter.hpp"
-#include "pingus/resource.hpp"
-#include "pingus/res_descriptor.hpp"
 #include "engine/display/display.hpp"
 #include "engine/display/drawing_context.hpp"
+#include "pingus/res_descriptor.hpp"
+#include "pingus/resource.hpp"
 
 namespace Editor {
-
+
 // Default constructor
 LevelObj::LevelObj(std::string obj_name, LevelImpl* level_) :
   sprite(),
@@ -378,7 +379,7 @@
   obj->pos.y += static_cast<float>(offset.y);
   return obj;
 }
-
+
 } // namespace Editor 
 
 /* EOF */

Modified: trunk/pingus/src/editor/level_objs.hpp
===================================================================
--- trunk/pingus/src/editor/level_objs.hpp      2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/level_objs.hpp      2009-11-06 19:43:20 UTC (rev 
4061)
@@ -17,6 +17,8 @@
 #ifndef HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
 #define HEADER_PINGUS_EDITOR_LEVEL_OBJS_HPP
 
+#include <string>
+
 #include "engine/display/sprite.hpp"
 #include "math/color.hpp"
 #include "math/origin.hpp"
@@ -24,13 +26,13 @@
 #include "math/vector3f.hpp"
 #include "pingus/res_descriptor.hpp"
 #include "util/file_writer.hpp"
-#include <string>
 
-
 class DrawingContext;
 
 namespace Editor {
 
+class LevelImpl;
+
 const unsigned HAS_TYPE =         1 << 0;
 const unsigned HAS_SPEED =        1 << 1;
 const unsigned HAS_PARALLAX =     1 << 2;
@@ -49,8 +51,6 @@
 const unsigned HAS_GPTYPE =       1 << 14;
 const unsigned HAS_STARFIELD =    1 << 15;
 
-class LevelImpl;
-
 /** Generic Level Object (groundpiece, sign, etc.)  Only special objects will 
have
     to inherit from this class - most objects will be able to use this class 
alone */
 class LevelObj
@@ -333,7 +333,7 @@
 private:
   LevelObj & operator=(const LevelObj&);
 };
-
+
 } // namespace Editor 
 
 #endif

Modified: trunk/pingus/src/editor/level_properties.cpp
===================================================================
--- trunk/pingus/src/editor/level_properties.cpp        2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/level_properties.cpp        2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -19,12 +19,12 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
-#include "util/string_util.hpp"
+#include "editor/editor_level.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/inputbox.hpp"
 #include "editor/label.hpp"
-#include "editor/inputbox.hpp"
-#include "editor/gui_style.hpp"
-#include "editor/editor_level.hpp"
 #include "editor/viewport.hpp"
+#include "util/string_util.hpp"
 
 /*
 Level Properties:

Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp       2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/object_properties.cpp       2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -19,18 +19,18 @@
 #include <boost/bind.hpp>
 #include <iostream>
 
-#include "util/string_util.hpp"
 #include "editor/button.hpp"
+#include "editor/checkbox.hpp"
+#include "editor/combobox.hpp"
 #include "editor/editor_screen.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/inputbox.hpp"
+#include "editor/label.hpp"
 #include "editor/level_objs.hpp"
 #include "pingus/fonts.hpp"
-#include "editor/label.hpp"
 #include "pingus/gettext.h"
-#include "editor/gui_style.hpp"
 #include "pingus/groundtype.hpp"
-#include "editor/combobox.hpp"
-#include "editor/inputbox.hpp"
-#include "editor/checkbox.hpp"
+#include "util/string_util.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-06 19:19:16 UTC (rev 
4060)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-06 19:43:20 UTC (rev 
4061)
@@ -19,23 +19,22 @@
 #include <boost/bind.hpp>
 #include <iostream>
 
-#include "engine/display/display.hpp"
-#include "editor/gui_style.hpp"
-#include "engine/display/sprite.hpp"
-#include "pingus/gettext.h"
-#include "math/vector2i.hpp"
-#include "editor/editor_screen.hpp"
-#include "engine/display/drawing_context.hpp"
-#include "pingus/fonts.hpp"
-#include "math/math.hpp"
-#include "editor/viewport.hpp"
 #include "editor/editor_level.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/gui_style.hpp"
+#include "editor/level_objs.hpp"
 #include "editor/object_selector_list.hpp"
 #include "editor/object_selector_set.hpp"
-#include "editor/level_objs.hpp"
+#include "editor/viewport.hpp"
+#include "engine/display/display.hpp"
 #include "engine/display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/sprite.hpp"
 #include "engine/gui/gui_manager.hpp"
-
+#include "math/math.hpp"
+#include "math/vector2i.hpp"
+#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
 #include "pingus/resource.hpp"
 
 namespace Editor {

Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp    2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/object_selector_list.cpp    2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -18,15 +18,15 @@
 
 #include <iostream>
 
-#include "math/math.hpp"
+#include "editor/editor_level.hpp"
 #include "editor/editor_screen.hpp"
+#include "editor/object_selector.hpp"
 #include "editor/object_selector_set.hpp"
-#include "editor/object_selector.hpp"
 #include "editor/viewport.hpp"
-#include "editor/editor_level.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "math/math.hpp"
 #include "pingus/groundtype.hpp"
 #include "pingus/resource.hpp"
-#include "engine/display/drawing_context.hpp"
 
 namespace Editor {
 

Modified: trunk/pingus/src/editor/object_selector_set.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.cpp     2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/object_selector_set.cpp     2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -16,9 +16,8 @@
 
 #include "editor/object_selector_set.hpp"
 
-
 namespace Editor {
-
+
 ObjectSelectorSet::ObjectSelectorSet(ObjectSelectorList* list_, int thumb_w, 
int thumb_h) :
   list(list_),
   thumb_size(thumb_w, thumb_h),
@@ -50,7 +49,7 @@
 {
   return (objects.size() / get_width()) + ((objects.size() % get_width() > 0) 
? 1 : 0);
 }
-
+
 } // namespace Editor
 
 /* EOF */

Modified: trunk/pingus/src/editor/object_selector_set.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.hpp     2009-11-06 19:19:16 UTC 
(rev 4060)
+++ trunk/pingus/src/editor/object_selector_set.hpp     2009-11-06 19:43:20 UTC 
(rev 4061)
@@ -18,12 +18,12 @@
 #define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_SET_HPP
 
 #include <vector>
+
+#include "editor/object_selector_list.hpp"
 #include "math/size.hpp"
-#include "editor/object_selector_list.hpp"
 
 namespace Editor {
-
-/** */
+
 class ObjectSelectorSet
 {
 private:
@@ -57,7 +57,7 @@
   ObjectSelectorSet (const ObjectSelectorSet&);
   ObjectSelectorSet& operator= (const ObjectSelectorSet&);
 };
-
+
 } // namespace Editor
 
 #endif

Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp   2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/panel.cpp   2009-11-06 19:43:20 UTC (rev 4061)
@@ -16,18 +16,18 @@
 
 #include "editor/panel.hpp"
 
+#include "editor/editor_screen.hpp"
 #include "engine/display/display.hpp" 
 #include "engine/display/drawing_context.hpp"
-#include "editor/editor_screen.hpp"
+#include "engine/display/sprite.hpp"
 #include "engine/gui/gui_manager.hpp"
 #include "math/vector2i.hpp"
 #include "pingus/fonts.hpp"
 #include "pingus/gettext.h"
 #include "pingus/resource.hpp"
-#include "engine/display/sprite.hpp"
 
 namespace Editor {
-
+
 class PanelSeparator : public GUI::Component
 {
 private:
@@ -257,7 +257,7 @@
   pos.x += comp->get_width();
   editor->get_gui_manager()->add(comp);
 }
-
+
 } // namespace Editor
 
 /* EOF */

Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp   2009-11-06 19:19:16 UTC (rev 4060)
+++ trunk/pingus/src/editor/panel.hpp   2009-11-06 19:43:20 UTC (rev 4061)
@@ -21,11 +21,11 @@
 #include <string>
 
 #include "engine/display/sprite.hpp"
+#include "engine/gui/component.hpp"
 #include "math/vector2i.hpp"
-#include "engine/gui/component.hpp"
 
 namespace Editor {
-
+
 class EditorScreen;
 
 /** */
@@ -54,7 +54,7 @@
   Panel (const Panel&);
   Panel& operator= (const Panel&);
 };
-
+
 } // namespace Editor
 
 #endif