diff --git a/src/plugins/qhelpproject/qhelpproject.cpp b/src/plugins/qhelpproject/qhelpproject.cpp deleted file mode 100644 index 29fab79b96baebba52683f0dd9c8c4a77e9530e3..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpproject.cpp +++ /dev/null @@ -1,198 +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. -** -**************************************************************************/ - -#include "qhelpproject.h" -#include "qhelpprojectmanager.h" -#include "qhelpprojectitems.h" - -#include -#include - -#include - -using namespace ProjectExplorer; -using namespace QHelpProjectPlugin::Internal; - -QHelpProject::QHelpProject(QHelpProjectManager *manager) -{ - m_manager = manager; - - ProjectExplorerInterface *projectExplorer = m_manager->projectExplorer(); - projectExplorer->addProjectItem(this); - - m_filesFolder = new QHelpProjectFolder(); - m_filesFolder->setName(QObject::tr("Files")); - projectExplorer->addProjectItem(m_filesFolder, this); -} - -QHelpProject::~QHelpProject() -{ - -} - -bool QHelpProject::open(const QString &fileName) -{ - m_projectFile = fileName; - - QHelpProjectParser parser; - if (!parser.parse(m_projectFile)) - return false; - - m_name = parser.namespaceURI(); - m_files = parser.files(); - - QFileInfo fi(fileName); - QString dir = fi.absolutePath() + QDir::separator(); - - ProjectExplorerInterface *projectExplorer = m_manager->projectExplorer(); - QHelpProjectFile *file; - foreach (QString f, m_files) { - file = new QHelpProjectFile(dir + f); - projectExplorer->addProjectItem(file, m_filesFolder); - } - - m_manager->projectExplorer()->updateItem(this); - - return true; -} - -bool QHelpProject::save(const QString &fileName) -{ - return true; -} - -QString QHelpProject::fileName() const -{ - return m_projectFile; -} - -QString QHelpProject::defaultPath() const -{ - return QString(); -} - -QString QHelpProject::suggestedFileName() const -{ - return QString(); -} - -QString QHelpProject::fileFilter() const -{ - return QString(); -} - -QString QHelpProject::fileExtension() const -{ - return QString(); -} - -bool QHelpProject::isModified() const -{ - return false; -} - -bool QHelpProject::isReadOnly() const -{ - return false; -} - -bool QHelpProject::isSaveAsAllowed() const -{ - return true; -} - -void QHelpProject::modified(QWorkbench::FileInterface::ReloadBehavior *behavior) -{ - -} - -IProjectManager *QHelpProject::projectManager() const -{ - return m_manager; -} - -QVariant QHelpProject::projectProperty(const QString &key) const -{ - return QVariant(); -} - -void QHelpProject::setProjectProperty(const QString &key, const QVariant &value) const -{ - -} - -void QHelpProject::executeProjectCommand(int cmd) -{ - -} - -bool QHelpProject::supportsProjectCommand(int cmd) -{ - return false; -} - -bool QHelpProject::hasProjectProperty(ProjectProperty property) const -{ - return false; -} - -QList QHelpProject::dependencies() -{ - return QList(); -} - -void QHelpProject::setExtraApplicationRunArguments(const QStringList &args) -{ - -} - -void QHelpProject::setCustomApplicationOutputHandler(QObject *handler) -{ - -} - -QStringList QHelpProject::files(const QList &fileMatcher) -{ - return m_files; -} - -ProjectItemInterface::ProjectItemKind QHelpProject::kind() const -{ - return ProjectItemInterface::Project; -} - -QString QHelpProject::name() const -{ - return m_name; -} - -QIcon QHelpProject::icon() const -{ - return QIcon(); -} diff --git a/src/plugins/qhelpproject/qhelpproject.h b/src/plugins/qhelpproject/qhelpproject.h deleted file mode 100644 index 5461e07f81d9c6d3d5a57c6b6c54ee20c534a8b8..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpproject.h +++ /dev/null @@ -1,111 +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 QHELPPROJECT_H -#define QHELPPROJECT_H - -#include - -#include - -namespace QHelpProjectPlugin { -namespace Internal { - -class QHelpProjectManager; -class QHelpProjectFolder; - -class QHelpProject : public QObject, - public ProjectExplorer::ProjectInterface -{ - Q_OBJECT - Q_INTERFACES(ProjectExplorer::ProjectInterface - ProjectExplorer::ProjectItemInterface - QWorkbench::FileInterface) - -public: - QHelpProject(QHelpProjectManager *manager); - ~QHelpProject(); - - bool open(const QString &fileName); - - //QWorkbench::FileInterface - bool save(const QString &fileName = QString()); - QString fileName() const; - - QString defaultPath() const; - QString suggestedFileName() const; - QString fileFilter() const; - QString fileExtension() const; - - bool isModified() const; - bool isReadOnly() const; - bool isSaveAsAllowed() const; - - void modified(QWorkbench::FileInterface::ReloadBehavior *behavior); - - //ProjectExplorer::ProjectInterface - ProjectExplorer::IProjectManager *projectManager() const; - - QVariant projectProperty(const QString &key) const; - void setProjectProperty(const QString &key, const QVariant &value) const; - - void executeProjectCommand(int cmd); - bool supportsProjectCommand(int cmd); - - bool hasProjectProperty(ProjectProperty property) const; - QList dependencies(); - - void setExtraApplicationRunArguments(const QStringList &args); - void setCustomApplicationOutputHandler(QObject *handler); - - QStringList files(const QList &fileMatcher); - - - //ProjectExplorer::ProjectItemInterface - ProjectItemKind kind() const; - - QString name() const; - QIcon icon() const; - -signals: - void buildFinished(const QString &error); - void changed(); - -private: - QHelpProjectManager *m_manager; - QHelpProjectFolder *m_filesFolder; - QString m_projectFile; - QString m_name; - QStringList m_files; -}; - -} // namespace Internal -} // namespace QHelpProject - -#endif // QHELPPROJECT_H diff --git a/src/plugins/qhelpproject/qhelpproject.pro b/src/plugins/qhelpproject/qhelpproject.pro deleted file mode 100644 index 667da0009bf88d61fbc52fdbfc7185dbf9ea8e1e..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpproject.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = lib -TARGET = QHelpProject - -include(../../qworkbenchplugin.pri) -include(../../../../helpsystem/qhelpsystem.pri) -include(../../plugins/coreplugin/coreplugin.pri) - -SOURCES += qhelpprojectmanager.cpp \ - qhelpproject.cpp \ - qhelpprojectitems.cpp - - -HEADERS += qhelpprojectmanager.h \ - qhelpproject.h \ - qhelpprojectitems.h - diff --git a/src/plugins/qhelpproject/qhelpprojectitems.cpp b/src/plugins/qhelpproject/qhelpprojectitems.cpp deleted file mode 100644 index 50afd0fc4a19a82d778ea32f16f362c27e44850a..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpprojectitems.cpp +++ /dev/null @@ -1,103 +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. -** -**************************************************************************/ - -#include "qhelpprojectitems.h" - -#include - -using namespace ProjectExplorer; -using namespace QHelpProjectPlugin::Internal; - -QIcon QHelpProjectFile::m_icon = QIcon(); -QIcon QHelpProjectFolder::m_icon = QIcon(); - -QHelpProjectFile::QHelpProjectFile(const QString &fileName) -{ - m_file = fileName; - - if (m_icon.isNull()) { - QFileIconProvider iconProvider; - m_icon = iconProvider.icon(QFileIconProvider::File); - } -} - -QString QHelpProjectFile::fullName() const -{ - return m_file; -} - -ProjectItemInterface::ProjectItemKind QHelpProjectFile::kind() const -{ - return ProjectItemInterface::ProjectFile; -} - -QString QHelpProjectFile::name() const -{ - QFileInfo fi(m_file); - return fi.fileName(); -} - -QIcon QHelpProjectFile::icon() const -{ - return m_icon; -} - - - -QHelpProjectFolder::QHelpProjectFolder() -{ - if (m_icon.isNull()) { - QFileIconProvider iconProvider; - m_icon = iconProvider.icon(QFileIconProvider::Folder); - } -} - -QHelpProjectFolder::~QHelpProjectFolder() -{ -} - -void QHelpProjectFolder::setName(const QString &name) -{ - m_name = name; -} - -ProjectItemInterface::ProjectItemKind QHelpProjectFolder::kind() const -{ - return ProjectItemInterface::ProjectFolder; -} - -QString QHelpProjectFolder::name() const -{ - return m_name; -} - -QIcon QHelpProjectFolder::icon() const -{ - return m_icon; -} diff --git a/src/plugins/qhelpproject/qhelpprojectitems.h b/src/plugins/qhelpproject/qhelpprojectitems.h deleted file mode 100644 index d5c6a55058ba6023594336e73d3cbbb52340e501..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpprojectitems.h +++ /dev/null @@ -1,87 +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 QHELPPROJECTITEMS_H -#define QHELPPROJECTITEMS_H - -#include - -#include - -namespace QHelpProjectPlugin { -namespace Internal { - -class QHelpProjectFile : public QObject, - public ProjectExplorer::ProjectFileInterface -{ - Q_OBJECT - Q_INTERFACES(ProjectExplorer::ProjectFileInterface ProjectExplorer::ProjectItemInterface) - -public: - QHelpProjectFile(const QString &fileName); - QString fullName() const; - - //ProjectExplorer::ProjectItemInterface - ProjectItemKind kind() const; - - QString name() const; - QIcon icon() const; - -private: - QString m_file; - static QIcon m_icon; -}; - -class QHelpProjectFolder : public QObject, - public ProjectExplorer::ProjectFolderInterface -{ - Q_OBJECT - Q_INTERFACES(ProjectExplorer::ProjectFolderInterface ProjectExplorer::ProjectItemInterface) - -public: - QHelpProjectFolder(); - ~QHelpProjectFolder(); - - void setName(const QString &name); - - //ProjectExplorer::ProjectItemInterface - ProjectItemKind kind() const; - - QString name() const; - QIcon icon() const; - -private: - QString m_name; - static QIcon m_icon; -}; - -} // namespace Internal -} // namespace QHelpProject - -#endif // QHELPPROJECTITEMS_H diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.cpp b/src/plugins/qhelpproject/qhelpprojectmanager.cpp deleted file mode 100644 index 9aaa42899d8a8d919ca101c5a25a23c2a082cb68..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpprojectmanager.cpp +++ /dev/null @@ -1,118 +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. -** -**************************************************************************/ - -#include "qhelpprojectmanager.h" -#include "qhelpproject.h" - -#include -#include -#include - -using namespace QHelpProjectPlugin::Internal; - -QHelpProjectManager::QHelpProjectManager() -{ -} - -QHelpProjectManager::~QHelpProjectManager() -{ -} - -bool QHelpProjectManager::init(ExtensionSystem::PluginManager *pm, QString *error_message) -{ - m_pm = pm; - m_core = m_pm->interface(); - QWorkbench::ActionManager *am = m_core->actionManager(); - - m_projectContext = m_core->uniqueIDManager()-> - uniqueIdentifier(QLatin1String("QHelpProject")); - - m_languageId = m_core->uniqueIDManager()-> - uniqueIdentifier(QLatin1String("QHelpLanguage")); - - m_projectExplorer = m_pm->interface(); - - return true; -} - -void QHelpProjectManager::extensionsInitialized() -{ -} - -void QHelpProjectManager::cleanup() -{ -} - -int QHelpProjectManager::projectContext() const -{ - return m_projectContext; -} - -int QHelpProjectManager::projectLanguage() const -{ - return m_languageId; -} - -bool QHelpProjectManager::canOpen(const QString &fileName) -{ - qDebug() << "can open " << fileName; - QFileInfo fi(fileName); - if (fi.suffix() == QLatin1String("qthp")) - return true; - return false; -} - -QList QHelpProjectManager::open(const QString &fileName) -{ - QList lst; - QHelpProject *pro = new QHelpProject(this); - if (pro->open(fileName)) { - lst.append(pro); - } else { - delete pro; - } - return lst; -} - -QString QHelpProjectManager::fileFilter() const -{ - return tr("Qt Help Project File (*.qthp)"); -} - -QVariant QHelpProjectManager::editorProperty(const QString &key) const -{ - return QVariant(); -} - -ProjectExplorer::ProjectExplorerInterface *QHelpProjectManager::projectExplorer() const -{ - return m_projectExplorer; -} - -Q_EXPORT_PLUGIN(QHelpProjectManager) diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.h b/src/plugins/qhelpproject/qhelpprojectmanager.h deleted file mode 100644 index 763774fa866efa1d393c183f9bddaa734cccac58..0000000000000000000000000000000000000000 --- a/src/plugins/qhelpproject/qhelpprojectmanager.h +++ /dev/null @@ -1,86 +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 QHELPPROJECTMANAGER_H -#define QHELPPROJECTMANAGER_H - -#include -#include - -#include -#include - -namespace Core { -class ICore; -} - -namespace QHelpProjectPlugin { -namespace Internal { - -class QHelpProjectManager : public QObject, - public ExtensionSystem::PluginInterface, - public ProjectExplorer::IProjectManager -{ - Q_OBJECT - Q_CLASSINFO("RequiredPlugin", "ProjectExplorer") - Q_INTERFACES(ExtensionSystem::PluginInterface - ProjectExplorer::IProjectManager) - -public: - QHelpProjectManager(); - ~QHelpProjectManager(); - - bool init(ExtensionSystem::PluginManager *pm, QString *error_message = 0); - void extensionsInitialized(); - void cleanup(); - - int projectContext() const; - int projectLanguage() const; - - bool canOpen(const QString &fileName); - QList open(const QString &fileName); - QString fileFilter() const; - - QVariant editorProperty(const QString &key) const; - - ProjectExplorer::ProjectExplorerInterface *projectExplorer() const; - -private: - ExtensionSystem::PluginManager *m_pm; - QWorkbench::ICore *m_core; - ProjectExplorer::ProjectExplorerInterface *m_projectExplorer; - - int m_projectContext; - int m_languageId; -}; - -} // namespace Internal -} // namespace QHelpProjectPlugin - -#endif // QHELPPROJECTMANAGER_H diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 36901bbc1c395f31e845ca7cff87f15147914f8d..ee4b5da2693fd605c931467375974a8cc2420019 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -38,7 +38,7 @@ #include "qt4runconfiguration.h" #include "qtversionmanager.h" #include "qt4nodes.h" -#include "qt4buildconfigwidget.h" +#include "qt4projectconfigwidget.h" #include "qt4buildenvironmentwidget.h" #include "qt4projectmanagerconstants.h" #include "projectloadwizard.h" @@ -788,7 +788,7 @@ void Qt4Project::setQtVersion(const QString &buildConfiguration, int id) BuildStepConfigWidget *Qt4Project::createConfigWidget() { - return new Qt4BuildConfigWidget(this); + return new Qt4ProjectConfigWidget(this); } QList Qt4Project::subConfigWidgets() diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index c92813aa2898132ee8816b08757c847317033eb4..fa43c9133bb226997e59abd62565826bb154a951 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -36,7 +36,6 @@ #include "profileeditorfactory.h" #include "qt4projectmanagerconstants.h" #include "qt4project.h" -#include "qmakebuildstepfactory.h" #include "qtversionmanager.h" #include "embeddedpropertiespage.h" #include "qt4runconfiguration.h"