Hidetaka Iwai
tyuyu****@sings*****
2004年 6月 25日 (金) 19:07:51 JST
岩井@札幌です。 Hidetaka Iwai <tyuyu****@sings*****> wrote: Message-ID: <20040****@sings*****> > とりあえず、ヘッダをincludeしている部分のパッチを作成したので、添付し > ておきます。 すいません、添付するパッチを間違えました。 -- Hidetaka Iwai tyuyu****@sings***** -------------- next part -------------- diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozembed.cpp kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozembed.cpp --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozembed.cpp 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozembed.cpp 2004-06-25 18:58:04.000000000 +0900 @@ -38,39 +38,39 @@ #endif #include "utils.h" -#include <xpcom/nsCOMPtr.h> -#include <dom/nsIDOMDocument.h> +#include <nsCOMPtr.h> +#include <nsIDOMDocument.h> #include <content/nsIDocumentViewer.h> #include <content/nsIContent.h> -#include <webbrwsr/nsIWebBrowser.h> +#include <nsIWebBrowser.h> #include <content/nsIDocument.h> -#include <dom/nsIDOMMouseEvent.h> +#include <nsIDOMMouseEvent.h> #include <dom/nsIDOMKeyEvent.h> -#include <dom/nsIDOMEventTarget.h> +#include <nsIDOMEventTarget.h> #include <dom/nsIDOMNSHTMLElement.h> -#include <dom/nsIDOMHTMLElement.h> -#include <dom/nsIDOMHTMLTextAreaElement.h> -#include <dom/nsIDOMNamedNodeMap.h> +#include <nsIDOMHTMLElement.h> +#include <nsIDOMHTMLTextAreaElement.h> +#include <nsIDOMNamedNodeMap.h> #include <webbrowserpersist/nsIWebBrowserPersist.h> #include <necko/nsNetUtil.h> -#include <find/nsIWebBrowserFind.h> +#include <nsIWebBrowserFind.h> #include <dom/nsIDOMNSDocument.h> #include <dom/nsIDOMNSEvent.h> #include <docshell/nsIDocShell.h> #include <docshell/nsIDocShellTreeItem.h> #include <docshell/nsIDocShellTreeOwner.h> -#include <dom/nsIDOMNodeList.h> -#include <dom/nsIDOMWindow.h> -#include <content/nsISelection.h> -#include <dom/nsIDOMRange.h> -#include <find/nsIWebBrowserFind.h> +#include <nsIDOMNodeList.h> +#include <nsIDOMWindow.h> +#include <nsISelection.h> +#include <nsIDOMRange.h> +#include <nsIWebBrowserFind.h> #include <necko/nsNetUtil.h> #include <uconv/nsICharsetConverterManager.h> #if MOZILLA_SNAPSHOT < 10 # include <uconv/nsICharsetConverterManager2.h> #endif -#include <dom/nsIDOMWindow.h> -#include <content/nsISelection.h> +#include <nsIDOMWindow.h> +#include <nsISelection.h> #include <nsISHistory.h> #include <nsIHistoryEntry.h> #include <nsISHEntry.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozprogresslistener.cpp kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozprogresslistener.cpp --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozprogresslistener.cpp 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozprogresslistener.cpp 2004-06-25 18:58:57.000000000 +0900 @@ -23,7 +23,7 @@ #include "kz-downloader-group.h" #include <nsIFileURL.h> -#include <xpcom/nsILocalFile.h> +#include <nsILocalFile.h> #include <nsAString.h> #include <nsString.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.cpp kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.cpp --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.cpp 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.cpp 2004-06-25 18:58:04.000000000 +0900 @@ -29,12 +29,12 @@ #include <kz-mozselectionlistener.h> #include <gtkmozembed_internal.h> -#include <xpcom/nsIInterfaceRequestorUtils.h> +#include <nsIInterfaceRequestorUtils.h> #include <docshell/nsIDocShell.h> #include <docshell/nsIDocShellTreeItem.h> #include <docshell/nsIDocShellTreeOwner.h> #include <docshell/nsIContentViewer.h> -#include <content/nsISelection.h> +#include <nsISelection.h> #include <content/nsISelectionPrivate.h> #include <nsIClipboardCommands.h> #include <nsLiteralString.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.h kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.h --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.h 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozselectionlistener.h 2004-06-25 18:58:04.000000000 +0900 @@ -19,12 +19,12 @@ // -#include <xpcom/nsCOMPtr.h> +#include <nsCOMPtr.h> #include <docshell/nsIDocShell.h> -#include <dom/nsIDOMDocument.h> -#include <dom/nsIDOMWindow.h> -#include <webbrwsr/nsIWebBrowser.h> -#include <content/nsISelection.h> +#include <nsIDOMDocument.h> +#include <nsIDOMWindow.h> +#include <nsIWebBrowser.h> +#include <nsISelection.h> #include <content/nsISelectionListener.h> #include <nsString.h> #include <nsIDOMEventReceiver.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.cpp kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.cpp --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.cpp 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.cpp 2004-06-25 18:58:04.000000000 +0900 @@ -29,20 +29,20 @@ #include <kz-mozwrapper.h> #include <gtkmozembed_internal.h> -#include <xpcom/nsIInterfaceRequestorUtils.h> -#include <xpcom/nsILocalFile.h> +#include <nsIInterfaceRequestorUtils.h> +#include <nsILocalFile.h> #include <docshell/nsIDocShell.h> #include <docshell/nsIDocShellTreeItem.h> #include <docshell/nsIDocShellTreeOwner.h> #include <docshell/nsIContentViewer.h> #include <content/nsIContent.h> -#include <dom/nsIDOMHTMLDocument.h> -#include <dom/nsIDOMHTMLElement.h> -#include <dom/nsIDOMHTMLImageElement.h> -#include <dom/nsIDOMDocumentRange.h> -#include <dom/nsIDOMNamedNodeMap.h> -#include <dom/nsIDOMText.h> -#include <dom/nsIDOMNodeList.h> +#include <nsIDOMHTMLDocument.h> +#include <nsIDOMHTMLElement.h> +#include <nsIDOMHTMLImageElement.h> +#include <nsIDOMDocumentRange.h> +#include <nsIDOMNamedNodeMap.h> +#include <nsIDOMText.h> +#include <nsIDOMNodeList.h> #include <nsIClipboardCommands.h> #include <nsLiteralString.h> #include <nsString.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.h kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.h --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.h 2004-06-25 00:05:19.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/kz-mozwrapper.h 2004-06-25 18:58:04.000000000 +0900 @@ -19,12 +19,12 @@ // -#include <xpcom/nsCOMPtr.h> +#include <nsCOMPtr.h> #include <docshell/nsIDocShell.h> -#include <dom/nsIDOMDocument.h> -#include <dom/nsIDOMWindow.h> -#include <dom/nsIDOMRange.h> -#include <webbrwsr/nsIWebBrowser.h> +#include <nsIDOMDocument.h> +#include <nsIDOMWindow.h> +#include <nsIDOMRange.h> +#include <nsIWebBrowser.h> #include <nsString.h> #include <nsIDOMEventReceiver.h> #include <nsPIDOMWindow.h> diff -urNad /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/mozilla-prefs.cpp kazehakase-0.1.6+cvs20040624/src/mozilla/mozilla-prefs.cpp --- /home/tyuyu/debworks/kazehakase/kazehakase-0.1.6+cvs20040624/src/mozilla/mozilla-prefs.cpp 2004-06-25 18:57:49.000000000 +0900 +++ kazehakase-0.1.6+cvs20040624/src/mozilla/mozilla-prefs.cpp 2004-06-25 18:58:04.000000000 +0900 @@ -24,13 +24,13 @@ #include <sys/utsname.h> #include <gtkmozembed.h> #include <nsBuildID.h> -#include <xpcom/nsCOMPtr.h> -#include <pref/nsIPrefService.h> +#include <nsCOMPtr.h> +#include <nsIPrefService.h> #include <uconv/nsICharsetConverterManager.h> #if MOZILLA_SNAPSHOT < 10 # include <uconv/nsICharsetConverterManager2.h> #endif -#include <xpcom/nsISupportsPrimitives.h> +#include <nsISupportsPrimitives.h> #include <gfx/nsIFontList.h> #include <necko/nsNetUtil.h>