CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/01/18 17:48:27
Modified files:
. : ChangeLog
pythonmodule : gnashpython.cpp
testsuite : MovieTester.cpp
server : array.cpp as_environment.cpp as_object.cpp
button_character_instance.cpp character.cpp
edit_text_character.cpp edit_text_character.h
fill_style.cpp
server/asobj : BevelFilter_as.cpp GradientBevelFilter_as.cpp
GradientGlowFilter_as.cpp SharedObject.cpp
xml.h
server/parser : movie_def_impl.cpp
server/vm : ActionExec.cpp ExecutableCode.h
libbase : rc.cpp
libgeometry : Point2d.h Range2d.h
Log message:
Drop 'using namespace std;' from the 3 headers it's in. Add std::
namespace qualifier to the
17 .cpp or header files where it was missing.
There are still some left in the renderer glue headers in gui/, but I'm
not building these
GUIs to see what relies on the std namespace there. Touching them
fortunately won't mean
a full rebuild like this commit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5431&r2=1.5432
http://cvs.savannah.gnu.org/viewcvs/gnash/pythonmodule/gnashpython.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientBevelFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientGlowFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Point2d.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Range2d.h?cvsroot=gnash&r1=1.18&r2=1.19
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5431
retrieving revision 1.5432
diff -u -b -r1.5431 -r1.5432
--- ChangeLog 18 Jan 2008 16:55:24 -0000 1.5431
+++ ChangeLog 18 Jan 2008 17:48:24 -0000 1.5432
@@ -1,3 +1,10 @@
+2008-01-18 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * server/asobj/xml.h, libgeometry/{Range,Point}2d.h,
+ server/edit_text_character.h: drop 'using namespace std;' from
+ headers.
+ * Lots of .cpp files: add std namespace where necessary.
+
2008-01-18 Sandro Santilli <[EMAIL PROTECTED]>
* cygnal/http.cpp: fix extra semicolon error.
Index: pythonmodule/gnashpython.cpp
===================================================================
RCS file: /sources/gnash/gnash/pythonmodule/gnashpython.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pythonmodule/gnashpython.cpp 12 Jan 2008 15:05:54 -0000 1.4
+++ pythonmodule/gnashpython.cpp 18 Jan 2008 17:48:25 -0000 1.5
@@ -157,7 +157,7 @@
}
// I don't know why it's done like this.
- auto_ptr<movie_instance> mi (_movieDef->create_movie_instance());
+ std::auto_ptr<movie_instance> mi (_movieDef->create_movie_instance());
// Put the instance on stage.
_movieRoot->setRootMovie( mi.release() );
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- testsuite/MovieTester.cpp 29 Dec 2007 13:15:13 -0000 1.64
+++ testsuite/MovieTester.cpp 18 Jan 2008 17:48:25 -0000 1.65
@@ -122,7 +122,7 @@
dbglogfile.setVerbosity(1);
- auto_ptr<movie_instance> mi ( _movie_def->create_movie_instance() );
+ std::auto_ptr<movie_instance> mi ( _movie_def->create_movie_instance()
);
// Set _movie before calling ::render
_movie = mi.get();
@@ -177,7 +177,7 @@
_movie_root->add_invalidated_bounds(_invalidatedBounds, false);
#ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
- cout << "frame " << _movie->get_current_frame() << ") Invalidated
bounds " << _invalidatedBounds << endl;
+ std::cout << "frame " << _movie->get_current_frame() << ") Invalidated
bounds " << _invalidatedBounds << std::endl;
#endif
// Force full redraw by using a WORLD invalidated ranges
@@ -278,7 +278,7 @@
const char* X="";
if ( expectFailure ) X="X";
- //cout <<"chekPixel(" << color << ") called" << endl;
+ //std::cout <<"chekPixel(" << color << ") called" << std::endl;
for (TRenderers::const_iterator it=_testingRenderers.begin(),
itE=_testingRenderers.end();
it != itE; ++it)
@@ -440,18 +440,18 @@
for (unsigned i=0; i<sizeof(aggPixelFormats)/sizeof(*aggPixelFormats);
++i)
{
const char* pixelFormat = aggPixelFormats[i];
- std::string name = "AGG_"+string(pixelFormat);
+ std::string name = "AGG_" + std::string(pixelFormat);
handler.reset( create_render_handler_agg(pixelFormat) );
if ( handler.get() )
{
//log_msg("Renderer %s initialized", name.c_str());
- cout << "Renderer " << name << " initialized" << endl;
+ std::cout << "Renderer " << name << " initialized" <<
std::endl;
addTestingRenderer(handler, name);
}
else
{
- cout << "Renderer " << name << " not supported" << endl;
+ std::cout << "Renderer " << name << " not supported" <<
std::endl;
}
}
#endif // RENDERER_AGG
@@ -475,21 +475,21 @@
{
if ( ! h->initTestBuffer(_width, _height) )
{
- cout << "UNTESTED: render handler " << name
+ std::cout << "UNTESTED: render handler " << name
<< " doesn't support in-memory rendering "
- << endl;
+ << std::endl;
return;
}
// TODO: make the core lib support this
if ( ! _testingRenderers.empty() )
{
- cout << "UNTESTED: can't test render handler " << name
+ std::cout << "UNTESTED: can't test render handler " << name
<< " because gnash core lib is unable to support
testing of "
<< "multiple renderers from a single process "
<< "and we're already testing render handler "
<< _testingRenderers.front()->getName()
- << endl;
+ << std::endl;
return;
}
@@ -518,13 +518,13 @@
{
#ifdef SOUND_SDL
- cout << "Creating SDL sound handler" << endl;
+ std::cout << "Creating SDL sound handler" << std::endl;
_sound_handler.reset( gnash::media::create_sound_handler_sdl() );
#elif defined(SOUND_GST)
- cout << "Creating GST sound handler" << endl;
+ std::cout << "Creating GST sound handler" << std::endl;
_sound_handler.reset( gnash::media::create_sound_handler_gst() );
#else
- cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << endl;
+ std::cerr << "Neigher SOUND_SDL nor SOUND_GST defined" << std::endl;
return;
//exit(1);
#endif
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/array.cpp 10 Jan 2008 17:34:45 -0000 1.90
+++ server/array.cpp 18 Jan 2008 17:48:25 -0000 1.91
@@ -582,7 +582,7 @@
int
as_array_object::index_requested(string_table::key name)
{
- string name_str = VM::get().getStringTable().value(name);
+ std::string name_str = VM::get().getStringTable().value(name);
as_value temp;
temp.set_string(name_str);
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/as_environment.cpp 17 Jan 2008 23:34:38 -0000 1.121
+++ server/as_environment.cpp 18 Jan 2008 17:48:26 -0000 1.122
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.121 2008/01/17 23:34:38 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.122 2008/01/18 17:48:26 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -97,7 +97,7 @@
else
{
// TODO: have this checked by parse_path as an optimization
- if ( varname.find_first_of('/') != string::npos &&
varname.find_first_of(':') == string::npos )
+ if ( varname.find_first_of('/') != std::string::npos &&
varname.find_first_of(':') == std::string::npos )
{
// Consider it all a path ...
as_object* target = find_object(varname, &scopeStack);
@@ -447,9 +447,9 @@
#endif
size_t lastDotOrColon = var_path_in.find_last_of(":.");
- if ( lastDotOrColon == string::npos ) return false;
+ if ( lastDotOrColon == std::string::npos ) return false;
- string thePath, theVar;
+ std::string thePath, theVar;
thePath.assign(var_path_in, 0, lastDotOrColon);
theVar.assign(var_path_in, lastDotOrColon+1, var_path_in.length());
@@ -491,8 +491,8 @@
as_environment::parse_path(const std::string& var_path,
as_object** target, as_value& val)
{
- string path;
- string var;
+ std::string path;
+ std::string var;
if ( ! parse_path(var_path, path, var) ) return false;
as_object* target_ptr = find_object(path);
if ( ! target_ptr ) return false;
@@ -545,7 +545,7 @@
return m_target; // or should we return the *original* path ?
}
- string path = path_in;
+ std::string path = path_in;
VM& vm = VM::get();
string_table& st = vm.getStringTable();
int swfVersion = vm.getSWFVersion();
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/as_object.cpp 15 Jan 2008 11:48:18 -0000 1.91
+++ server/as_object.cpp 18 Jan 2008 17:48:26 -0000 1.92
@@ -401,13 +401,13 @@
IF_VERBOSE_ASCODING_ERRORS(log_aserror(_(""
"Attempt to set read-only property '%s'"),
_vm.getStringTable().value(key).c_str()););
- return make_pair(true, false);
+ return std::make_pair(true, false);
}
try
{
prop->setValue(*this, val);
- return make_pair(true, true);
+ return std::make_pair(true, true);
}
catch (ActionException& exc)
{
@@ -415,10 +415,10 @@
_vm.getStringTable().value(key).c_str(),
exc.what());
}
- return make_pair(true, false);
+ return std::make_pair(true, false);
}
- return make_pair(false, false);
+ return std::make_pair(false, false);
}
Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/button_character_instance.cpp 17 Jan 2008 12:42:17 -0000
1.75
+++ server/button_character_instance.cpp 18 Jan 2008 17:48:26 -0000
1.76
@@ -760,7 +760,7 @@
as_object* ch = get_path_element_character(key);
if ( ch ) return ch;
- string name = _vm.getStringTable().value(key);
+ std::string name = _vm.getStringTable().value(key);
return getChildByName(name); // possibly NULL
}
@@ -899,7 +899,7 @@
const std::string& name = _vm.getStringTable().value(name_key);
- if (name.compare(0, 6, "_level") == 0 &&
name.find_first_not_of("0123456789", 7) == string::npos )
+ if (name.compare(0, 6, "_level") == 0 &&
name.find_first_not_of("0123456789", 7) == std::string::npos )
{
unsigned int levelno = atoi(name.c_str()+6); // getting 0 here for
"_level" is intentional
movie_instance* mo = _vm.getRoot().getLevel(levelno).get();
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/character.cpp 8 Jan 2008 11:35:02 -0000 1.72
+++ server/character.cpp 18 Jan 2008 17:48:26 -0000 1.73
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: character.cpp,v 1.72 2008/01/08 11:35:02 strk Exp $ */
+/* $Id: character.cpp,v 1.73 2008/01/18 17:48:26 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -118,7 +118,7 @@
// get_root() will handle _lockroot
return get_root();
}
- else if (name.compare(0, 6, "_level") == 0 &&
name.find_first_not_of("0123456789", 7) == string::npos )
+ else if (name.compare(0, 6, "_level") == 0 &&
name.find_first_not_of("0123456789", 7) == std::string::npos )
{
unsigned int levelno = atoi(name.c_str()+6);
return _vm.getRoot().getLevel(levelno).get();
@@ -207,7 +207,7 @@
{
double newx = fn.arg(0).to_number();
matrix m = ptr->get_matrix();
- m.set_x_translation(infinite_to_fzero(PIXELS_TO_TWIPS(newx)));
+
m.set_x_translation(std::infinite_to_fzero(PIXELS_TO_TWIPS(newx)));
ptr->set_matrix(m);
ptr->transformedByScript(); // m_accept_anim_moves = false;
}
@@ -230,7 +230,7 @@
{
double newy = fn.arg(0).to_number();
matrix m = ptr->get_matrix();
- m.set_y_translation(infinite_to_fzero(PIXELS_TO_TWIPS(newy)));
+
m.set_y_translation(std::infinite_to_fzero(PIXELS_TO_TWIPS(newy)));
ptr->set_matrix(m);
ptr->transformedByScript(); // m_accept_anim_moves = false;
}
@@ -362,7 +362,7 @@
{
// Set alpha modulate, in percent.
cxform cx = ptr->get_cxform();
- cx.m_[3][0] = infinite_to_fzero(fn.arg(0).to_number()) / 100.f;
+ cx.m_[3][0] = std::infinite_to_fzero(fn.arg(0).to_number()) /
100.f;
ptr->set_cxform(cx);
ptr->transformedByScript(); // m_accept_anim_moves = false;
}
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- server/edit_text_character.cpp 15 Jan 2008 14:17:43 -0000 1.141
+++ server/edit_text_character.cpp 18 Jan 2008 17:48:26 -0000 1.142
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.141 2008/01/15 14:17:43 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.142 2008/01/18 17:48:26 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -789,7 +789,7 @@
//else if (name == "_x")
{
matrix m = get_matrix();
- m.m_[0][2] =
infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
+ m.m_[0][2] =
std::infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
set_matrix(m);
// m_accept_anim_moves = false;
@@ -800,7 +800,7 @@
//else if (name == "_y")
{
matrix m = get_matrix();
- m.m_[1][2] =
infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
+ m.m_[1][2] =
std::infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
set_matrix(m);
// m_accept_anim_moves = false;
@@ -837,7 +837,7 @@
if ( ! _bounds.isFinite() )
{
#ifdef GNASH_DEBUG_TEXTFIELDS
- stringstream ss; ss<<_bounds;
+ std::stringstream ss; ss<<_bounds;
log_debug("Non-finite TextField bounds : %s",
ss.str().c_str());
#endif
return;
@@ -896,7 +896,7 @@
if ( ! _bounds.isFinite() )
{
#ifdef GNASH_DEBUG_TEXTFIELDS
- stringstream ss; ss<<_bounds;
+ std::stringstream ss; ss<<_bounds;
log_debug("Non-finite TextField bounds : %s",
ss.str().c_str());
#endif // GNASH_DEBUG_TEXTFIELDS
return;
@@ -935,7 +935,7 @@
// @@ TODO this should be generic to class character!
// Arg is in percent.
cxform cx = get_cxform();
- cx.m_[3][0] = fclamp(infinite_to_fzero(val.to_number()) /
100.f, 0, 1);
+ cx.m_[3][0] = fclamp(std::infinite_to_fzero(val.to_number()) /
100.f, 0, 1);
set_cxform(cx);
return;
}
@@ -1996,7 +1996,7 @@
/* public static */
edit_text_character::AutoSizeValue
-edit_text_character::parseAutoSizeValue(const string& val)
+edit_text_character::parseAutoSizeValue(const std::string& val)
{
if ( val == "left" )
{
Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/edit_text_character.h 16 Jan 2008 10:20:29 -0000 1.63
+++ server/edit_text_character.h 18 Jan 2008 17:48:26 -0000 1.64
@@ -215,7 +215,7 @@
///
/// @return an AutoSizeValue identifier. autoSizeNone if invalid
///
- static AutoSizeValue parseAutoSizeValue(const string& val);
+ static AutoSizeValue parseAutoSizeValue(const std::string& val);
/// Return autoSize value as a string
//
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/fill_style.cpp 7 Jan 2008 16:47:25 -0000 1.20
+++ server/fill_style.cpp 18 Jan 2008 17:48:26 -0000 1.21
@@ -262,7 +262,7 @@
}
else
{
- stringstream ss;
+ std::stringstream ss;
ss << "Unknown fill style type " << m_type;
//log_unimpl("Unsupported fill style type: 0x%X", m_type);
// This is a fatal error, we'll be leaving the stream
Index: server/asobj/BevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/BevelFilter_as.cpp 12 Dec 2007 10:23:45 -0000 1.6
+++ server/asobj/BevelFilter_as.cpp 18 Jan 2008 17:48:26 -0000 1.7
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: BevelFilter_as.cpp,v 1.6 2007/12/12 10:23:45 zoulunkai Exp $ */
+/* $Id: BevelFilter_as.cpp,v 1.7 2008/01/18 17:48:26 bwy Exp $ */
#include "as_object.h"
#include "BevelFilter.h"
@@ -110,7 +110,7 @@
}
}
// setter
- string type = fn.arg(0).to_string();
+ std::string type = fn.arg(0).to_string();
if (type == "outer")
ptr->m_type = BevelFilter::OUTER_BEVEL;
if (type == "inner")
Index: server/asobj/GradientBevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientBevelFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/GradientBevelFilter_as.cpp 12 Dec 2007 10:23:46 -0000
1.4
+++ server/asobj/GradientBevelFilter_as.cpp 18 Jan 2008 17:48:26 -0000
1.5
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: GradientBevelFilter_as.cpp,v 1.4 2007/12/12 10:23:46 zoulunkai Exp $ */
+/* $Id: GradientBevelFilter_as.cpp,v 1.5 2008/01/18 17:48:26 bwy Exp $ */
#include "as_object.h"
#include "GradientBevelFilter.h"
@@ -110,7 +110,7 @@
}
}
// setter
- string type = fn.arg(0).to_string();
+ std::string type = fn.arg(0).to_string();
if (type == "outer")
ptr->m_type = GradientBevelFilter::OUTER_BEVEL;
if (type == "inner")
Index: server/asobj/GradientGlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientGlowFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/GradientGlowFilter_as.cpp 12 Dec 2007 10:23:46 -0000
1.4
+++ server/asobj/GradientGlowFilter_as.cpp 18 Jan 2008 17:48:26 -0000
1.5
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: GradientGlowFilter_as.cpp,v 1.4 2007/12/12 10:23:46 zoulunkai Exp $ */
+/* $Id: GradientGlowFilter_as.cpp,v 1.5 2008/01/18 17:48:26 bwy Exp $ */
#include "as_object.h"
#include "GradientGlowFilter.h"
@@ -110,7 +110,7 @@
}
}
// setter
- string type = fn.arg(0).to_string();
+ std::string type = fn.arg(0).to_string();
if (type == "outer")
ptr->m_type = GradientGlowFilter::OUTER_GLOW;
if (type == "inner")
Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/SharedObject.cpp 12 Jan 2008 15:05:55 -0000 1.30
+++ server/asobj/SharedObject.cpp 18 Jan 2008 17:48:26 -0000 1.31
@@ -45,6 +45,8 @@
#include "URL.h"
#include "rc.h" // for use of rcfile
+using namespace std;
+
namespace {
gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/xml.h 20 Dec 2007 22:37:13 -0000 1.23
+++ server/asobj/xml.h 18 Jan 2008 17:48:26 -0000 1.24
@@ -39,8 +39,6 @@
//#define DEBUG_MEMORY_ALLOCATION 1
-using namespace std;
-
namespace gnash {
// Forward declarations
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/parser/movie_def_impl.cpp 14 Jan 2008 20:05:14 -0000 1.98
+++ server/parser/movie_def_impl.cpp 18 Jan 2008 17:48:27 -0000 1.99
@@ -142,7 +142,7 @@
//
/// Log the contents of the current tag, in hex to the output strream
-static void dump_tag_bytes(stream* in, ostream& os)
+static void dump_tag_bytes(stream* in, std::ostream& os)
{
static const int ROW_BYTES = 16;
char row_buf[ROW_BYTES];
@@ -150,7 +150,7 @@
row_buf[ROW_BYTES-1] = '\0';
- os << endl;
+ os << std::endl;
while(in->get_position() < in->get_tag_end_position())
{
int c = in->read_u8();
@@ -162,7 +162,7 @@
row_count++;
if (row_count >= ROW_BYTES)
{
- os << row_buf << endl;
+ os << row_buf << std::endl;
row_count = 0;
}
}
@@ -170,7 +170,7 @@
{
row_buf[row_count] = '\0';
while (row_count++ < ROW_BYTES ) os << " ";
- os << row_buf << endl;
+ os << row_buf << std::endl;
}
}
@@ -339,7 +339,7 @@
void movie_def_impl::add_font(int font_id, font* f)
{
assert(f);
- m_fonts.insert(make_pair(font_id, boost::intrusive_ptr<font>(f)));
+ m_fonts.insert(std::make_pair(font_id, boost::intrusive_ptr<font>(f)));
}
font* movie_def_impl::get_font(int font_id) const
@@ -374,7 +374,7 @@
assert(ch);
//log_msg(_("Add bitmap character %d"), character_id);
//m_bitmap_characters.add(character_id, ch);
- m_bitmap_characters.insert(make_pair(character_id,
boost::intrusive_ptr<bitmap_character_def>(ch)));
+ m_bitmap_characters.insert(std::make_pair(character_id,
boost::intrusive_ptr<bitmap_character_def>(ch)));
// we can *NOT* generate bitmap_info until
// a renderer is present
@@ -401,7 +401,7 @@
log_parse(_("Add sound sample %d assigning id %d"),
character_id, sam->m_sound_handler_id);
);
- m_sound_samples.insert(make_pair(character_id,
+ m_sound_samples.insert(std::make_pair(character_id,
boost::intrusive_ptr<sound_sample>(sam)));
}
@@ -785,7 +785,7 @@
log_error(_("*** no tag loader for type %d (movie)"),
tag_type);
IF_VERBOSE_PARSE(
- stringstream ss;
+ std::stringstream ss;
dump_tag_bytes(&str, ss);
log_error("tag dump follows: %s",
ss.str().c_str());
);
Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/vm/ActionExec.cpp 12 Jan 2008 15:05:56 -0000 1.62
+++ server/vm/ActionExec.cpp 18 Jan 2008 17:48:27 -0000 1.63
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.62 2008/01/12 15:05:56 bwy Exp $ */
+/* $Id: ActionExec.cpp,v 1.63 2008/01/18 17:48:27 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -705,7 +705,7 @@
}
void
-ActionExec::dumpActions(size_t from, size_t to, ostream& os)
+ActionExec::dumpActions(size_t from, size_t to, std::ostream& os)
{
size_t lpc = from;
while (lpc < to)
Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/vm/ExecutableCode.h 30 Nov 2007 09:59:04 -0000 1.11
+++ server/vm/ExecutableCode.h 18 Jan 2008 17:48:27 -0000 1.12
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: ExecutableCode.h,v 1.11 2007/11/30 09:59:04 zoulunkai Exp $ */
+/* $Id: ExecutableCode.h,v 1.12 2008/01/18 17:48:27 bwy Exp $ */
#ifndef GNASH_EXECUTABLECODE_H
#define GNASH_EXECUTABLECODE_H
@@ -106,7 +106,7 @@
public:
- typedef vector<const action_buffer*> BufferList;
+ typedef std::vector<const action_buffer*> BufferList;
EventCode(boost::intrusive_ptr<character> nTarget)
:
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- libbase/rc.cpp 18 Jan 2008 12:19:47 -0000 1.54
+++ libbase/rc.cpp 18 Jan 2008 17:48:27 -0000 1.55
@@ -1,6 +1,6 @@
// rc.cpp: "Run Command" configuration file, for Gnash.
//
-// Copyright (C) 2005, 2006, 2007, 208 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
//
// 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
@@ -43,13 +43,13 @@
#include <iostream>
#include <fstream>
-
#ifndef DEFAULT_STREAMS_TIMEOUT
// TODO: add a ./configure switch to set this
# define DEFAULT_STREAMS_TIMEOUT 10
#endif
-using namespace std;
+using std::endl;
+
namespace gnash {
RcInitFile&
@@ -122,7 +122,7 @@
// GNASH_REPORT_FUNCTION;
// Check the default system location
- string loadfile = "/etc/gnashrc";
+ std::string loadfile = "/etc/gnashrc";
parseFile(loadfile);
// Check the default config location
@@ -171,8 +171,8 @@
}
uint32_t
-RcInitFile::extractNumber(uint32_t *num, const char *pattern, string &variable,
- string &value)
+RcInitFile::extractNumber(uint32_t *num, const char *pattern, std::string
&variable,
+ std::string &value)
{
// GNASH_REPORT_FUNCTION;
@@ -199,8 +199,8 @@
/// appended ('append <list> <items>').
void
-RcInitFile::parseList(PathList &list, string &action,
- std::string &listname, string &items)
+RcInitFile::parseList(PathList &list, std::string &action,
+ std::string &listname, std::string &items)
{
// GNASH_REPORT_FUNCTION;
@@ -220,7 +220,7 @@
}
}
- string::size_type pos;
+ std::string::size_type pos;
// This is an ugly way to avoid breaking lists
// Lists will work if they worked before, but
@@ -228,7 +228,7 @@
// The colon way must be removed before protocols
// (http://, https:// can be included in lists).
char separator;
- if (items.find(':') != string::npos) {
+ if (items.find(':') != std::string::npos) {
// Deprecated behaviour
separator = ':';
fprintf(stderr, _("The list '%s' in an rcfile contains a colon. This is
deprecated and may result in "
@@ -248,8 +248,8 @@
}
void
-RcInitFile::extractDouble(double& out, const char *pattern, string &variable,
- string &value)
+RcInitFile::extractDouble(double& out, const char *pattern, std::string
&variable,
+ std::string &value)
{
// GNASH_REPORT_FUNCTION;
@@ -302,10 +302,10 @@
//Initial "~" is not followed by "/"
else {
const char *userhome = NULL;
- string::size_type first_slash =
+ std::string::size_type first_slash =
path.find_first_of("/");
- string user;
- if (first_slash != string::npos) {
+ std::string user;
+ if (first_slash != std::string::npos) {
// everything between initial ~ and /
user = path.substr(1, first_slash - 1 );
} else user = path.substr(1);
@@ -317,7 +317,7 @@
userhome = password->pw_dir;
}
if (userhome) {
- string foundhome(userhome);
+ std::string foundhome(userhome);
path = path.replace(0,first_slash,foundhome);
}
# endif
@@ -343,10 +343,10 @@
{
// GNASH_REPORT_FUNCTION;
struct stat stats;
- string action;
- string variable;
- string value;
- ifstream in;
+ std::string action;
+ std::string variable;
+ std::string value;
+ std::ifstream in;
StringNoCaseEqual noCaseCompare;
@@ -547,7 +547,7 @@
return false;
}
- ofstream out;
+ std::ofstream out;
out.open(filespec.c_str());
@@ -559,7 +559,7 @@
std::string cmd = "set ";
// Bools and numbers. We want boolean values written as words.
- out << boolalpha <<
+ out << std::boolalpha <<
_("# Generated by Gnash. Manual changes to this file may be overridden.")
<< endl <<
cmd << "splash_screen " << _splashScreen << endl <<
cmd << "localHost " << _localhostOnly << endl <<
@@ -727,49 +727,49 @@
void
RcInitFile::dump()
{
- cerr << endl << "Dump RcInitFile:" << endl;
- cerr << "\tTimer interupt delay value: " << _delay << endl;
- cerr << "\tFlash debugger: "
+ std::cerr << endl << "Dump RcInitFile:" << endl;
+ std::cerr << "\tTimer interupt delay value: " << _delay << endl;
+ std::cerr << "\tFlash debugger: "
<< ((_debugger)?"enabled":"disabled") << endl;
- cerr << "\tVerbosity Level: " << _verbosity << endl;
- cerr << "\tDump ActionScript processing: "
+ std::cerr << "\tVerbosity Level: " << _verbosity << endl;
+ std::cerr << "\tDump ActionScript processing: "
<< ((_actionDump)?"enabled":"disabled") << endl;
- cerr << "\tDump parser info: "
+ std::cerr << "\tDump parser info: "
<< ((_parserDump)?"enabled":"disabled") << endl;
- cerr << "\tActionScript coding errors verbosity: "
+ std::cerr << "\tActionScript coding errors verbosity: "
<< ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
- cerr << "\tMalformed SWF verbosity: "
+ std::cerr << "\tMalformed SWF verbosity: "
<< ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
- cerr << "\tUse Splash Screen: "
+ std::cerr << "\tUse Splash Screen: "
<< ((_splashScreen)?"enabled":"disabled") << endl;
- cerr << "\tUse Local Domain Only: "
+ std::cerr << "\tUse Local Domain Only: "
<< ((_localdomainOnly)?"enabled":"disabled") << endl;
- cerr << "\tUse Localhost Only: "
+ std::cerr << "\tUse Localhost Only: "
<< ((_localhostOnly)?"enabled":"disabled") << endl;
- cerr << "\tWrite Debug Log To Disk: "
+ std::cerr << "\tWrite Debug Log To Disk: "
<< ((_writeLog)?"enabled":"disabled") << endl;
- cerr << "\tAllow insecure SSL connections: "
+ std::cerr << "\tAllow insecure SSL connections: "
<< ((_insecureSSL)?"yes":"no") << endl;
- cerr << "\tEnable sound: "
+ std::cerr << "\tEnable sound: "
<< ((_sound)?"enabled":"disabled") << endl;
- cerr << "\tEnable Plugin sound: "
+ std::cerr << "\tEnable Plugin sound: "
<< ((_pluginSound)?"enabled":"disabled") << endl;
- cerr << "\tEnable Extensions: "
+ std::cerr << "\tEnable Extensions: "
<< ((_extensionsEnabled)?"enabled":"disabled") << endl;
if (_log.size()) {
- cerr << "\tDebug Log name is: " << _log << endl;
+ std::cerr << "\tDebug Log name is: " << _log << endl;
}
if (_flashVersionString.size()) {
- cerr << "\tFlash Version String is: " << _flashVersionString << endl;
+ std::cerr << "\tFlash Version String is: " << _flashVersionString <<
endl;
}
- cerr << "\tWhitelist: ";
- writeList (_whitelist, cerr);
+ std::cerr << "\tWhitelist: ";
+ writeList (_whitelist, std::cerr);
- cerr << "\tBlacklist: ";
- writeList (_blacklist, cerr);
+ std::cerr << "\tBlacklist: ";
+ writeList (_blacklist, std::cerr);
- cerr << "\tSandbox: ";
- writeList (_localSandboxPath, cerr);
+ std::cerr << "\tSandbox: ";
+ writeList (_localSandboxPath, std::cerr);
}
Index: libgeometry/Point2d.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Point2d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libgeometry/Point2d.h 20 Nov 2007 17:17:10 -0000 1.3
+++ libgeometry/Point2d.h 18 Jan 2008 17:48:27 -0000 1.4
@@ -21,7 +21,7 @@
//
-/* $Id: Point2d.h,v 1.3 2007/11/20 17:17:10 bjacques Exp $ */
+/* $Id: Point2d.h,v 1.4 2008/01/18 17:48:27 bwy Exp $ */
#ifndef GNASH_POINT2DH
#define GNASH_POINT2DH
@@ -37,8 +37,6 @@
#include <iostream> // temporary include for debugging
#include <cmath> // for floor / ceil
-using namespace std;
-
namespace gnash {
namespace geometry {
Index: libgeometry/Range2d.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Range2d.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libgeometry/Range2d.h 6 Nov 2007 15:43:41 -0000 1.18
+++ libgeometry/Range2d.h 18 Jan 2008 17:48:27 -0000 1.19
@@ -20,7 +20,7 @@
//
-/* $Id: Range2d.h,v 1.18 2007/11/06 15:43:41 udog Exp $ */
+/* $Id: Range2d.h,v 1.19 2008/01/18 17:48:27 bwy Exp $ */
#ifndef GNASH_RANGE2D_H
#define GNASH_RANGE2D_H
@@ -36,8 +36,6 @@
#include <iostream> // temporary include for debugging
#include <cmath> // for floor / ceil
-using namespace std;
-
namespace gnash {
namespace geometry {
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
