From ba10b4ea6fbe8b701e1720584e10700050b291f1 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 24 Nov 2003 18:01:47 +0000 Subject: Get rid of NS_INIT_ISUPPORTS() macros in constructors; it's not been 2003-11-24 Christian Persch * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphyEventListener.cpp: * embed/mozilla/ExternalProtocolHandlers.cpp: * embed/mozilla/ExternalProtocolHandlers.h: * embed/mozilla/ExternalProtocolService.cpp: * embed/mozilla/FilePicker.cpp: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/PrintingPromptService.cpp: * embed/mozilla/mozilla-notifiers.cpp: Get rid of NS_INIT_ISUPPORTS() macros in constructors; it's not been needed since mozilla 1.3. --- ChangeLog | 15 +++++++++++++++ embed/mozilla/ContentHandler.cpp | 3 --- embed/mozilla/EphyEventListener.cpp | 1 - embed/mozilla/ExternalProtocolHandlers.cpp | 6 ------ embed/mozilla/ExternalProtocolHandlers.h | 17 ++++++----------- embed/mozilla/ExternalProtocolService.cpp | 3 --- embed/mozilla/FilePicker.cpp | 2 -- embed/mozilla/GlobalHistory.cpp | 2 -- embed/mozilla/PrintingPromptService.cpp | 3 --- embed/mozilla/mozilla-notifiers.cpp | 2 +- 10 files changed, 22 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e47818ef..bf5b6a7ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-11-24 Christian Persch + + * embed/mozilla/ContentHandler.cpp: + * embed/mozilla/EphyEventListener.cpp: + * embed/mozilla/ExternalProtocolHandlers.cpp: + * embed/mozilla/ExternalProtocolHandlers.h: + * embed/mozilla/ExternalProtocolService.cpp: + * embed/mozilla/FilePicker.cpp: + * embed/mozilla/GlobalHistory.cpp: + * embed/mozilla/PrintingPromptService.cpp: + * embed/mozilla/mozilla-notifiers.cpp: + + Get rid of NS_INIT_ISUPPORTS() macros in constructors; + it's not been needed since mozilla 1.3. + 2003-11-24 Marco Pesenti Gritti * embed/mozilla/MozRegisterComponents.cpp: diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index dc4382943..7286ba3ff 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -48,13 +48,10 @@ NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog) GContentHandler::GContentHandler() : mUri(nsnull), mMimeType(nsnull) { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ } GContentHandler::~GContentHandler() { - /* destructor code */ g_free (mUri); g_free (mMimeType); } diff --git a/embed/mozilla/EphyEventListener.cpp b/embed/mozilla/EphyEventListener.cpp index d2fb70864..aab2988fe 100644 --- a/embed/mozilla/EphyEventListener.cpp +++ b/embed/mozilla/EphyEventListener.cpp @@ -35,7 +35,6 @@ EphyEventListener::EphyEventListener(void) { - NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/embed/mozilla/ExternalProtocolHandlers.cpp b/embed/mozilla/ExternalProtocolHandlers.cpp index 10b4283c8..f5dfa3264 100644 --- a/embed/mozilla/ExternalProtocolHandlers.cpp +++ b/embed/mozilla/ExternalProtocolHandlers.cpp @@ -41,14 +41,11 @@ NS_IMPL_ISUPPORTS1 (GBaseProtocolHandler, nsIProtocolHandler) GBaseProtocolHandler::GBaseProtocolHandler(const char *aScheme) { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ mScheme.Assign(aScheme); } GBaseProtocolHandler::~GBaseProtocolHandler() { - /* destructor code */ } /* readonly attribute string scheme; */ @@ -121,14 +118,11 @@ NS_IMPL_ISUPPORTS2 (GBaseProtocolContentHandler, nsIProtocolHandler, nsIContentH GBaseProtocolContentHandler::GBaseProtocolContentHandler(const char *aScheme) : GBaseProtocolHandler(aScheme) { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ mMimeType = NS_LITERAL_CSTRING("application-x-gnome-") + mScheme; } GBaseProtocolContentHandler::~GBaseProtocolContentHandler() { - /* destructor code */ } /* nsIChannel newChannel (in nsIURI aURI); */ diff --git a/embed/mozilla/ExternalProtocolHandlers.h b/embed/mozilla/ExternalProtocolHandlers.h index 7ff6e275b..027556d5e 100644 --- a/embed/mozilla/ExternalProtocolHandlers.h +++ b/embed/mozilla/ExternalProtocolHandlers.h @@ -44,7 +44,6 @@ class GBaseProtocolHandler : public nsIProtocolHandler GBaseProtocolHandler (const char *aScheme); virtual ~GBaseProtocolHandler(); - /* additional members */ protected: nsCString mScheme; }; @@ -60,7 +59,6 @@ class GBaseProtocolContentHandler : public GBaseProtocolHandler, GBaseProtocolContentHandler (const char *aScheme); virtual ~GBaseProtocolContentHandler(); - /* additional members */ protected: nsCString mMimeType; }; @@ -82,8 +80,8 @@ class GIRCProtocolHandler : public GBaseProtocolContentHandler { public: NS_DECL_ISUPPORTS - GIRCProtocolHandler() : GBaseProtocolContentHandler("irc") - {NS_INIT_ISUPPORTS();}; + + GIRCProtocolHandler() : GBaseProtocolContentHandler("irc") {}; virtual ~GIRCProtocolHandler() {}; }; @@ -104,10 +102,8 @@ class GFtpProtocolHandler : public GBaseProtocolContentHandler { public: NS_DECL_ISUPPORTS - GFtpProtocolHandler() : GBaseProtocolContentHandler("ftp") - {NS_INIT_ISUPPORTS();}; + GFtpProtocolHandler() : GBaseProtocolContentHandler("ftp") {}; virtual ~GFtpProtocolHandler() {}; - /* additional members */ }; #define G_MAILTO_PROTOCOL_CID \ @@ -127,8 +123,7 @@ class GMailtoProtocolHandler : public GBaseProtocolContentHandler { public: NS_DECL_ISUPPORTS - GMailtoProtocolHandler() : GBaseProtocolContentHandler("mailto") - {NS_INIT_ISUPPORTS();}; + GMailtoProtocolHandler() : GBaseProtocolContentHandler("mailto") {}; virtual ~GMailtoProtocolHandler() {}; private: }; @@ -150,8 +145,8 @@ class GNewsProtocolHandler : public GBaseProtocolContentHandler { public: NS_DECL_ISUPPORTS - GNewsProtocolHandler() : GBaseProtocolContentHandler("news") - {NS_INIT_ISUPPORTS();}; + + GNewsProtocolHandler() : GBaseProtocolContentHandler("news") {}; virtual ~GNewsProtocolHandler() {}; private: }; diff --git a/embed/mozilla/ExternalProtocolService.cpp b/embed/mozilla/ExternalProtocolService.cpp index 1f804d2f4..a8a9ce949 100644 --- a/embed/mozilla/ExternalProtocolService.cpp +++ b/embed/mozilla/ExternalProtocolService.cpp @@ -45,13 +45,10 @@ NS_IMPL_ISUPPORTS1(GExternalProtocolService, nsIExternalProtocolService) GExternalProtocolService::GExternalProtocolService() { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ } GExternalProtocolService::~GExternalProtocolService() { - /* destructor code */ } /* boolean externalProtocolHandlerExists (in string aProtocolScheme); */ diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp index ab2044257..4dd0340b8 100644 --- a/embed/mozilla/FilePicker.cpp +++ b/embed/mozilla/FilePicker.cpp @@ -63,8 +63,6 @@ NS_IMPL_ISUPPORTS1(GFilePicker, nsIFilePicker) GFilePicker::GFilePicker() { - NS_INIT_ISUPPORTS(); - LOG ("GFilePicker constructor") mDialog = EPHY_FILE_CHOOSER (g_object_new (EPHY_TYPE_FILE_CHOOSER, NULL)); diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 62a5cfb75..a2c2c5861 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -28,8 +28,6 @@ NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory, nsIBrowserHistory) MozGlobalHistory::MozGlobalHistory () { - NS_INIT_ISUPPORTS(); - mGlobalHistory = ephy_embed_shell_get_global_history (embed_shell); } diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp index cace13cae..cab6b9b22 100644 --- a/embed/mozilla/PrintingPromptService.cpp +++ b/embed/mozilla/PrintingPromptService.cpp @@ -39,13 +39,10 @@ NS_IMPL_ISUPPORTS1(GPrintingPromptService, nsIPrintingPromptService) GPrintingPromptService::GPrintingPromptService() { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ } GPrintingPromptService::~GPrintingPromptService() { - /* destructor code */ } /* void showPrintDialog (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings); */ diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index 037fead15..b25b3696d 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include "config.h" #endif #include "ephy-embed-shell.h" -- cgit v1.2.3