[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11591: Drop boost::intrusive_ptr.
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11591: Drop boost::intrusive_ptr. |
Date: |
Tue, 27 Oct 2009 09:23:55 +0100 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11591
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-10-27 09:23:55 +0100
message:
Drop boost::intrusive_ptr.
modified:
libcore/MouseButtonState.h
libcore/drag_state.h
libcore/movie_root.cpp
=== modified file 'libcore/MouseButtonState.h'
--- a/libcore/MouseButtonState.h 2009-04-07 13:13:16 +0000
+++ b/libcore/MouseButtonState.h 2009-10-27 08:23:55 +0000
@@ -30,10 +30,10 @@
};
/// entity that currently owns the mouse pointer
- boost::intrusive_ptr<InteractiveObject> activeEntity;
+ InteractiveObject* activeEntity;
/// what's underneath the mouse right now
- boost::intrusive_ptr<InteractiveObject> topmostEntity;
+ InteractiveObject* topmostEntity;
/// previous state of mouse button
bool previousButtonState;
@@ -46,6 +46,8 @@
MouseButtonState()
:
+ activeEntity(0),
+ topmostEntity(0),
previousButtonState(UP),
currentButtonState(UP),
wasInsideActiveEntity(false)
@@ -56,8 +58,8 @@
/// Mark reachable objects (active and topmost entities)
void markReachableResources() const
{
- if ( activeEntity.get() ) activeEntity->setReachable();
- if ( topmostEntity.get() ) topmostEntity->setReachable();
+ if (activeEntity) activeEntity->setReachable();
+ if (topmostEntity) topmostEntity->setReachable();
}
#endif // GNASH_USE_GC
};
=== modified file 'libcore/drag_state.h'
--- a/libcore/drag_state.h 2009-10-01 13:19:43 +0000
+++ b/libcore/drag_state.h 2009-10-27 08:23:55 +0000
@@ -40,7 +40,7 @@
/// Coordinates in TWIPS.
SWFRect _bounds;
- boost::intrusive_ptr<DisplayObject> _displayObject;
+ DisplayObject* _displayObject;
bool _lock_centered;
@@ -103,7 +103,7 @@
/// May return NULL !!
DisplayObject* getCharacter() const {
- return _displayObject.get();
+ return _displayObject;
}
/// Stores DisplayObject in an intrusive pointer
@@ -132,7 +132,7 @@
/// Mark DisplayObject as reachable (if any)
void markReachableResources() const
{
- if ( _displayObject ) _displayObject->setReachable();
+ if (_displayObject) _displayObject->setReachable();
}
};
=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp 2009-10-26 07:14:13 +0000
+++ b/libcore/movie_root.cpp 2009-10-27 08:23:55 +0000
@@ -799,7 +799,7 @@
// all necessary events and removal of current focus.
// Do not set focus to NULL.
if (ms.activeEntity) {
- setFocus(ms.activeEntity.get());
+ setFocus(ms.activeEntity);
ms.activeEntity->mouseEvent(event_id::PRESS);
need_redisplay=true;
@@ -1358,7 +1358,7 @@
DisplayObject*
movie_root::getActiveEntityUnderPointer() const
{
- return m_mouse_button_state.activeEntity.get();
+ return m_mouse_button_state.activeEntity;
}
DisplayObject*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11591: Drop boost::intrusive_ptr.,
Benjamin Wolsey <=