QmlDebug: Remove Color Tool

Change-Id: I3d54d24c2873648c9530ee8e7a33c95275e369e0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index c444b3d..95ce866 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -163,10 +163,6 @@ void QQuickViewInspector::reparentQmlObject(QObject *object, QObject *newParent)
 void QQuickViewInspector::changeTool(InspectorProtocol::Tool tool)
 {
     switch (tool) {
-    case InspectorProtocol::ColorPickerTool:
-        // TODO
-        emit colorPickerActivated();
-        break;
     case InspectorProtocol::SelectMarqueeTool:
         // TODO
         emit marqueeSelectToolActivated();

diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index cb57fb2..b7ed69d 100644 (file)
--- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
@@ -163,11 +163,6 @@ void AbstractViewInspector::setShowAppOnTop(bool appOnTop)
     emit showAppOnTopChanged(appOnTop);
 }
 
-void AbstractViewInspector::changeToColorPickerTool()
-{
-    changeTool(InspectorProtocol::ColorPickerTool);
-}
-
 void AbstractViewInspector::changeToInspectTool()
 {
     changeTool(InspectorProtocol::InspectTool);
@@ -273,9 +268,6 @@ bool AbstractViewInspector::keyReleaseEvent(QKeyEvent *event)
 //    case Qt::Key_M:
 //        changeTool(InspectorProtocol::SelectMarqueeTool);
 //        break;
-    case Qt::Key_I:
-        changeTool(InspectorProtocol::ColorPickerTool);
-        break;
     case Qt::Key_Space:
         setAnimationPaused(!animationPaused());
         break;
@@ -489,17 +481,6 @@ void AbstractViewInspector::sendShowAppOnTop(bool showAppOnTop)
     m_debugService->sendMessage(message);
 }
 
-void AbstractViewInspector::sendColorChanged(const QColor &color)
-{
-    QByteArray message;
-    QDataStream ds(&message, QIODevice::WriteOnly);
-
-    ds << InspectorProtocol::ColorChanged
-       << color;
-
-    m_debugService->sendMessage(message);
-}
-
 QString AbstractViewInspector::idStringForObject(QObject *obj) const
 {
     const int id = QQmlDebugService::idForObject(obj);

diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index 581a8a5..17f9e26 100644 (file)
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -45,7 +45,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtGui/QColor>
 
 #include "qqmlinspectorprotocol.h"
 #include "qmlinspectorconstants.h"
@@ -110,8 +109,6 @@ signals:
     void reloadRequested();
     void marqueeSelectToolActivated();
     void inspectToolActivated();
-    void colorPickerActivated();
-    void selectedColorChanged(const QColor &color);
 
     void animationSpeedChanged(qreal factor);
     void animationPausedChanged(bool paused);
@@ -131,13 +128,9 @@ protected:
     virtual bool wheelEvent(QWheelEvent *event);
     virtual bool touchEvent(QTouchEvent *event);
 
-private slots:
-    void sendColorChanged(const QColor &color);
-
 private:
     void sendDesignModeBehavior(bool inDesignMode);
 
-    void changeToColorPickerTool();
     void changeToZoomTool();
     void changeToInspectTool();
     void changeToMarqueeSelectTool();

diff --git a/src/plugins/qmltooling/shared/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
index dd22d71..4463283 100644 (file)
--- a/src/plugins/qmltooling/shared/qmlinspectorconstants.h
+++ b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
@@ -53,7 +53,6 @@ enum DesignTool {
     MarqueeSelectionToolMode = 2,
     MoveToolMode = 3,
     ResizeToolMode = 4,
-    ColorPickerMode = 5,
     ZoomMode = 6
 };
 

diff --git a/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
index d8807e5..8527bf6 100644 (file)
--- a/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
+++ b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
@@ -60,7 +60,6 @@ public:
         AnimationPausedChanged = 19, // highest value
         ChangeTool             = 1,
         ClearComponentCache    = 2,
-        ColorChanged           = 3,
         CreateObject           = 5,
         CurrentObjectsChanged  = 6,
         DestroyObject          = 7,
@@ -77,8 +76,7 @@ public:
     };
 
     enum Tool {
-        ColorPickerTool,
-        SelectMarqueeTool,
+        SelectMarqueeTool = 1,
         InspectTool
     };