From d747efed529164c12f0d97cc1d3eee926903fdba Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 15 Jul 2010 14:17:20 +0200
Subject: [PATCH] Fix warnings on windows
* Windows does not like "QObject */* name */", warning about end
of comment when rtunning into */*.
---
.../qmljsinspector/qmljsdesigndebugclient.cpp | 2 +-
src/tools/qml/qmlobserver/editor/colorpickertool.cpp | 12 ++++++------
.../qmlobserver/editor/subcomponenteditortool.cpp | 12 ++++++------
src/tools/qml/qmlobserver/editor/zoomtool.cpp | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/plugins/qmljsinspector/qmljsdesigndebugclient.cpp b/src/plugins/qmljsinspector/qmljsdesigndebugclient.cpp
index e4de7efe97e..819336639c3 100644
--- a/src/plugins/qmljsinspector/qmljsdesigndebugclient.cpp
+++ b/src/plugins/qmljsinspector/qmljsdesigndebugclient.cpp
@@ -47,7 +47,7 @@ namespace QmlJSInspector {
namespace Internal {
QmlJSDesignDebugClient::QmlJSDesignDebugClient(QDeclarativeDebugConnection *client,
- QObject */*parent*/)
+ QObject * /*parent*/)
: QDeclarativeDebugClient(QLatin1String("QDeclarativeDesignMode"), client) ,
m_connection(client)
{
diff --git a/src/tools/qml/qmlobserver/editor/colorpickertool.cpp b/src/tools/qml/qmlobserver/editor/colorpickertool.cpp
index 00007c2f525..86f24bf8a7c 100644
--- a/src/tools/qml/qmlobserver/editor/colorpickertool.cpp
+++ b/src/tools/qml/qmlobserver/editor/colorpickertool.cpp
@@ -22,7 +22,7 @@ ColorPickerTool::~ColorPickerTool()
}
-void ColorPickerTool::mousePressEvent(QMouseEvent */*event*/)
+void ColorPickerTool::mousePressEvent(QMouseEvent * /*event*/)
{
}
@@ -36,23 +36,23 @@ void ColorPickerTool::mouseReleaseEvent(QMouseEvent *event)
pickColor(event->pos());
}
-void ColorPickerTool::mouseDoubleClickEvent(QMouseEvent */*event*/)
+void ColorPickerTool::mouseDoubleClickEvent(QMouseEvent * /*event*/)
{
}
-void ColorPickerTool::hoverMoveEvent(QMouseEvent */*event*/)
+void ColorPickerTool::hoverMoveEvent(QMouseEvent * /*event*/)
{
}
-void ColorPickerTool::keyPressEvent(QKeyEvent */*event*/)
+void ColorPickerTool::keyPressEvent(QKeyEvent * /*event*/)
{
}
-void ColorPickerTool::keyReleaseEvent(QKeyEvent */*keyEvent*/)
+void ColorPickerTool::keyReleaseEvent(QKeyEvent * /*keyEvent*/)
{
}
-void ColorPickerTool::wheelEvent(QWheelEvent */*event*/)
+void ColorPickerTool::wheelEvent(QWheelEvent * /*event*/)
{
}
diff --git a/src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp b/src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp
index b056754a13a..345e2373ef8 100644
--- a/src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp
+++ b/src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp
@@ -31,12 +31,12 @@ SubcomponentEditorTool::~SubcomponentEditorTool()
}
-void SubcomponentEditorTool::mousePressEvent(QMouseEvent */*event*/)
+void SubcomponentEditorTool::mousePressEvent(QMouseEvent * /*event*/)
{
}
-void SubcomponentEditorTool::mouseMoveEvent(QMouseEvent */*event*/)
+void SubcomponentEditorTool::mouseMoveEvent(QMouseEvent * /*event*/)
{
}
@@ -53,7 +53,7 @@ bool SubcomponentEditorTool::containsCursor(const QPoint &mousePos) const
return polyRect.contains(scenePos);
}
-void SubcomponentEditorTool::mouseReleaseEvent(QMouseEvent */*event*/)
+void SubcomponentEditorTool::mouseReleaseEvent(QMouseEvent * /*event*/)
{
}
@@ -75,17 +75,17 @@ void SubcomponentEditorTool::hoverMoveEvent(QMouseEvent *event)
}
}
-void SubcomponentEditorTool::wheelEvent(QWheelEvent */*event*/)
+void SubcomponentEditorTool::wheelEvent(QWheelEvent * /*event*/)
{
}
-void SubcomponentEditorTool::keyPressEvent(QKeyEvent */*event*/)
+void SubcomponentEditorTool::keyPressEvent(QKeyEvent * /*event*/)
{
}
-void SubcomponentEditorTool::keyReleaseEvent(QKeyEvent */*keyEvent*/)
+void SubcomponentEditorTool::keyReleaseEvent(QKeyEvent * /*keyEvent*/)
{
}
diff --git a/src/tools/qml/qmlobserver/editor/zoomtool.cpp b/src/tools/qml/qmlobserver/editor/zoomtool.cpp
index d6a6086f5ee..35686499e05 100644
--- a/src/tools/qml/qmlobserver/editor/zoomtool.cpp
+++ b/src/tools/qml/qmlobserver/editor/zoomtool.cpp
@@ -137,7 +137,7 @@ void ZoomTool::hoverMoveEvent(QMouseEvent *event)
}
-void ZoomTool::keyPressEvent(QKeyEvent */*event*/)
+void ZoomTool::keyPressEvent(QKeyEvent * /*event*/)
{
}
--
GitLab