aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/FilePicker.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-04-29 18:41:10 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-04-29 18:41:10 +0800
commit25d492ed43d4bb06fe9e1589950d2a349917bce2 (patch)
treec193c6890bf4401a597c8bd796f4709c2f5bf67a /embed/mozilla/FilePicker.cpp
parent4bc8882e3270c7bd044ae32984686343ddc89cad (diff)
downloadgsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.gz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.bz2
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.lz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.xz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.zst
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.zip
More defines work, still lack EventContext and EmbedPrivate. Use mozilla
2004-04-29 Marco Pesenti Gritti <marco@gnome.org> * configure.in: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EphyAboutRedirector.cpp: * embed/mozilla/EphyAboutRedirector.h: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyContentPolicy.cpp: * embed/mozilla/EphyContentPolicy.h: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphyHeaderSniffer.h: * embed/mozilla/EphySingle.cpp: * embed/mozilla/EventContext.cpp: * embed/mozilla/FilePicker.cpp: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/GlobalHistory.h: * embed/mozilla/GtkNSSClientAuthDialogs.cpp: * embed/mozilla/GtkNSSClientAuthDialogs.h: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/GtkNSSDialogs.h: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/GtkNSSKeyPairDialogs.h: * embed/mozilla/Makefile.am: * embed/mozilla/MozDownload.cpp: * embed/mozilla/MozDownload.h: * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: More defines work, still lack EventContext and EmbedPrivate. Use mozilla like warning flags instead of those gnome macros. Remove several unused variables.
Diffstat (limited to 'embed/mozilla/FilePicker.cpp')
-rw-r--r--embed/mozilla/FilePicker.cpp40
1 files changed, 18 insertions, 22 deletions
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 292d7d9a8..b65038c6e 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -24,30 +24,26 @@
#endif
#include "FilePicker.h"
-
-#include "nsCRT.h"
-#include "nsCOMPtr.h"
-#include "nsISupportsArray.h"
-#include "nsIServiceManager.h"
-
-#include "nsString.h"
-#include "nsXPIDLString.h"
-#include "nsIPrefService.h"
-#include "nsIURI.h"
-#include "nsIFileURL.h"
-#include "nsIChannel.h"
-#include "nsIFileChannel.h"
-#include "nsNetCID.h"
-#include "nsILocalFile.h"
-#include "nsIPromptService.h"
-#include "nsReadableUtils.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsILocalFile.h"
#include "MozillaPrivate.h"
+#include <nsCOMPtr.h>
+#include <nsIServiceManager.h>
+#include <nsIURI.h>
+#include <nsIFileURL.h>
+#include <nsILocalFile.h>
+#include <nsIPromptService.h>
+#include <nsIDOMWindow.h>
+#include <nsNetCID.h>
+
+#ifdef ALLOW_PRIVATE_STRINGS
+#include <nsString.h>
+#include <nsReadableUtils.h>
+#endif
+
+#if MOZILLA_SNAPSHOT < 16
+#include <nsIDOMWindowInternal.h>
+#endif
+
#include "ephy-string.h"
#include "ephy-prefs.h"
#include "ephy-gui.h"