[Pingus-CVS] r4016 - in trunk/pingus/src: . actions components editor pingus util worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-04 06:31:52 +0100 (Wed, 04 Nov 2009)
New Revision: 4016

Added:
   trunk/pingus/src/pingus/gettext.h
Removed:
   trunk/pingus/src/gettext.h
Modified:
   trunk/pingus/src/actions/bridger.cpp
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/components/pingus_counter.cpp
   trunk/pingus/src/editor/editor_screen.cpp
   trunk/pingus/src/editor/file_dialog.cpp
   trunk/pingus/src/editor/object_properties.cpp
   trunk/pingus/src/editor/object_selector.cpp
   trunk/pingus/src/editor/panel.cpp
   trunk/pingus/src/pingus/addon_menu.cpp
   trunk/pingus/src/pingus/collision_map.cpp
   trunk/pingus/src/util/system.cpp
   trunk/pingus/src/worldmap/level_dot.cpp
   trunk/pingus/src/worldmap/worldmap.cpp
   trunk/pingus/src/worldmap/worldmap_screen.cpp
   trunk/pingus/src/worldmap/worldmap_story.cpp
Log:
Moved gettext.h to pingus/

Modified: trunk/pingus/src/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/actions/bridger.cpp        2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/actions/bridger.cpp        2009-11-04 05:31:52 UTC (rev 
4016)
@@ -21,7 +21,7 @@
 #include "sound/sound.hpp"
 #include "pingus/world.hpp"
 #include "pingus/worldobj.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "util/string_util.hpp"
 #include "actions/bridger.hpp"
 

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/components/menu_button.cpp 2009-11-04 05:31:52 UTC (rev 
4016)
@@ -19,7 +19,7 @@
 #include "pingus/fonts.hpp"
 #include "sound/sound.hpp"
 #include "pingus/resource.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "pingus/pingus_menu.hpp"
 
 #include "components/menu_button.hpp"

Modified: trunk/pingus/src/components/pingus_counter.cpp
===================================================================
--- trunk/pingus/src/components/pingus_counter.cpp      2009-11-04 05:26:43 UTC 
(rev 4015)
+++ trunk/pingus/src/components/pingus_counter.cpp      2009-11-04 05:31:52 UTC 
(rev 4016)
@@ -15,16 +15,16 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdio.h>
-#include "gettext.h"
+
+#include "components/pingus_counter.hpp"
+#include "pingus/gettext.h"
+#include "pingus/fonts.hpp"
+#include "pingus/globals.hpp"
+#include "pingus/pingu_holder.hpp"
 #include "pingus/resource.hpp"
+#include "pingus/server.hpp"
 #include "pingus/world.hpp"
-#include "pingus/pingu_holder.hpp"
-#include "pingus/server.hpp"
-#include "pingus/globals.hpp"
-#include "pingus/fonts.hpp"
-#include "components/pingus_counter.hpp"
 
-
 PingusCounter::PingusCounter(Server* s)
   : server(s),
     background("core/buttons/info")

Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp   2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/editor/editor_screen.cpp   2009-11-04 05:31:52 UTC (rev 
4016)
@@ -27,7 +27,7 @@
 #include "pingus/res_descriptor.hpp"
 #include "pingus/resource.hpp"
 #include "pingus/fonts.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "editor/file_dialog.hpp"
 #include "pingus/path_manager.hpp"
 #include "util/pathname.hpp"

Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp     2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/editor/file_dialog.cpp     2009-11-04 05:31:52 UTC (rev 
4016)
@@ -23,7 +23,7 @@
 #include "util/system.hpp"
 #include "editor/gui_style.hpp"
 #include "pingus/fonts.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "editor/label.hpp"
 #include "editor/inputbox.hpp"
 #include "util/pathname.hpp"

Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp       2009-11-04 05:26:43 UTC 
(rev 4015)
+++ trunk/pingus/src/editor/object_properties.cpp       2009-11-04 05:31:52 UTC 
(rev 4016)
@@ -23,7 +23,7 @@
 #include "editor/level_objs.hpp"
 #include "pingus/fonts.hpp"
 #include "editor/label.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "editor/gui_style.hpp"
 #include "pingus/groundtype.hpp"
 #include "editor/combobox.hpp"

Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-04 05:31:52 UTC (rev 
4016)
@@ -20,7 +20,7 @@
 #include "display/display.hpp"
 #include "editor/gui_style.hpp"
 #include "pingus/sprite.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "math/vector2i.hpp"
 #include "editor/editor_screen.hpp"
 #include "display/drawing_context.hpp"

Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp   2009-11-04 05:26:43 UTC (rev 4015)
+++ trunk/pingus/src/editor/panel.cpp   2009-11-04 05:31:52 UTC (rev 4016)
@@ -14,16 +14,16 @@
 //  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 "pingus/fonts.hpp"
 #include "display/display.hpp" 
 #include "display/drawing_context.hpp"
+#include "editor/editor_screen.hpp"
+#include "editor/panel.hpp"
+#include "gui/gui_manager.hpp"
+#include "math/vector2i.hpp"
+#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
 #include "pingus/resource.hpp"
 #include "pingus/sprite.hpp"
-#include "gettext.h"
-#include "math/vector2i.hpp"
-#include "editor/editor_screen.hpp"
-#include "gui/gui_manager.hpp"
-#include "editor/panel.hpp"
 
 namespace Editor {
 

Deleted: trunk/pingus/src/gettext.h
===================================================================
--- trunk/pingus/src/gettext.h  2009-11-04 05:26:43 UTC (rev 4015)
+++ trunk/pingus/src/gettext.h  2009-11-04 05:31:52 UTC (rev 4016)
@@ -1,28 +0,0 @@
-//  $Id: tinygettext.cpp,v 1.4 2004/11/25 13:15:56 matzebraun Exp $
-// 
-//  TinyGetText - A small flexible gettext() replacement
-//  Copyright (C) 2004 Ingo Ruhnke <address@hidden>
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-// 
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_GETTEXT_HXX
-#define HEADER_GETTEXT_HXX
-
-#include <string>
-
-std::string _(const std::string& msg);
-std::string _(const std::string& msg, const std::string& msg_pl, int num);
-
-#endif /* HEADER_GETTEXT_HXX */

Modified: trunk/pingus/src/pingus/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/addon_menu.cpp      2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/pingus/addon_menu.cpp      2009-11-04 05:31:52 UTC (rev 
4016)
@@ -14,7 +14,7 @@
 //  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 "gettext.h"
+#include "pingus/gettext.h"
 #include "pingus/resource.hpp"
 #include "screen/screen_manager.hpp"
 #include "pingus/fonts.hpp"

Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp   2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/pingus/collision_map.cpp   2009-11-04 05:31:52 UTC (rev 
4016)
@@ -22,7 +22,7 @@
 #include "pingus/collision_mask.hpp"
 #include "pingus/pingus_error.hpp"
 #include "math/math.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "pingus/sprite.hpp"
 
 CollisionMap::CollisionMap(int w, int h)

Copied: trunk/pingus/src/pingus/gettext.h (from rev 4010, 
trunk/pingus/src/gettext.h)

Modified: trunk/pingus/src/util/system.cpp
===================================================================
--- trunk/pingus/src/util/system.cpp    2009-11-04 05:26:43 UTC (rev 4015)
+++ trunk/pingus/src/util/system.cpp    2009-11-04 05:31:52 UTC (rev 4016)
@@ -47,7 +47,7 @@
 #include "pingus/globals.hpp"
 #include "util/system.hpp"
 #include "util/string_util.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 
 std::string System::userdir;
 std::string System::default_email;

Modified: trunk/pingus/src/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/worldmap/level_dot.cpp     2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/worldmap/level_dot.cpp     2009-11-04 05:31:52 UTC (rev 
4016)
@@ -14,23 +14,25 @@
 //  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 "worldmap/level_dot.hpp"
+
 #include <iostream>
+
+#include "display/drawing_context.hpp"
+#include "input/control.hpp"
+#include "input/controller.hpp"
 #include "pingus/font.hpp"
-#include "gettext.h"
+#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
 #include "pingus/globals.hpp"
-#include "util/system.hpp"
-#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
-#include "screen/screen_manager.hpp"
-#include "pingus/resource.hpp"
 #include "pingus/path_manager.hpp"
-#include "pingus/start_screen.hpp"
 #include "pingus/plf_res_mgr.hpp"
+#include "pingus/resource.hpp"
 #include "pingus/savegame_manager.hpp"
+#include "pingus/start_screen.hpp"
+#include "screen/screen_manager.hpp"
 #include "util/file_reader.hpp"
-#include "input/controller.hpp"
-#include "input/control.hpp"
-#include "worldmap/level_dot.hpp"
+#include "util/system.hpp"
 
 namespace WorldmapNS {
 

Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp      2009-11-04 05:26:43 UTC (rev 
4015)
+++ trunk/pingus/src/worldmap/worldmap.cpp      2009-11-04 05:31:52 UTC (rev 
4016)
@@ -26,7 +26,7 @@
 #include "pingus/globals.hpp"
 #include "sound/sound.hpp"
 #include "pingus/pingus_error.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 #include "pingus/globals.hpp"
 #include "util/sexpr_file_reader.hpp"
 #include "pingus/debug.hpp"

Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp       2009-11-04 05:26:43 UTC 
(rev 4015)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp       2009-11-04 05:31:52 UTC 
(rev 4016)
@@ -14,25 +14,27 @@
 //  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 "worldmap/worldmap_screen.hpp"
+
 #include <iostream>
-#include "gettext.h"
-#include "pingus/fonts.hpp"
+
 #include "display/display.hpp"
-#include "screen/screen_manager.hpp"
+#include "display/scene_context.hpp"
 #include "gui/surface_button.hpp"
+#include "math/math.hpp"
+#include "pingus/fonts.hpp"
+#include "pingus/gettext.h"
 #include "pingus/path_manager.hpp"
 #include "pingus/res_descriptor.hpp"
+#include "pingus/resource.hpp"
+#include "pingus/stat_manager.hpp"
+#include "pingus/story_screen.hpp"
+#include "screen/screen_manager.hpp"
 #include "sound/sound.hpp"
-#include "pingus/stat_manager.hpp"
-#include "display/scene_context.hpp"
-#include "math/math.hpp"
+#include "worldmap/pingus.hpp"
 #include "worldmap/worldmap.hpp"
 #include "worldmap/worldmap_component.hpp"
-#include "pingus/resource.hpp"
 #include "worldmap/worldmap_story.hpp"
-#include "worldmap/pingus.hpp"
-#include "pingus/story_screen.hpp"
-#include "worldmap/worldmap_screen.hpp"
 
 namespace WorldmapNS {
 

Modified: trunk/pingus/src/worldmap/worldmap_story.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_story.cpp        2009-11-04 05:26:43 UTC 
(rev 4015)
+++ trunk/pingus/src/worldmap/worldmap_story.cpp        2009-11-04 05:31:52 UTC 
(rev 4016)
@@ -23,7 +23,7 @@
 #include "pingus/pingus_error.hpp"
 #include "pingus/string_format.hpp"
 #include "pingus/fonts.hpp"
-#include "gettext.h"
+#include "pingus/gettext.h"
 
 namespace WorldmapNS {