[Gnash-commit] gnash ChangeLog gui/gnash.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/27 17:20:31

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
                * gui/gnash.cpp: use boost format for formatting, drop last use
                  of printf among all the couts and cerrs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6420&r2=1.6421
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.113&r2=1.114

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6420
retrieving revision 1.6421
diff -u -b -r1.6420 -r1.6421
--- ChangeLog   27 Apr 2008 16:26:42 -0000      1.6420
+++ ChangeLog   27 Apr 2008 17:20:30 -0000      1.6421
@@ -1,3 +1,8 @@
+2008-04-27 Benjamin Wolsey <address@hidden>
+
+       * gui/gnash.cpp: use boost format for formatting, drop last use
+         of printf among all the couts and cerrs.
+
 2008-04-27 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/TextField.as: add test showing a scary

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- gui/gnash.cpp       19 Mar 2008 12:04:23 -0000      1.113
+++ gui/gnash.cpp       27 Apr 2008 17:20:30 -0000      1.114
@@ -55,6 +55,8 @@
 # define gnash_main main
 #endif
 
+#include <boost/format.hpp> // For i18n-friendly cerr
+
 using namespace gnash; // for log_*
 
 using std::cerr;
@@ -281,7 +283,7 @@
                     int fd = parser.argument<long>(i);
                     if ( fd < 1 )
                     {
-                           printf(_("Invalid host communication filedescriptor 
%d\n"), fd);
+                           cerr << boost::format(_("Invalid host communication 
filedescriptor %d\n")) % fd << endl;
                            exit(EXIT_FAILURE);
                     }
                     player.setHostFD ( fd );
@@ -293,15 +295,15 @@
                     log_debug (_("Setting width to " SIZET_FMT), 
player.getWidth());
                     break;
                 case 'g':
-    #ifdef USE_DEBUGGER
+#ifdef USE_DEBUGGER
                     log_debug (_("Setting debugger ON"));
                     debugger.enabled(true);
     //              debugger.startServer(&debugger);
                     debugger.console();
-    #else
+#else
                     log_error (_("No debugger; disabled at compile time, -g is 
invalid"));
                     exit(EXIT_FAILURE);
-    #endif
+#endif
                     break;
                 case 'k':
                     heightGiven = true;
@@ -348,12 +350,12 @@
                     player.setExitTimeout(parser.argument<float>(i));
                     break;
                 case 'f':
-    #ifdef GNASH_FPS_DEBUG
+#ifdef GNASH_FPS_DEBUG
                        player.setFpsPrintTime(parser.argument<float>(i));
-    #else
+#else
                        cout << _("FPS debugging disabled at compile time, -f 
is invalid") << endl;
                        exit(EXIT_FAILURE);
-    #endif // ndef GNASH_FPS_DEBUG
+#endif // ndef GNASH_FPS_DEBUG
                        break;
                 case 'P':
                 {
@@ -424,7 +426,7 @@
        }
        catch (...)
        {
-               cerr << "Exception thrown during parseCommandLine" << endl;
+               cerr << _("Exception thrown during parseCommandLine") << endl;
                exit(EXIT_FAILURE);
        }