Remove qqmlinspectorconstants.h

Only two of the constants were used and both only once in the same
file. We can as well declare them there.

Change-Id: Idda68707a209af2c84fc06e22516e64fceb5f4bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

4 files changed, 5 insertions, 71 deletions

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index f86225fa0a..d5e54045fc 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -51,6 +51,9 @@
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
+static const double ZoomSnapDelta = 0.04;
+static const int PressAndHoldTimeout = 800;
+
 InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) :
     AbstractTool(inspector),
     m_originalSmooth(view->contentItem()->smooth()),
@@ -60,7 +63,7 @@ InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) :
     m_tapEvent(false),
     m_contentItem(view->contentItem()),
     m_originalPosition(view->contentItem()->position()),
-    m_smoothScaleFactor(Constants::ZoomSnapDelta),
+    m_smoothScaleFactor(ZoomSnapDelta),
     m_minScale(0.125f),
     m_maxScale(48.0f),
     m_originalScale(view->contentItem()->scale()),
@@ -71,7 +74,7 @@ InspectTool::InspectTool(QQuickViewInspector *inspector, QQuickView *view) :
 {
     //Press and Hold Timer
     m_pressAndHoldTimer.setSingleShot(true);
-    m_pressAndHoldTimer.setInterval(Constants::PressAndHoldTimeout);
+    m_pressAndHoldTimer.setInterval(PressAndHoldTimeout);
     connect(&m_pressAndHoldTimer, SIGNAL(timeout()), SLOT(zoomTo100()));
     //Timer to display selected item's name
     m_nameDisplayTimer.setSingleShot(true);
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index 2ee0d703b2..798c512038 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -21,7 +21,6 @@ HEADERS += \
     qquickviewinspector.h \
     ../shared/abstracttool.h \
     ../shared/abstractviewinspector.h \
-    ../shared/qmlinspectorconstants.h \
     inspecttool.h
 
 OTHER_FILES += qtquick2plugin.json
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index 02b4247bec..70226d7cb1 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -38,8 +38,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-#include "qmlinspectorconstants.h"
-
 QT_BEGIN_NAMESPACE
 class QQmlEngine;
 class QQmlInspectorService;
diff --git a/src/plugins/qmltooling/shared/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
deleted file mode 100644
index d76e172844..0000000000
--- a/src/plugins/qmltooling/shared/qmlinspectorconstants.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLINSPECTORCONSTANTS_H
-#define QMLINSPECTORCONSTANTS_H
-
-#include <QtQml/private/qqmlglobal_p.h>
-
-namespace QmlJSDebugger {
-namespace Constants {
-
-enum DesignTool {
-    NoTool = 0,
-    SelectionToolMode = 1,
-    MarqueeSelectionToolMode = 2,
-    MoveToolMode = 3,
-    ResizeToolMode = 4,
-    ZoomMode = 6
-};
-
-static const int PressAndHoldTimeout = 800;
-
-static const double ZoomSnapDelta = 0.04;
-
-static const int EditorItemDataKey = 1000;
-
-enum GraphicsItemTypes {
-    EditorItemType = 0xEAAA,
-    ResizeHandleItemType = 0xEAEA
-};
-
-
-} // namespace Constants
-} // namespace QmlJSDebugger
-
-#endif // QMLINSPECTORCONSTANTS_H