summaryrefslogtreecommitdiffstats
path: root/tdehtml/xml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/xml')
-rw-r--r--tdehtml/xml/dom_docimpl.cpp2
-rw-r--r--tdehtml/xml/dom_docimpl.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 423a2a51e..b896d05a3 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -2345,7 +2345,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const
return false;
// Prohibit non-file URLs if we are asked to.
- if (!thisPart || thisPart->onlyLocalReferences() && newURL.protocol() != "file" && newURL.protocol() != "data")
+ if (!thisPart || (thisPart->onlyLocalReferences() && (newURL.protocol() != "file") && (newURL.protocol() != "data")))
return false;
// do we allow this suburl ?
diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index 9cacfd9f5..bcdc9500c 100644
--- a/tdehtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -27,6 +27,8 @@
#ifndef _DOM_DocumentImpl_h_
#define _DOM_DocumentImpl_h_
+#include <stdint.h>
+
#include "xml/dom_elementimpl.h"
#include "xml/dom_textimpl.h"
#include "xml/dom2_traversalimpl.h"
@@ -617,7 +619,7 @@ protected:
TQString name = cs ? n.string() : n.string().upper();
TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
if (!ids.find( qn )) {
- ids.insert( qn, (void*)id );
+ ids.insert( qn, (void*)(intptr_t)id );
}
}
expandIfNeeded();