diff --git a/src/plugins/qmljstools/qmlconsoleedit.cpp b/src/plugins/qmljstools/qmlconsoleedit.cpp index e53297b8c3d3b97a95eaedff84df1755fa155c3d..e202ed26d88939727d333dd196ebcbfafbbe51fb 100644 --- a/src/plugins/qmljstools/qmlconsoleedit.cpp +++ b/src/plugins/qmljstools/qmlconsoleedit.cpp @@ -29,6 +29,7 @@ #include "qmlconsoleedit.h" #include "qmlconsoleitemmodel.h" +#include "qmlconsolemodel.h" #include "qmlconsolemanager.h" #include <utils/qtcassert.h> diff --git a/src/plugins/qmljstools/qmlconsoleitemdelegate.h b/src/plugins/qmljstools/qmlconsoleitemdelegate.h index 477618b47497996fb7fee4ee60593cb8eb8cfc88..f0c1735234fd81911d9c4cebafceaf7b802a74d0 100644 --- a/src/plugins/qmljstools/qmlconsoleitemdelegate.h +++ b/src/plugins/qmljstools/qmlconsoleitemdelegate.h @@ -31,6 +31,7 @@ #define QMLCONSOLEITEMDELEGATE_H #include "qmlconsoleitemmodel.h" +#include "qmlconsolemodel.h" #include "qmlconsolemanager.h" #include <QStyledItemDelegate> diff --git a/src/plugins/qmljstools/qmlconsolemanager.cpp b/src/plugins/qmljstools/qmlconsolemanager.cpp index 9bde33c045f63dc6fc88580f128a19e1bf894148..7332c39e56aad60f74097b1be1ad19ab8e259f68 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.cpp +++ b/src/plugins/qmljstools/qmlconsolemanager.cpp @@ -30,6 +30,7 @@ #include "qmlconsolemanager.h" #include "qmlconsolepane.h" #include "qmlconsoleitemmodel.h" +#include "qmlconsolemodel.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/qmljstools/qmlconsolemanager.h b/src/plugins/qmljstools/qmlconsolemanager.h index 57764655f210425049dab172a3fe32f3b52e56f9..218e8506c38d42948e3a5e35eb1edff30a4e3671 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.h +++ b/src/plugins/qmljstools/qmlconsolemanager.h @@ -42,7 +42,6 @@ class IScriptEvaluator; namespace QmlJSTools { namespace Internal { -class QmlConsoleItemModel; class QmlConsoleModel; } @@ -70,17 +69,6 @@ private: friend class Internal::QmlConsoleModel; }; -namespace Internal { - -class QmlConsoleModel -{ -public: - static QmlConsoleItemModel *qmlConsoleItemModel(); - static void evaluate(const QString &expression); -}; - -} - } // namespace QmlJSTools #endif // QMLCONSOLEMANAGER_H diff --git a/src/plugins/qmljstools/qmlconsolemodel.h b/src/plugins/qmljstools/qmlconsolemodel.h new file mode 100644 index 0000000000000000000000000000000000000000..9cf0ff91fe81905e36b105d6fd98b3ec76b64f57 --- /dev/null +++ b/src/plugins/qmljstools/qmlconsolemodel.h @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#ifndef QMLCONSOLEMODEL_H +#define QMLCONSOLEMODEL_H + +#include <QString> + +namespace QmlJSTools { +namespace Internal { + +class QmlConsoleItemModel; + +class QmlConsoleModel +{ +public: + static QmlConsoleItemModel *qmlConsoleItemModel(); + static void evaluate(const QString &expression); +}; + +} // namespace Internal +} // namespace QmlJSTools + +#endif // QMLCONSOLEMODEL_H diff --git a/src/plugins/qmljstools/qmljstools.pro b/src/plugins/qmljstools/qmljstools.pro index b956081b772b91c9191a02c59e840aed27c9a87f..b653f9b084366603ad21ff15ade31de6f295fb33 100644 --- a/src/plugins/qmljstools/qmljstools.pro +++ b/src/plugins/qmljstools/qmljstools.pro @@ -27,6 +27,7 @@ HEADERS += \ $$PWD/qmljstools_global.h \ $$PWD/qmlconsolemanager.h \ $$PWD/qmlconsoleitemmodel.h \ + $$PWD/qmlconsolemodel.h \ $$PWD/qmlconsolepane.h \ $$PWD/qmlconsoleview.h \ $$PWD/qmlconsoleitemdelegate.h \