[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj.hxx,1.7,1.8 object_m
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj.hxx,1.7,1.8 object_manager.cxx,1.14,1.15 object_manager.hxx,1.7,1.8 plfobj.hxx,1.4,1.5 selection.cxx,1.2,1.3 selection.hxx,1.2,1.3 |
Date: |
1 Jul 2002 16:40:33 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv17046/editor
Modified Files:
editorobj.hxx object_manager.cxx object_manager.hxx plfobj.hxx
selection.cxx selection.hxx
Log Message:
using namespace in a .hxx file is a 'no no'
Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editorobj.hxx 1 Jul 2002 09:09:31 -0000 1.7
+++ editorobj.hxx 1 Jul 2002 16:40:30 -0000 1.8
@@ -23,8 +23,6 @@
#include <string>
#include <iosfwd>
-using namespace std;
-
class CL_Rect;
class CL_Vector;
class EditorView;
Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- object_manager.cxx 1 Jul 2002 16:31:40 -0000 1.14
+++ object_manager.cxx 1 Jul 2002 16:40:30 -0000 1.15
@@ -37,6 +37,7 @@
# define for if(0);else for
#endif
+using namespace std;
using namespace Pingus;
using namespace Actions;
@@ -119,9 +120,9 @@
}
void
-ObjectManager::load_level (const std::string & filename)
+ObjectManager::load_level (const std::string& filename)
{
- std::cout << "ObjectManager::Loading level: " << filename << endl;
+ std::cout << "ObjectManager::Loading level: " << filename << std::endl;
delete_all_objs();
Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- object_manager.hxx 1 Jul 2002 16:10:29 -0000 1.7
+++ object_manager.hxx 1 Jul 2002 16:40:30 -0000 1.8
@@ -99,7 +99,7 @@
void add_object_group_from_file (const std::string& filename);
//void rect_get_current_objs(float x1, float y1, float x2, float y2);
- list<EditorObj*> rect_get_objs(int x1, int y1, int x2, int y2);
+ std::list<EditorObj*> rect_get_objs(int x1, int y1, int x2, int y2);
int get_width() { return width; }
int get_height() { return height; }
Index: plfobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plfobj.hxx 1 Jul 2002 09:09:31 -0000 1.4
+++ plfobj.hxx 1 Jul 2002 16:40:30 -0000 1.5
@@ -26,9 +26,6 @@
#include "../trap_data.hxx"
#include "sprite_editorobj.hxx"
-
-using namespace std;
-
///
class EntranceObj : public SpriteEditorObj,
public EntranceData
Index: selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- selection.cxx 1 Jul 2002 16:31:40 -0000 1.2
+++ selection.cxx 1 Jul 2002 16:40:30 -0000 1.3
@@ -24,6 +24,7 @@
#include "../math.hxx"
using namespace Pingus;
+using namespace std;
void EditorSelection::move(float x, float y) {
Index: selection.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- selection.hxx 1 Jul 2002 16:31:40 -0000 1.2
+++ selection.hxx 1 Jul 2002 16:40:30 -0000 1.3
@@ -47,7 +47,7 @@
void drop();
void add(EditorObj* obj);
- void add(list<EditorObj*> objs);
+ void add(std::list<EditorObj*> objs);
void remove(EditorObj* obj);
@@ -59,7 +59,7 @@
bool object_selected(EditorObj* obj);
EditorObj* get_current_obj();
- const list<EditorObj*> & get_objects() { return obj_list; }
+ const std::list<EditorObj*> & get_objects() { return obj_list; }
int size () { return obj_list.size (); }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor editorobj.hxx,1.7,1.8 object_manager.cxx,1.14,1.15 object_manager.hxx,1.7,1.8 plfobj.hxx,1.4,1.5 selection.cxx,1.2,1.3 selection.hxx,1.2,1.3,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.23,1.24 editor.cxx,1.14,1.15 editor_event.cxx,1.17,1.18 level_property_window.cxx,1.2,1.3 level_property_window.hxx,1.2,1.3 object_manager.cxx,1.13,1.14 property_window.cxx,1.5,1.6 property_window.hxx,1.2,1.3 selection.cxx,1.1,1.2 selection.hxx,1.1,1.2 status_line.hxx,1.3,1.4
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.15,1.16 editor_event.cxx,1.18,1.19 object_manager.cxx,1.15,1.16 object_manager.hxx,1.8,1.9 selection.cxx,1.3,1.4 selection.hxx,1.3,1.4 status_line.cxx,1.4,1.5 status_line.hxx,1.4,1.5
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.23,1.24 editor.cxx,1.14,1.15 editor_event.cxx,1.17,1.18 level_property_window.cxx,1.2,1.3 level_property_window.hxx,1.2,1.3 object_manager.cxx,1.13,1.14 property_window.cxx,1.5,1.6 property_window.hxx,1.2,1.3 selection.cxx,1.1,1.2 selection.hxx,1.1,1.2 status_line.hxx,1.3,1.4
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.15,1.16 editor_event.cxx,1.18,1.19 object_manager.cxx,1.15,1.16 object_manager.hxx,1.8,1.9 selection.cxx,1.3,1.4 selection.hxx,1.3,1.4 status_line.cxx,1.4,1.5 status_line.hxx,1.4,1.5
- Index(es):