[Gnash-commit] /srv/bzr/gnash/trunk r10402: quality std classes, fixing build on debian lenny

[Sandro Santilli]

------------------------------------------------------------
revno: 10402
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Tue 2008-12-09 18:47:55 +0100
message:
  quality std classes, fixing build on debian lenny
modified:
  plugin/plugin.cpp

=== modified file 'plugin/plugin.cpp'
--- a/plugin/plugin.cpp 2008-12-08 19:48:59 +0000
+++ b/plugin/plugin.cpp 2008-12-09 17:47:55 +0000
@@ -425,7 +425,7 @@
 {
     for (size_t i=0, n=data->argc; i<n; ++i)
     {
-        string name, val;
+        std::string name, val;
 
         if (data->argn[i])
         {
@@ -623,7 +623,7 @@
 
 #ifdef WRITE_FILE
     size_t start, end;
-    string fname;
+    std::string fname;
     end   = _swf_url.find(".swf", 0) + 4;
     start = _swf_url.rfind("/", end) + 1;
     fname = "/tmp/";
@@ -1141,7 +1141,7 @@
 void
 nsPluginInstance::startProc(Window win)
 {
-    string procname;
+    std::string procname;
     char *gnash_env = std::getenv("GNASH_PLAYER");
 #ifdef GNASH_XPI_PLUGIN
     if (getHome(procname) >= 0)
@@ -1215,16 +1215,16 @@
     snprintf(hostfd, buf_size, "%d", c2p_pipe[1]);
 
     // Prepare Actionscript variables (e.g. Flashvars).
-    vector<string> paramvalues;
+    std::vector<std::string> paramvalues;
     paramvalues.reserve(_params.size());
 
-    for (map<string,string>::const_iterator it = _params.begin(),
+    for (std::map<std::string,std::string>::const_iterator it = 
_params.begin(),
         itEnd = _params.end(); it != itEnd; ++it) {
-        const string& nam = it->first; 
-        const string& val = it->second;
+        const std::string& nam = it->first; 
+        const std::string& val = it->second;
 
-        string param = nam;
-        param += string("=");
+        std::string param = nam;
+        param += std::string("=");
         param += val;
         paramvalues.push_back(param);
     }
@@ -1242,7 +1242,7 @@
     const char **argv = new const char *[maxargc];
 
 #ifdef CREATE_STANDALONE_GNASH_LAUNCHER
-    ofstream saLauncher;
+    std::ofstream saLauncher;
 
     if ( createSaLauncher )
     {
@@ -1250,7 +1250,7 @@
         static int debugno = 0;
         debugno = (debugno + 1) % 10;
         ss << "/tmp/gnash-debug-" << debugno << ".sh";
-        saLauncher.open(ss.str().c_str(), ios::out | ios::trunc);
+        saLauncher.open(ss.str().c_str(), std::ios::out | std::ios::trunc);
     }
 
     if ( saLauncher )