galeon r8932 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Jan 12 19:19:31 2008
New Revision: 8932
URL: http://svn.gnome.org/viewvc/galeon?rev=8932&view=rev

Log:
2008-01-12  Philip Langdale  <philipl alumni utexas net>

	* mozilla/GaleonWrapper.cpp
	* mozilla/mozilla-embed.cpp
	* mozilla/EphyPromptService.cpp: Use raw c++ static_cast
	instead of NS_STATIC_CAST as the macro has been removed
	on trunk. We don't care about any compiler that doesn't
	understand static_cast.



Modified:
   trunk/ChangeLog
   trunk/mozilla/EphyPromptService.cpp
   trunk/mozilla/GaleonWrapper.cpp
   trunk/mozilla/mozilla-embed.cpp

Modified: trunk/mozilla/EphyPromptService.cpp
==============================================================================
--- trunk/mozilla/EphyPromptService.cpp	(original)
+++ trunk/mozilla/EphyPromptService.cpp	Sat Jan 12 19:19:31 2008
@@ -521,7 +521,7 @@
 DeletePrompter (gpointer aPromptPtr,
 	        GObject *aZombie)
 {
-	Prompter *prompt = NS_STATIC_CAST (Prompter*, aPromptPtr);
+	Prompter *prompt = static_cast<Prompter*>(aPromptPtr);
 
 	delete prompt;
 }
@@ -535,7 +535,7 @@
 			  G_CALLBACK (gtk_widget_destroy), NULL);
 	g_object_weak_ref (G_OBJECT (mDialog),
 			   (GWeakNotify) DeletePrompter,
-			   NS_STATIC_CAST (gpointer, this));
+			   static_cast<gpointer>(this));
 
 	gtk_widget_show (GTK_WIDGET (mDialog));
 }

Modified: trunk/mozilla/GaleonWrapper.cpp
==============================================================================
--- trunk/mozilla/GaleonWrapper.cpp	(original)
+++ trunk/mozilla/GaleonWrapper.cpp	Sat Jan 12 19:19:31 2008
@@ -1238,7 +1238,7 @@
 	doc->GetLastModified(value);
 	nsTime last_modified (GulCString(value).get(), PR_TRUE);
 	LL_DIV (props->modification_time,
-		NS_STATIC_CAST(PRTime, last_modified), PR_USEC_PER_SEC);
+		static_cast<PRTime>(last_modified), PR_USEC_PER_SEC);
 
 	doc->GetContentType(value);
 	props->content_type = g_strdup (GulCString(value).get());

Modified: trunk/mozilla/mozilla-embed.cpp
==============================================================================
--- trunk/mozilla/mozilla-embed.cpp	(original)
+++ trunk/mozilla/mozilla-embed.cpp	Sat Jan 12 19:19:31 2008
@@ -1808,7 +1808,7 @@
 {
 	if (!sheet) return;
 
-	MozillaEmbedStyleSheet *mess = NS_STATIC_CAST(MozillaEmbedStyleSheet*, sheet);
+	MozillaEmbedStyleSheet *mess = static_cast<MozillaEmbedStyleSheet*>(sheet);
 	g_return_if_fail(mess != NULL);
 
         GaleonWrapper *wrapper = MOZILLA_EMBED(embed)->priv->wrapper;
@@ -1828,7 +1828,7 @@
 void
 galeon_embed_stylesheet_free (EmbedStyleSheet *sheet)
 {
-	MozillaEmbedStyleSheet *mess = NS_STATIC_CAST(MozillaEmbedStyleSheet*, sheet);
+	MozillaEmbedStyleSheet *mess = static_cast<MozillaEmbedStyleSheet*>(sheet);
 
 	if (mess)
 	{