CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/30 21:21:58
Modified files:
. : ChangeLog
server : dlist.cpp dlist.h
Log message:
* server/dlist.{cpp,h}: drop unused methods and optional args.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4165&r2=1.4166
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.46&r2=1.47
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4165
retrieving revision 1.4166
diff -u -b -r1.4165 -r1.4166
--- ChangeLog 30 Aug 2007 18:19:15 -0000 1.4165
+++ ChangeLog 30 Aug 2007 21:21:57 -0000 1.4166
@@ -1,5 +1,9 @@
2007-08-30 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/dlist.{cpp,h}: drop unused methods and optional args.
+
+2007-08-30 Sandro Santilli <[EMAIL PROTECTED]>
+
* server/sprite_instance.{cpp,h}: cleanups:
drop resetDisplayList, _frame0 and replace_if_depth_is_occupied
parameter of add_display_object.
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/dlist.cpp 24 Aug 2007 16:07:27 -0000 1.78
+++ server/dlist.cpp 30 Aug 2007 21:21:58 -0000 1.79
@@ -415,29 +415,6 @@
//dump();
}
-
-// clear the display list.
-void
-DisplayList::clear(bool call_unload)
-{
- //GNASH_REPORT_FUNCTION;
-
- // This might eventually become obsoleted
- if ( call_unload )
- {
- for (iterator it = _characters.begin(),
- itEnd = _characters.end();
- it != itEnd; ++it)
- {
- DisplayItem& di = *it;
- if ( ! it->get() ) continue;
- di->unload(); // if call_unload
- }
- }
-
- _characters.clear();
-}
-
void
DisplayList::swapDepths(character* ch1, int newdepth)
{
@@ -585,34 +562,6 @@
}
}
-void
-DisplayList::clear_except(std::vector<character*>& exclude, bool call_unload)
-{
- //GNASH_REPORT_FUNCTION;
-
- for (iterator it = _characters.begin(), itEnd = _characters.end(); it
!= itEnd; )
- {
- DisplayItem& di = *it;
-
- bool is_affected = false;
- for (size_t i=0, n=exclude.size(); i<n; ++i)
- {
- if (exclude[i] == di.get())
- {
- is_affected = true;
- break;
- }
- }
-
- if (is_affected == false)
- {
- if ( call_unload ) di->unload();
- it = _characters.erase(it);
- continue;
- }
- it++;
- }
-}
void
DisplayList::clear_except(const DisplayList& exclude, bool call_unload)
@@ -647,35 +596,6 @@
}
void
-DisplayList::clear(std::vector<character*>& which, bool call_unload)
-{
- //GNASH_REPORT_FUNCTION;
-
- for (iterator it = _characters.begin(), itEnd = _characters.end(); it
!= itEnd; )
- {
- DisplayItem& di = *it;
-
- bool is_affected = false;
- for (size_t i=0, n=which.size(); i<n; ++i)
- {
- if (which[i] == di.get())
- {
- is_affected = true;
- break;
- }
- }
-
- if (is_affected)
- {
- if ( call_unload ) di->unload();
- it = _characters.erase(it);
- continue;
- }
- it++;
- }
-}
-
-void
DisplayList::clear(const DisplayList& from, bool call_unload)
{
//GNASH_REPORT_FUNCTION;
Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/dlist.h 24 Aug 2007 16:07:27 -0000 1.46
+++ server/dlist.h 30 Aug 2007 21:21:58 -0000 1.47
@@ -173,12 +173,10 @@
void remove_display_object(int depth);
/// Clear the display list.
- //
- /// @param call_unload
- /// If true, UNLOAD event will be invoked on the characters being
- /// removed. False by default.
- ///
- void clear(bool call_unload=false);
+ void clear()
+ {
+ _characters.clear();
+ }
/// \brief
/// Clear all characters in this DisplayList that are also found
@@ -195,35 +193,6 @@
void clear(const DisplayList& from, bool call_unload=false);
/// \brief
- /// Clear all characters in the display list also found in the given
vector.
- //
- /// @param which
- /// A vector containing character instances to remove.
- /// Any instance found in the vector will be removed
- /// from this DisplayList.
- ///
- /// @param call_unload
- /// If true, UNLOAD event will be invoked on the characters being
- /// removed. False by default.
- ///
- void clear(std::vector<character*>& which, bool call_unload=false);
-
- /// \brief
- /// Clear all characters in the display list except the ones
- /// contained in the given vector.
- //
- /// @param exclude
- /// A vector containing character instances to keep.
- /// Any instance not found in the vector will be removed
- /// from this DisplayList.
- ///
- /// @param call_unload
- /// If true, UNLOAD event will be invoked on the characters being
- /// removed. False by default.
- ///
- void clear_except(std::vector<character*>& exclude, bool
call_unload=false);
-
- /// \brief
/// Clear all characters in this DisplayList except the ones
/// contained in the given DisplayList
//
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
