svnno****@sourc*****
svnno****@sourc*****
Wed Mar 12 10:57:58 JST 2008
Revision: 3479
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3479
Author: ikezoe
Date: 2008-03-12 10:57:57 +0900 (Wed, 12 Mar 2008)
Log Message:
-----------
* module/embed/gecko/*: Remove MOZILLA_INTERNAL_API.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/GtkNSSDialogs.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedContentListener.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
kazehakase/trunk/module/embed/gecko/kz-mozutils.h
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
kazehakase/trunk/module/embed/gecko/mozilla.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/ChangeLog 2008-03-12 01:57:57 UTC (rev 3479)
@@ -7,6 +7,7 @@
module/embed/gecko/kz-mozwrapper.cpp,
module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp: More cleanup.
* macro/gecko.m4: Remove gcc options.
+ * module/embed/gecko/*: Remove MOZILLA_INTERNAL_API.
2008-03-11 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/GtkNSSDialogs.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/GtkNSSDialogs.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/GtkNSSDialogs.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -38,9 +38,7 @@
#include <nsCOMPtr.h>
#include <nsMemory.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsServiceManagerUtils.h>
#include <nsIInterfaceRequestor.h>
#include <nsIInterfaceRequestorUtils.h>
#include <nsIX509Cert.h>
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedContentListener.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedContentListener.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedContentListener.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -27,9 +27,7 @@
#include "EmbedPrivate.h"
#include <nsICategoryManager.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsServiceManagerUtils.h>
EmbedContentListener::EmbedContentListener(void)
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -19,10 +19,8 @@
* Christopher Blizzard <blizz****@mozil*****>
*/
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
+#include <nsServiceManagerUtils.h>
#include <nsIComponentManager.h>
-#undef MOZILLA_INTERNAL_API
#include <nsIDocShell.h>
#include <nsIWebProgress.h>
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedWindow.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -22,9 +22,7 @@
*/
#include <nsCWebBrowser.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIComponentManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsComponentManagerUtils.h>
#include <nsIDocShellTreeItem.h>
#include <nsMemory.h>
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -30,18 +30,15 @@
#include "MozillaPrivate.h"
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
+#include <nsServiceManagerUtils.h>
#include <nsIComponentManager.h>
#include <nsIPrintSettingsService.h>
+#define MOZILLA_INTERNAL_API
#include <nsIPrintOptions.h>
-#include <nsWeakPtr.h>
-#include <nsPromiseFlatString.h>
-#include <nsIDocument.h>
#undef MOZILLA_INTERNAL_API
+#include <nsWeakPtr.h>
#include <nsISimpleEnumerator.h>
#include <nsISupportsPrimitives.h>
-#include <nsIContent.h>
#include <nsIDOMHTMLDocument.h>
#include <nsIDOMHTMLElement.h>
#include <nsIDOMHTMLImageElement.h>
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/MozillaPrivate.h 2008-03-12 01:57:57 UTC (rev 3479)
@@ -28,7 +28,6 @@
#include <glib.h>
#include <gtk/gtk.h>
-#define MOZILLA_INTERNAL_API
#include <nsIPrintSettings.h>
#include <nsIDOMWindow.h>
#include <nsIDOMDocument.h>
@@ -36,7 +35,6 @@
#include <nsISelection.h>
#include <nsIDocShell.h>
#include <nsIBaseWindow.h>
-#undef MOZILLA_INTERNAL_API
#ifdef MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_
#include "egg-pixbuf-thumbnail.h"
#endif
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -100,6 +100,7 @@
#include <nsIFontEnumerator.h>
#include <nsISimpleEnumerator.h>
#include <nsMemory.h>
+#include <nsServiceManagerUtils.h>
#define KZ_GECKO_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_GECKO_EMBED, KzGeckoEmbedPrivate))
Modified: kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -27,9 +27,7 @@
#include <glib.h>
#include <glib/gi18n.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIComponentManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsComponentManagerUtils.h>
#include <nsCOMPtr.h>
#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
Modified: kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/kz-mozutils.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -18,9 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsServiceManagerUtils.h>
#include <nsIWindowWatcher.h>
#include <nsIWebBrowserChrome.h>
#include <nsIEmbeddingSiteWindow.h>
Modified: kazehakase/trunk/module/embed/gecko/kz-mozutils.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozutils.h 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/kz-mozutils.h 2008-03-12 01:57:57 UTC (rev 3479)
@@ -22,10 +22,8 @@
#define __KZ_MOZ_UTILS_H__
#include <gtk/gtk.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIComponentManager.h>
#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsComponentManagerUtils.h>
#include <nsIDOMWindow.h>
#include <nsIURI.h>
#include <nsIIOService.h>
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -37,9 +37,7 @@
#include <gtkmozembed_internal.h>
#include <stdlib.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsServiceManagerUtils.h>
#include <nsIInterfaceRequestorUtils.h>
#include <nsILocalFile.h>
#include <nsIDocShell.h>
Modified: kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/mozilla-prefs.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -30,12 +30,8 @@
#include <nsCOMPtr.h>
#include <nsIPrefService.h>
#include <nsISupportsPrimitives.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
-#if 1
+#include <nsServiceManagerUtils.h>
#include <nsIFontEnumerator.h>
-#endif
#include <nsISimpleEnumerator.h>
#include <nsMemory.h>
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-12 01:21:11 UTC (rev 3478)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-12 01:57:57 UTC (rev 3479)
@@ -30,9 +30,7 @@
#include <nsXPCOM.h>
#include <nsIGenericFactory.h>
#include <nsIComponentRegistrar.h>
-#define MOZILLA_INTERNAL_API
-#include <nsIServiceManager.h>
-#undef MOZILLA_INTERNAL_API
+#include <nsServiceManagerUtils.h>
#include <sys/utsname.h>
#include "mozilla.h"