Fix -Wcast-qual warnings

qwidget.cpp:12864:70: error: cast from type ‘const QWidget*’ to type ‘void*’ casts away qualifiers [-Werror=cast-qual]

Change-Id: I7de033f80b0e4431b7f1ffff13f956cb26108af7
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 407b4ee9b638a6ced5755c1eb39433e6f2e52456..b6b50372aee93d9c263b671eb330bad86b1ace9e 100644 (file)
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -698,7 +698,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen)
 {
     const QDebugStateSaver saver(debug);
     debug.nospace();
-    debug << "QScreen(" << (void *)screen;
+    debug << "QScreen(" << (const void *)screen;
     if (screen) {
         debug << ", name=" << screen->name();
         if (debug.verbosity() > 2) {

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index e93e964c6bc9f8916f380c973c0aaa47615fef03..89bd1195649230643c3f51f5c3495c166f2723dc 100644 (file)
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -2508,7 +2508,7 @@ QDebug operator<<(QDebug debug, const QWindow *window)
     QDebugStateSaver saver(debug);
     debug.nospace();
     if (window) {
-        debug << window->metaObject()->className() << '(' << (void *)window;
+        debug << window->metaObject()->className() << '(' << (const void *)window;
         if (!window->objectName().isEmpty())
             debug << ", name=" << window->objectName();
         if (debug.verbosity() > 2) {

diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 8646e699a9baded9063c561131debe3bbfa438a3..ebb54735d4f0066320074cdecb03eb77c88441d5 100644 (file)
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2030,7 +2030,7 @@ QString FunctionNode::signature(bool values) const
 PropertyNode::FunctionRole PropertyNode::role(const FunctionNode* fn) const
 {
     for (int i=0; i<4; i++) {
-        if (functions_[i].contains((Node*)fn))
+        if (functions_[i].contains(const_cast<FunctionNode*>(fn)))
             return (FunctionRole) i;
     }
     return Notifier;

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 1ebf782edf572341185e2e92b9869c351d6135c1..91641db60dd3204621d714bc485a30e81a55bec4 100644 (file)
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -12861,7 +12861,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
     const QDebugStateSaver saver(debug);
     debug.nospace();
     if (widget) {
-        debug << widget->metaObject()->className() << '(' << (void *)widget;
+        debug << widget->metaObject()->className() << '(' << (const void *)widget;
         if (!widget->objectName().isEmpty())
             debug << ", name=" << widget->objectName();
         if (debug.verbosity() > 2) {