aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-07-15 18:19:27 +0800
committerChristian Persch <chpe@src.gnome.org>2007-07-15 18:19:27 +0800
commit897c314dffc4a71d0fba525a7a70039c75f6851d (patch)
treeb067d87b98da3c9d35a27e6590a8641a1224593f /embed
parent843c8e008f30143d928aef1fc41f6fa6499c277c (diff)
downloadgsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar.gz
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar.bz2
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar.lz
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar.xz
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.tar.zst
gsoc2013-epiphany-897c314dffc4a71d0fba525a7a70039c75f6851d.zip
Use C++ casts. Script from bmo#348748.
2007-07-15 Christian Persch <chpe@gnome.org> * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphyHistoryListener.cpp: * embed/mozilla/EphyPromptService.cpp: * embed/mozilla/GeckoFormSigningDialog.cpp: * embed/mozilla/GeckoPrintService.cpp: * embed/mozilla/GeckoPrintSession.cpp: * embed/mozilla/mozilla-embed-event.cpp: * embed/mozilla/mozilla-embed.cpp: * plugins/desktop-file/plugin.cpp: Use C++ casts. Script from bmo#348748. svn path=/trunk/; revision=7166
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp2
-rw-r--r--embed/mozilla/EphyHistoryListener.cpp2
-rw-r--r--embed/mozilla/EphyPromptService.cpp4
-rw-r--r--embed/mozilla/GeckoFormSigningDialog.cpp2
-rw-r--r--embed/mozilla/GeckoPrintService.cpp2
-rw-r--r--embed/mozilla/GeckoPrintSession.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 1fd2ca02e..9ea302360 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -483,7 +483,7 @@ EphyContextMenuListener::ContextMenu (nsIDOMEvent* aDOMEvent)
NS_ENSURE_TRUE (mouseEvent, NS_ERROR_FAILURE);
MozillaEmbedEvent *info;
- info = mozilla_embed_event_new (NS_STATIC_CAST (gpointer, aDOMEvent));
+ info = mozilla_embed_event_new (static_cast<gpointer>(aDOMEvent));
nsresult rv;
EventContext context;
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 66c19a8a5..6ef9318de 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -233,7 +233,7 @@ EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result)
EphyBadCertRejector *badCertRejector = new EphyBadCertRejector ();
if (!badCertRejector) return NS_ERROR_OUT_OF_MEMORY;
- *result = NS_STATIC_CAST(nsIBadCertListener*, badCertRejector);
+ *result = static_cast<nsIBadCertListener*>(badCertRejector);
NS_ADDREF (badCertRejector);
return NS_OK;
diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp
index f926bd003..232c3ccb9 100644
--- a/embed/mozilla/EphyHistoryListener.cpp
+++ b/embed/mozilla/EphyHistoryListener.cpp
@@ -63,7 +63,7 @@ EphyHistoryListener::Init (EphyHistory *aHistory)
NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && webProgress, rv);
rv = webProgress->AddProgressListener
- (NS_STATIC_CAST(nsIWebProgressListener*,this),
+ (static_cast<nsIWebProgressListener*>(this),
nsIWebProgress::NOTIFY_STATE_REQUEST);
return rv;
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 72c1931ce..29813f300 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -514,7 +514,7 @@ static void
DeletePrompter (gpointer aPromptPtr,
GObject *aZombie)
{
- Prompter *prompt = NS_STATIC_CAST (Prompter*, aPromptPtr);
+ Prompter *prompt = static_cast<Prompter*>(aPromptPtr);
delete prompt;
}
@@ -531,7 +531,7 @@ Prompter::Show ()
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));
}
diff --git a/embed/mozilla/GeckoFormSigningDialog.cpp b/embed/mozilla/GeckoFormSigningDialog.cpp
index 572de8aa2..309b3c11e 100644
--- a/embed/mozilla/GeckoFormSigningDialog.cpp
+++ b/embed/mozilla/GeckoFormSigningDialog.cpp
@@ -45,7 +45,7 @@
#include "GeckoFormSigningDialog.h"
-#define LITERAL(s) NS_REINTERPRET_CAST(const nsAString::char_type*, NS_L(s))
+#define LITERAL(s) reinterpret_cast<const nsAString::char_type*>(NS_L(s))
NS_IMPL_ISUPPORTS1 (GeckoFormSigningDialog,
nsIFormSigningDialog)
diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp
index 481360ff8..8be8263b9 100644
--- a/embed/mozilla/GeckoPrintService.cpp
+++ b/embed/mozilla/GeckoPrintService.cpp
@@ -63,7 +63,7 @@
#define CONF_PRINT_PAGE_TITLE "/apps/epiphany/dialogs/print_page_title"
#define CONF_PRINT_PAGE_URL "/apps/epiphany/dialogs/print_page_url"
-#define LITERAL(s) NS_REINTERPRET_CAST(const nsAString::char_type*, NS_L(s))
+#define LITERAL(s) reinterpret_cast<const nsAString::char_type*>(NS_L(s))
/* From nsIDeviceContext.h */
#define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index edfd64d9c..ddf968283 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -161,7 +161,7 @@ GeckoPrintSession::FromSettings (nsIPrintSettings *aSettings)
/* this is ok since the caller holds a ref to the settings which hold a ref to the session */
nsIPrintSession *sessionPtr = session.get();
- return NS_STATIC_CAST (GeckoPrintSession*, sessionPtr);
+ return static_cast<GeckoPrintSession*>(sessionPtr);
}
/* static functions */
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index 6eae1a7d7..9b5b06d85 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -159,7 +159,7 @@ impl_has_property (EphyEmbedEvent *event,
static gpointer
impl_get_dom_event (EphyEmbedEvent *event)
{
- return NS_STATIC_CAST (gpointer, ((MozillaEmbedEvent *) event)->priv->dom_event);
+ return static_cast<gpointer>(((MozillaEmbedEvent *) event)->priv->dom_event);
}
static void
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 15622c973..3fadccc38 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -975,7 +975,7 @@ mozilla_embed_emit_mouse_signal (MozillaEmbed *embed,
nsCOMPtr<nsIDOMEvent> dev = do_QueryInterface (ev);
NS_ENSURE_TRUE (dev, FALSE);
- info = mozilla_embed_event_new (NS_STATIC_CAST (gpointer, dev));
+ info = mozilla_embed_event_new (static_cast<gpointer>(dev));
event_context.Init (mpriv->browser);
rv = event_context.GetMouseEventInfo (ev, MOZILLA_EMBED_EVENT (info));