diff options
Diffstat (limited to 'src/plugins/valgrindtoolbase')
14 files changed, 0 insertions, 880 deletions
diff --git a/src/plugins/valgrindtoolbase/ValgrindToolBase.pluginspec.in b/src/plugins/valgrindtoolbase/ValgrindToolBase.pluginspec.in deleted file mode 100644 index 2dcd6ed59e9..00000000000 --- a/src/plugins/valgrindtoolbase/ValgrindToolBase.pluginspec.in +++ /dev/null @@ -1,20 +0,0 @@ -<plugin name=\"ValgrindToolBase\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\"> - <vendor>Nokia Corporation</vendor> - <copyright>(C) 2011 Nokia Corporation</copyright> - <license> -Commercial Usage - -Licensees holding valid Qt Commercial licenses may use this plugin 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 plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. 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. - </license> - <category>Code Analyzer</category> - <description>Valgrind Tool Base Plugin</description> - <url>http://qt.nokia.com</url> - <dependencyList> - <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/> - <dependency name=\"AnalyzerBase\" version=\"$$QTCREATOR_VERSION\"/> - </dependencyList> -</plugin> diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp b/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp deleted file mode 100644 index c03775c7cf2..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator Instrumentation Tools -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#include "valgrindconfigwidget.h" - -#include "ui_valgrindconfigwidget.h" - -#include "valgrindsettings.h" - -#include <QtCore/QDebug> - -using namespace Valgrind::Internal; - -ValgrindConfigWidget::ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent) - : QWidget(parent), - m_settings(settings), - m_ui(new Ui::ValgrindConfigWidget) -{ - m_ui->setupUi(this); - - m_ui->valgrindExeChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); - m_ui->valgrindExeChooser->setPromptDialogTitle(tr("Valgrind Command")); - - m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable()); - connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)), m_settings, SLOT(setValgrindExecutable(QString))); - connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)), m_ui->valgrindExeChooser, SLOT(setPath(QString))); -} - -ValgrindConfigWidget::~ValgrindConfigWidget() -{ - delete m_ui; -} diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h b/src/plugins/valgrindtoolbase/valgrindconfigwidget.h deleted file mode 100644 index b63b88248fd..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.h +++ /dev/null @@ -1,66 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator Instrumentation Tools -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - - -#ifndef ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H -#define ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H - -#include <QtGui/QWidget> - -namespace Valgrind { -namespace Internal { - -namespace Ui { -class ValgrindConfigWidget; -} - -class ValgrindSettings; - -class ValgrindConfigWidget : public QWidget -{ - Q_OBJECT - -public: - ValgrindConfigWidget(ValgrindSettings *settings, QWidget *parent); - virtual ~ValgrindConfigWidget(); - -private: - ValgrindSettings *m_settings; - Ui::ValgrindConfigWidget *m_ui; -}; - -} -} - -#endif // ANALYZER_INTERNAL_VALGRINDCONFIGWIDGET_H diff --git a/src/plugins/valgrindtoolbase/valgrindconfigwidget.ui b/src/plugins/valgrindtoolbase/valgrindconfigwidget.ui deleted file mode 100644 index 2b929bfc4cd..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindconfigwidget.ui +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>Valgrind::Internal::ValgrindConfigWidget</class> - <widget class="QWidget" name="Valgrind::Internal::ValgrindConfigWidget"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>445</width> - <height>543</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="commonValgrindOptions"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Generic Settings</string> - </property> - <layout class="QFormLayout" name="formLayout"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="valgrindExeLabel"> - <property name="text"> - <string>Valgrind executable:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="Utils::PathChooser" name="valgrindExeChooser" native="true"/> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>Utils::PathChooser</class> - <extends>QWidget</extends> - <header location="global">utils/pathchooser.h</header> - <container>1</container> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/src/plugins/valgrindtoolbase/valgrindengine.cpp b/src/plugins/valgrindtoolbase/valgrindengine.cpp deleted file mode 100644 index 71c9a9743a0..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindengine.cpp +++ /dev/null @@ -1,197 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Nicolas Arnaud-Cormos, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#include "valgrindengine.h" -#include "valgrindsettings.h" - -#include <coreplugin/icore.h> -#include <coreplugin/ioutputpane.h> -#include <coreplugin/progressmanager/progressmanager.h> -#include <coreplugin/progressmanager/futureprogress.h> -#include <extensionsystem/pluginmanager.h> -#include <projectexplorer/applicationrunconfiguration.h> -#include <analyzerbase/analyzermanager.h> - -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> - -#define VALGRIND_DEBUG_OUTPUT 0 - -using namespace Analyzer; -using namespace Valgrind::Internal; -using namespace Utils; - -ValgrindEngine::ValgrindEngine(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration) - : IAnalyzerEngine(sp, runConfiguration), - m_settings(0), - m_progress(new QFutureInterface<void>()), - m_progressWatcher(new QFutureWatcher<void>()), - m_isStopping(false) -{ - if (runConfiguration) - m_settings = runConfiguration->extraAspect<AnalyzerProjectSettings>(); - - if (!m_settings) - m_settings = AnalyzerGlobalSettings::instance(); - - connect(m_progressWatcher, SIGNAL(canceled()), - this, SLOT(handleProgressCanceled())); - connect(m_progressWatcher, SIGNAL(finished()), - this, SLOT(handleProgressFinished())); -} - -ValgrindEngine::~ValgrindEngine() -{ - delete m_progress; -} - -void ValgrindEngine::start() -{ - emit starting(this); - - Core::FutureProgress *fp = Core::ICore::instance()->progressManager()->addTask(m_progress->future(), - progressTitle(), "valgrind"); - fp->setKeepOnFinish(Core::FutureProgress::DontKeepOnFinish); - m_progress->reportStarted(); - m_progressWatcher->setFuture(m_progress->future()); - -#if VALGRIND_DEBUG_OUTPUT - emit standardOutputReceived(tr("Valgrind options: %1").arg(toolArguments().join(" "))); - emit standardOutputReceived(tr("Working directory: %1").arg(m_workingDirectory)); - emit standardOutputReceived(tr("Command-line arguments: %1").arg(m_commandLineArguments)); -#endif - - const AnalyzerStartParameters &sp = startParameters(); - runner()->setWorkingDirectory(sp.workingDirectory); - QString valgrindExe = m_settings->subConfig<ValgrindSettings>()->valgrindExecutable(); - if (!sp.analyzerCmdPrefix.isEmpty()) - valgrindExe = sp.analyzerCmdPrefix + ' ' + valgrindExe; - runner()->setValgrindExecutable(valgrindExe); - runner()->setValgrindArguments(toolArguments()); - runner()->setDebuggeeExecutable(sp.debuggee); - runner()->setDebuggeeArguments(sp.debuggeeArgs); - runner()->setEnvironment(sp.environment); - - connect(runner(), SIGNAL(standardOutputReceived(QByteArray)), - SLOT(receiveStandardOutput(QByteArray))); - connect(runner(), SIGNAL(standardErrorReceived(QByteArray)), - SLOT(receiveStandardError(QByteArray))); - connect(runner(), SIGNAL(processErrorReceived(QString, QProcess::ProcessError)), - SLOT(receiveProcessError(QString, QProcess::ProcessError))); - connect(runner(), SIGNAL(finished()), - SLOT(runnerFinished())); - - if (sp.startMode == StartRemote) - runner()->startRemotely(sp.connParams); - else - runner()->start(); -} - -void ValgrindEngine::stop() -{ - m_isStopping = true; - runner()->stop(); -} - -QString ValgrindEngine::executable() const -{ - return startParameters().debuggee; -} - -void ValgrindEngine::handleProgressCanceled() -{ - AnalyzerManager::instance()->stopTool(); -} - -void ValgrindEngine::handleProgressFinished() -{ - QApplication::alert(Core::ICore::instance()->mainWindow(), 3000); -} - -void ValgrindEngine::runnerFinished() -{ - emit standardOutputReceived(tr("** Analyzing finished **")); - emit finished(); - - m_progress->reportFinished(); - - disconnect(runner(), SIGNAL(standardOutputReceived(QByteArray)), - this, SLOT(receiveStandardOutput(QByteArray))); - disconnect(runner(), SIGNAL(standardErrorReceived(QByteArray)), - this, SLOT(receiveStandardError(QByteArray))); - disconnect(runner(), SIGNAL(processErrorReceived(QString, QProcess::ProcessError)), - this, SLOT(receiveProcessError(QString, QProcess::ProcessError))); - disconnect(runner(), SIGNAL(finished()), - this, SLOT(runnerFinished())); -} - -void ValgrindEngine::receiveStandardOutput(const QByteArray &b) -{ - emit standardOutputReceived(QString::fromLocal8Bit(b)); -} - -void ValgrindEngine::receiveStandardError(const QByteArray &b) -{ - emit standardErrorReceived(QString::fromLocal8Bit(b)); -} - -void ValgrindEngine::receiveProcessError(const QString &error, QProcess::ProcessError e) -{ - if (e == QProcess::FailedToStart) { - const QString &valgrind = m_settings->subConfig<ValgrindSettings>()->valgrindExecutable(); - if (!valgrind.isEmpty()) { - emit standardErrorReceived(tr("** Error: \"%1\" could not be started: %2 **").arg(valgrind).arg(error)); - } else { - emit standardErrorReceived(tr("** Error: no valgrind executable set **")); - } - } else if (m_isStopping && e == QProcess::Crashed) { // process gets killed on stop - emit standardErrorReceived(tr("** Process Terminated **")); - } else { - emit standardErrorReceived(QString("** %1 **").arg(error)); - } - - if (m_isStopping) - return; - - ///FIXME: get a better API for this into Qt Creator - ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); - QList<Core::IOutputPane *> panes = pm->getObjects<Core::IOutputPane>(); - foreach (Core::IOutputPane *pane, panes) { - if (pane->displayName() == tr("Application Output")) { - pane->popup(false); - break; - } - } -} diff --git a/src/plugins/valgrindtoolbase/valgrindengine.h b/src/plugins/valgrindtoolbase/valgrindengine.h deleted file mode 100644 index 371fe461451..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindengine.h +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Nicolas Arnaud-Cormos, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#ifndef VALGRINDENGINE_H -#define VALGRINDENGINE_H - -#include <analyzerbase/ianalyzerengine.h> - -#include "valgrindtoolbase_global.h" - -#include <analyzerbase/ianalyzerengine.h> - -#include <utils/environment.h> - -#include <valgrind/valgrindrunner.h> - -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QFutureInterface> -#include <QtCore/QFutureWatcher> - -namespace Analyzer { -class AnalyzerSettings; -} - -namespace Valgrind { -namespace Internal { - -class VALGRINDTOOLBASE_EXPORT ValgrindEngine : public Analyzer::IAnalyzerEngine -{ - Q_OBJECT -public: - explicit ValgrindEngine(const Analyzer::AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration); - virtual ~ValgrindEngine(); - - void start(); - void stop(); - - QString executable() const; - -protected: - virtual QString progressTitle() const = 0; - virtual QStringList toolArguments() const = 0; - virtual Valgrind::ValgrindRunner *runner() = 0; - - Analyzer::AnalyzerSettings *m_settings; - QFutureInterface<void> *m_progress; - QFutureWatcher<void> *m_progressWatcher; - -private slots: - void handleProgressCanceled(); - void handleProgressFinished(); - void runnerFinished(); - - void receiveStandardOutput(const QByteArray &); - void receiveStandardError(const QByteArray &); - void receiveProcessError(const QString &, QProcess::ProcessError); - -private: - bool m_isStopping; -}; - -} // namespace Internal -} // namespace Valgrind - -#endif // VALGRINDENGINE_H diff --git a/src/plugins/valgrindtoolbase/valgrindsettings.cpp b/src/plugins/valgrindtoolbase/valgrindsettings.cpp deleted file mode 100644 index 69b7eecb715..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindsettings.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator Instrumentation Tools -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#include "valgrindsettings.h" - -#include "valgrindconfigwidget.h" - -#include <coreplugin/icore.h> -#include <utils/qtcassert.h> - -#include <QtCore/QSettings> - -using namespace Valgrind::Internal; -using namespace Analyzer; - -static const QLatin1String groupC("Analyzer"); - -static const QLatin1String valgrindExeC("Analyzer.Valgrind.ValgrindExecutable"); - -QVariantMap ValgrindSettings::defaults() const -{ - QVariantMap map; - map.insert(valgrindExeC, QLatin1String("valgrind")); - return map; -} - -bool ValgrindSettings::fromMap(const QVariantMap &map) -{ - setIfPresent(map, valgrindExeC, &m_valgrindExecutable); - return true; -} - -QVariantMap ValgrindSettings::toMap() const -{ - QVariantMap map; - map.insert(valgrindExeC, m_valgrindExecutable); - - return map; -} - -void ValgrindSettings::setValgrindExecutable(const QString &valgrindExecutable) -{ - if (m_valgrindExecutable != valgrindExecutable) { - m_valgrindExecutable = valgrindExecutable; - emit valgrindExecutableChanged(valgrindExecutable); - } -} - -QString ValgrindSettings::valgrindExecutable() const -{ - return m_valgrindExecutable; -} - -QString ValgrindSettings::id() const -{ - return "Analyzer.Valgrind.Settings.Generic"; -} - -QString ValgrindSettings::displayName() const -{ - return tr("Generic Settings"); -} - -QWidget *ValgrindSettings::createConfigWidget(QWidget *parent) -{ - return new ValgrindConfigWidget(this, parent); -} diff --git a/src/plugins/valgrindtoolbase/valgrindsettings.h b/src/plugins/valgrindtoolbase/valgrindsettings.h deleted file mode 100644 index 99f596f6258..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindsettings.h +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator Instrumentation Tools -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#ifndef ANALYZER_INTERNAL_VALGRINDSETTINGS_H -#define ANALYZER_INTERNAL_VALGRINDSETTINGS_H - -#include <analyzerbase/analyzersettings.h> - -#include "valgrindtoolbase_global.h" - -#include <QtCore/QObject> -#include <QtCore/QVariant> - -namespace Valgrind { -namespace Internal { - -/** - * Generic Valgrind settings shared by all tools. - */ -class VALGRINDTOOLBASE_EXPORT ValgrindSettings : public Analyzer::AbstractAnalyzerSubConfig -{ - Q_OBJECT -public: - ValgrindSettings() {} - - virtual QVariantMap toMap() const; - virtual QVariantMap defaults() const; - - QString valgrindExecutable() const; - - virtual QString id() const; - virtual QString displayName() const; - virtual QWidget *createConfigWidget(QWidget *parent); - -public slots: - void setValgrindExecutable(const QString &); - -signals: - void valgrindExecutableChanged(const QString &); - -protected: - virtual bool fromMap(const QVariantMap &map); - -private: - QString m_valgrindExecutable; -}; - -} // namespace Internal -} // namespace Valgrind - -#endif // VALGRIND_INTERNAL_ANALZYZERSETTINGS_H diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbase.pri b/src/plugins/valgrindtoolbase/valgrindtoolbase.pri deleted file mode 100644 index 0ffb7c37dcb..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbase.pri +++ /dev/null @@ -1,4 +0,0 @@ -include(valgrindtoolbase_dependencies.pri) - -INCLUDEPATH += $$PWD -LIBS *= -l$$qtLibraryName(ValgrindToolBase) diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbase.pro b/src/plugins/valgrindtoolbase/valgrindtoolbase.pro deleted file mode 100644 index 45ca6d694c8..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbase.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = lib -TARGET = ValgrindToolBase - -DEFINES += VALGRINDTOOLBASE_LIBRARY - -include(../../qtcreatorplugin.pri) -include(valgrindtoolbase_dependencies.pri) - -QT += network - -# Valgrind Tool Base files - -HEADERS += \ - valgrindtoolbaseplugin.h \ - valgrindtoolbase_global.h \ - valgrindengine.h \ - valgrindconfigwidget.h \ - valgrindsettings.h - -SOURCES += \ - valgrindtoolbaseplugin.cpp \ - valgrindengine.cpp \ - valgrindconfigwidget.cpp \ - valgrindsettings.cpp - -FORMS += \ - valgrindconfigwidget.ui diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbase_dependencies.pri b/src/plugins/valgrindtoolbase/valgrindtoolbase_dependencies.pri deleted file mode 100644 index 702132b903b..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbase_dependencies.pri +++ /dev/null @@ -1,3 +0,0 @@ -include(../../plugins/coreplugin/coreplugin.pri) -include(../../plugins/analyzerbase/analyzerbase.pri) -include(../../libs/valgrind/valgrind.pri)
\ No newline at end of file diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbase_global.h b/src/plugins/valgrindtoolbase/valgrindtoolbase_global.h deleted file mode 100644 index 27ce52a837f..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbase_global.h +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Nicolas Arnaud-Cormos, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#ifndef VALGRINDTOOLBASE_GLOBAL_H -#define VALGRINDTOOLBASE_GLOBAL_H - -#include <QtCore/qglobal.h> - -#if defined(VALGRINDTOOLBASE_LIBRARY) -# define VALGRINDTOOLBASE_EXPORT Q_DECL_EXPORT -#else -# define VALGRINDTOOLBASE_EXPORT Q_DECL_IMPORT -#endif - -#endif // VALGRINDTOOLBASE_GLOBAL_H diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp b/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp deleted file mode 100644 index 8804348cfdc..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#include "valgrindtoolbaseplugin.h" - -#include "valgrindsettings.h" - -#include <analyzerbase/analyzersettings.h> - -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> - -using namespace Analyzer; -using namespace Valgrind::Internal; - - -static AbstractAnalyzerSubConfig *configFactory() -{ - return new ValgrindSettings(); -} - -bool ValgrindToolbasePlugin::initialize(const QStringList &/*arguments*/, QString */*errorString*/) -{ - AnalyzerGlobalSettings::instance()->registerSubConfigs(&configFactory, &configFactory); - return true; -} - - -void ValgrindToolbasePlugin::extensionsInitialized() -{ - -} - -Q_EXPORT_PLUGIN(ValgrindToolbasePlugin) diff --git a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.h b/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.h deleted file mode 100644 index ffb872fda4b..00000000000 --- a/src/plugins/valgrindtoolbase/valgrindtoolbaseplugin.h +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Author: Milian Wolff, KDAB ([email protected]) -** -** Contact: Nokia Corporation ([email protected]) -** -** -** GNU Lesser General Public License Usage -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. -** -**************************************************************************/ - -#ifndef VALGRINDTOOLBASEPLUGIN_H -#define VALGRINDTOOLBASEPLUGIN_H - -#include <extensionsystem/iplugin.h> - -namespace Valgrind { -namespace Internal { - -class ValgrindToolbasePlugin : public ExtensionSystem::IPlugin -{ - Q_OBJECT - -public: - ValgrindToolbasePlugin() {} - - virtual bool initialize(const QStringList &arguments, QString *errorString); - virtual void extensionsInitialized(); -}; - -} // namespace Internal -} // namespace Valgrind - -#endif // VALGRINDTOOLBASEPLUGIN_H |