[Gnash-commit] /srv/bzr/gnash/trunk r10831: Use permitted header guard and forward declaration.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10831
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2009-04-24 10:02:41 +0200
message:
  Use permitted header guard and forward declaration.
modified:
  gui/gtk_canvas.cpp
  gui/gtk_canvas.h

=== modified file 'gui/gtk_canvas.cpp'
--- a/gui/gtk_canvas.cpp        2009-04-23 18:14:24 +0000
+++ b/gui/gtk_canvas.cpp        2009-04-24 08:02:41 +0000
@@ -42,8 +42,6 @@
 #endif // HAVE_XV
 #endif
 
-using namespace gnash;
-
 struct _GnashCanvas {
        GtkDrawingArea base_instance;
 
@@ -63,7 +61,7 @@
 static void gnash_canvas_realize(GtkWidget *widget);
 
 GtkWidget *
-gnash_canvas_new (void)
+gnash_canvas_new ()
 {
     GNASH_REPORT_FUNCTION;
     return GTK_WIDGET(g_object_new (GNASH_TYPE_CANVAS, NULL));
@@ -189,6 +187,7 @@
 void
 gnash_canvas_setup(GnashCanvas *canvas, int argc, char **argv[])
 {
+
     GNASH_REPORT_FUNCTION;
     // TODO: don't rely on a macro to select renderer
 #ifdef RENDERER_CAIRO
@@ -198,7 +197,7 @@
 #elif defined(RENDERER_AGG) && !defined(HAVE_XV)
     canvas->glue.reset(new gnash::GtkAggGlue);
 #elif defined(RENDERER_AGG) && defined(HAVE_XV)
-    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+    gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
 
     if (rcfile.useXv()) {
         canvas->glue.reset(new gnash::GtkAggXvGlue);

=== modified file 'gui/gtk_canvas.h'
--- a/gui/gtk_canvas.h  2009-04-22 16:37:31 +0000
+++ b/gui/gtk_canvas.h  2009-04-24 08:02:41 +0000
@@ -17,11 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#ifndef __GNASH_CANVAS_H__
-#define __GNASH_CANVAS_H__
+#ifndef GNASH_GTK_CANVAS_H
+#define GNASH_GTK_CANVAS_H
 
 #include <gtk/gtkdrawingarea.h>
-#include "render_handler.h"
+
+// Forward declarations.
+namespace gnash {
+    class render_handler;
+}
 
 G_BEGIN_DECLS
 
@@ -39,8 +43,8 @@
     GtkDrawingAreaClass base_class;
 };
 
-GType            gnash_canvas_get_type              (void);
-GtkWidget       *gnash_canvas_new                   (void);
+GType            gnash_canvas_get_type              ();
+GtkWidget       *gnash_canvas_new                   ();
 
 void             gnash_canvas_setup                 (GnashCanvas *canvas, int 
argc, char **argv[]);
 void             gnash_canvas_before_rendering      (GnashCanvas *canvas);