4 files changed, 7 insertions, 7 deletions
diff --git a/src/dom/domimpl.h b/src/dom/domimpl.h
index 4e17ce5ba..5fe508076 100644
--- a/src/dom/domimpl.h
+++ b/src/dom/domimpl.h
@@ -529,8 +529,8 @@ protected:
         {
             next    = NULL;
             key     = theKey;
-            data    = (DOMUserData *)theData;
-            handler = (UserDataHandler *)theHandler;
+            data    = const_cast<DOMUserData *>(theData);
+            handler = const_cast<UserDataHandler *>(theHandler);
         }
 
         virtual ~UserDataEntry()
diff --git a/src/dom/events.h b/src/dom/events.h
index b44df6dcd..9f44fe591 100644
--- a/src/dom/events.h
+++ b/src/dom/events.h
@@ -465,7 +465,7 @@ private:
 	        {
 	        namespaceURI = namespaceURIArg;
 	        eventType    = eventTypeArg;
-	        listener     = (EventListener *)listenerArg;
+	        listener     = const_cast<EventListener *>(listenerArg);
 	        useCapture   = useCaptureArg;
 	        }
 	
diff --git a/src/dom/ls.h b/src/dom/ls.h
index fd224ea6b..6e9a940f7 100644
--- a/src/dom/ls.h
+++ b/src/dom/ls.h
@@ -378,7 +378,7 @@ public:
      *
      */
     virtual void setFilter(const LSParserFilter *val)
-        { filter = (LSParserFilter *)val; }
+        { filter = const_cast<LSParserFilter *>(val); }
 
     /**
      *
@@ -657,7 +657,7 @@ public:
      *
      */
     virtual void setFilter(const LSSerializerFilter *val)
-        { filter = (LSSerializerFilter *)val; }
+        { filter = const_cast<LSSerializerFilter *>(val); }
 
     /**
      *
diff --git a/src/dom/util/thread.cpp b/src/dom/util/thread.cpp
index e8c06c850..d5368ef59 100644
--- a/src/dom/util/thread.cpp
+++ b/src/dom/util/thread.cpp
@@ -52,7 +52,7 @@ namespace util
 
 static DWORD WINAPI WinThreadFunction(LPVOID context)
 {
-    Thread *thread = (Thread *)context;
+    Thread *thread = static_cast<Thread *>(context);
     thread->execute();
     return 0;
 }
@@ -81,7 +81,7 @@ void Thread::sleep(unsigned long millis)
 
 void *PthreadThreadFunction(void *context)
 {
-    Thread *thread = (Thread *)context;
+    Thread *thread = static_cast<Thread *>(context);
     thread->execute();
     return NULL;
 }