forked from qt-creator/qt-creator
Fixes: core: remove ViewManagerInterface
Details: was a needless layer
This commit is contained in:
@@ -123,7 +123,6 @@ HEADERS += mainwindow.h \
|
||||
iversioncontrol.h \
|
||||
iview.h \
|
||||
ifilewizardextension.h \
|
||||
viewmanagerinterface.h \
|
||||
icorelistener.h \
|
||||
versiondialog.h \
|
||||
scriptmanager/metatypedeclarations.h \
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
using namespace Core;
|
||||
using namespace Core::Internal;
|
||||
|
||||
ViewManager::ViewManager(MainWindow *mainWnd) :
|
||||
ViewManagerInterface(mainWnd),
|
||||
ViewManager::ViewManager(MainWindow *mainWnd)
|
||||
: QObject(mainWnd),
|
||||
m_mainWnd(mainWnd)
|
||||
{
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
#ifndef VIEWMANAGER_H
|
||||
#define VIEWMANAGER_H
|
||||
|
||||
#include "viewmanagerinterface.h"
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtGui/QWidget>
|
||||
|
||||
@@ -45,15 +43,14 @@ QT_END_NAMESPACE
|
||||
|
||||
namespace Core {
|
||||
|
||||
class UniqueIDManager;
|
||||
class IView;
|
||||
|
||||
namespace Internal {
|
||||
|
||||
class MainWindow;
|
||||
class NavigationWidget;
|
||||
|
||||
class ViewManager
|
||||
: public Core::ViewManagerInterface
|
||||
class ViewManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
||||
**
|
||||
** Contact: Qt Software Information (qt-info@nokia.com)
|
||||
**
|
||||
** Commercial Usage
|
||||
**
|
||||
** Licensees holding valid Qt Commercial licenses may use this file in
|
||||
** accordance with the Qt Commercial License Agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Nokia.
|
||||
**
|
||||
** 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.
|
||||
**
|
||||
** If you are unsure which license is appropriate for your use, please
|
||||
** contact the sales department at qt-sales@nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef VIEWMANAGERINTERFACE_H
|
||||
#define VIEWMANAGERINTERFACE_H
|
||||
|
||||
#include <coreplugin/core_global.h>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QKeySequence>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QIcon;
|
||||
class QString;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Core {
|
||||
|
||||
class IView;
|
||||
|
||||
class CORE_EXPORT ViewManagerInterface
|
||||
: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ViewManagerInterface(QObject *parent = 0) : QObject(parent) { }
|
||||
virtual ~ViewManagerInterface() { }
|
||||
|
||||
// returns the view @p id
|
||||
virtual IView * view(const QString & id) = 0;
|
||||
};
|
||||
|
||||
} // namespace Core
|
||||
|
||||
#endif // VIEWMANAGERINTERFACE_H
|
||||
Reference in New Issue
Block a user