[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.42,1.43 editor_ev
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.42,1.43 editor_event.cxx,1.44,1.45 scroll_map.cxx,1.5,1.6scroll_map.hxx,1.5,1.6 |
Date: |
25 Jan 2003 18:34:38 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv23306/editor
Modified Files:
editor.cxx editor_event.cxx scroll_map.cxx scroll_map.hxx
Log Message:
removed the last usages of boost::shared_ptr and boost/
Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- editor.cxx 1 Dec 2002 17:08:47 -0000 1.42
+++ editor.cxx 25 Jan 2003 18:34:36 -0000 1.43
@@ -42,6 +42,7 @@
#include "level_property_window.hxx"
#include "editor.hxx"
#include "../path_manager.hxx"
+#include "editor_view.hxx"
#include <cstdio>
Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- editor_event.cxx 3 Dec 2002 00:51:19 -0000 1.44
+++ editor_event.cxx 25 Jan 2003 18:34:36 -0000 1.45
@@ -47,6 +47,7 @@
#include "level_resizer.hxx"
#include "object_selector_window.hxx"
#include "../screen_manager.hxx"
+#include "editor_view.hxx"
namespace EditorNS {
Index: scroll_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/scroll_map.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scroll_map.cxx 28 Sep 2002 11:52:23 -0000 1.5
+++ scroll_map.cxx 25 Jan 2003 18:34:36 -0000 1.6
@@ -18,9 +18,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <ClanLib/Display/Display/display.h>
-#include "scroll_map.hxx"
#include "editor.hxx"
+#include "editor_view.hxx"
#include "object_manager.hxx"
+#include "scroll_map.hxx"
namespace EditorNS {
@@ -38,6 +39,7 @@
ScrollMap::~ScrollMap()
{
+ delete view;
}
///
@@ -76,7 +78,7 @@
{
CL_Display::fill_rect (x_pos, y_pos, x_pos + width, y_pos + height,
0.4f, 0.4f, 0.0f);
- Editor::instance ()->get_object_manager ()->draw (view.get ());
+ Editor::instance()->get_object_manager()->draw(view);
/*
int viewarea_width = (CL_Display::get_width() * width
/ editor_event->object_manager->get_width());
Index: scroll_map.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/scroll_map.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scroll_map.hxx 27 Sep 2002 11:26:45 -0000 1.5
+++ scroll_map.hxx 25 Jan 2003 18:34:36 -0000 1.6
@@ -20,11 +20,9 @@
#ifndef HEADER_PINGUS_EDITOR_SCROLL_MAP_HXX
#define HEADER_PINGUS_EDITOR_SCROLL_MAP_HXX
-#include "../boost/smart_ptr.hpp"
-#include "editor_view.hxx"
-
class CL_Key;
class CL_InputDevice;
+class EditorView;
namespace EditorNS {
@@ -35,7 +33,7 @@
private:
int width, height;
int x_pos, y_pos;
- boost::shared_ptr<EditorView> view;
+ EditorView* view;
public:
static EditorEvent* editor_event;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.42,1.43 editor_event.cxx,1.44,1.45 scroll_map.cxx,1.5,1.6scroll_map.hxx,1.5,1.6,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/boost auto_ptr.hpp,1.1,NONE config.hpp,1.2,NONE smart_ptr.hpp,1.4,NONE utility.hpp,1.2,NONE
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src config.cxx,1.9,1.10 config.hxx,1.7,1.8 pingus_main.cxx,1.39,1.40 world.hxx,1.22,1.23
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/boost auto_ptr.hpp,1.1,NONE config.hpp,1.2,NONE smart_ptr.hpp,1.4,NONE utility.hpp,1.2,NONE
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src config.cxx,1.9,1.10 config.hxx,1.7,1.8 pingus_main.cxx,1.39,1.40 world.hxx,1.22,1.23
- Index(es):