diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-23 17:51:21 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 10:21:48 +0200 |
| commit | 216189e6f7449ed62149095e5b5f9bec3ad3a23c (patch) | |
| tree | db321989bf1ff037a6f58b64451d0319e7a50157 /dom/xul/templates | |
| parent | bbae11cdd9832c86179842edc8e77e3919ac488d (diff) | |
| download | UXP-216189e6f7449ed62149095e5b5f9bec3ad3a23c.tar UXP-216189e6f7449ed62149095e5b5f9bec3ad3a23c.tar.gz UXP-216189e6f7449ed62149095e5b5f9bec3ad3a23c.tar.lz UXP-216189e6f7449ed62149095e5b5f9bec3ad3a23c.tar.xz UXP-216189e6f7449ed62149095e5b5f9bec3ad3a23c.zip | |
Issue #80 - De-unify dom/xul
Diffstat (limited to 'dom/xul/templates')
| -rw-r--r-- | dom/xul/templates/moz.build | 2 | ||||
| -rw-r--r-- | dom/xul/templates/nsInstantiationNode.cpp | 3 | ||||
| -rw-r--r-- | dom/xul/templates/nsTemplateMap.h | 2 | ||||
| -rw-r--r-- | dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp | 4 | ||||
| -rw-r--r-- | dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp | 2 | ||||
| -rw-r--r-- | dom/xul/templates/nsXULTreeBuilder.cpp | 3 |
6 files changed, 15 insertions, 1 deletions
diff --git a/dom/xul/templates/moz.build b/dom/xul/templates/moz.build index 3beb0b7e5..780f01941 100644 --- a/dom/xul/templates/moz.build +++ b/dom/xul/templates/moz.build @@ -17,7 +17,7 @@ XPIDL_SOURCES += [ XPIDL_MODULE = 'xultmpl' -UNIFIED_SOURCES += [ +SOURCES += [ 'nsContentSupportMap.cpp', 'nsContentTestNode.cpp', 'nsInstantiationNode.cpp', diff --git a/dom/xul/templates/nsInstantiationNode.cpp b/dom/xul/templates/nsInstantiationNode.cpp index 9079d4189..ebf12acad 100644 --- a/dom/xul/templates/nsInstantiationNode.cpp +++ b/dom/xul/templates/nsInstantiationNode.cpp @@ -8,6 +8,9 @@ #include "nsXULTemplateQueryProcessorRDF.h" #include "mozilla/Logging.h" + +using namespace mozilla; + extern mozilla::LazyLogModule gXULTemplateLog; nsInstantiationNode::nsInstantiationNode(nsXULTemplateQueryProcessorRDF* aProcessor, diff --git a/dom/xul/templates/nsTemplateMap.h b/dom/xul/templates/nsTemplateMap.h index cb828b093..dfa7d611a 100644 --- a/dom/xul/templates/nsTemplateMap.h +++ b/dom/xul/templates/nsTemplateMap.h @@ -9,6 +9,8 @@ #include "PLDHashTable.h" #include "nsXULElement.h" +using mozilla::fallible; + class nsTemplateMap { protected: struct Entry : public PLDHashEntryHdr { diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp index 732e545d0..ecf6b64c5 100644 --- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp +++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp @@ -35,6 +35,10 @@ #include "nsXULSortService.h" #include "nsIDocument.h" +#include "mozilla/Logging.h" + +using namespace mozilla; + //---------------------------------------------------------------------- #define PARSE_TYPE_INTEGER "Integer" diff --git a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp index a70307bf5..cd7c32eae 100644 --- a/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp +++ b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp @@ -28,6 +28,8 @@ #include "nsIDocument.h" #include "nsNetUtil.h" +using mozilla::fallible; + //---------------------------------------------------------------------- // // nsXULTemplateResultSetStorage diff --git a/dom/xul/templates/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp index b42133484..3356700be 100644 --- a/dom/xul/templates/nsXULTreeBuilder.cpp +++ b/dom/xul/templates/nsXULTreeBuilder.cpp @@ -32,6 +32,9 @@ #include "nsTreeContentView.h" #include "nsIXULStore.h" #include "mozilla/BinarySearch.h" +#include "mozilla/Logging.h" + +using mozilla::LogLevel; // For security check #include "nsIDocument.h" |