diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index a1a6f803594fd19d0e3faaacebabb36e98a9dbce..6d1c4fe5cef338265d3531b3ced45cdac2d87ec8 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -22,9 +22,7 @@ SUBDIRS = plugin_coreplugin \
plugin_qt4projectmanager \
plugin_locator \
plugin_debugger \
-# plugin_qtestlib \ # this seems to be dead
plugin_help \
-# plugin_regexp \ # don't know what to do with this
plugin_cpaster \
plugin_cmakeprojectmanager \
plugin_fakevim \
diff --git a/src/plugins/qtestlib/QTestLibPlugin.qwp b/src/plugins/qtestlib/QTestLibPlugin.qwp
deleted file mode 100644
index 3b9ffe654b734684b3328b4f3ce114bc506d9cc5..0000000000000000000000000000000000000000
--- a/src/plugins/qtestlib/QTestLibPlugin.qwp
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE QtCreatorManifest>
-<qwp>
- <pluginName>QTestLibPlugin</pluginName>
- <author>Trolltech</author>
- <requiredPluginList>
- <requiredPlugin>
- <name>ProjectExplorer</name>
- <provider></provider>
- </requiredPlugin>
- </requiredPluginList>
- <extendsInterfaceList>
- <extendsInterface>
- <name>Core::OutputPaneInterface</name>
- </extendsInterface>
- </extendsInterfaceList>
-</qwp>
diff --git a/src/plugins/qtestlib/images/pass.png b/src/plugins/qtestlib/images/pass.png
deleted file mode 100644
index b5238f7680a8aae6176f715786077081f5e02904..0000000000000000000000000000000000000000
Binary files a/src/plugins/qtestlib/images/pass.png and /dev/null differ
diff --git a/src/plugins/qtestlib/qtestlib.pro b/src/plugins/qtestlib/qtestlib.pro
deleted file mode 100644
index 68dbecd57b23f081d16f68689306b242824741b4..0000000000000000000000000000000000000000
--- a/src/plugins/qtestlib/qtestlib.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = lib
-TARGET = QTestLibPlugin
-QT += xml
-
-include(../../qtcreatorplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
-
-SOURCES += qtestlibplugin.cpp
-HEADERS += qtestlibplugin.h
-RESOURCES += qtestlib.qrc
-
-LIBS += -lProjectExplorer \
- -lQuickOpen \
- -lUtils
diff --git a/src/plugins/qtestlib/qtestlib.qrc b/src/plugins/qtestlib/qtestlib.qrc
deleted file mode 100644
index fc0610e954e7de7d98a7d0c9ef19d78a377cffda..0000000000000000000000000000000000000000
--- a/src/plugins/qtestlib/qtestlib.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/Trolltech/QTestLibPlugin">
- <file>images/pass.png</file>
-</qresource>
-</RCC>
diff --git a/src/plugins/qtestlib/qtestlibplugin.cpp b/src/plugins/qtestlib/qtestlibplugin.cpp
deleted file mode 100644
index 5d8ab7cdb2d23fcb52375538fc72eeae6c92fd14..0000000000000000000000000000000000000000
--- a/src/plugins/qtestlib/qtestlibplugin.cpp
+++ /dev/null
@@ -1,500 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#include "qtestlibplugin.h"
-
-#include <coreplugin/icore.h>
-#include <texteditor/itexteditor.h>
-
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QtPlugin>
-#include <QtGui/QAction>
-#include <QtGui/QComboBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QIcon>
-#include <QtGui/QKeySequence>
-#include <QtGui/QLabel>
-#include <QtGui/QSplitter>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QTextEdit>
-#include <QtGui/QTreeView>
-#include <QtGui/QVBoxLayout>
-#include <QtXml/QDomDocument>
-
-using namespace QTestLib::Internal;
-
-static QString incidentString(QTestFunction::IncidentType type)
-{
- static QMap<QTestFunction::IncidentType, QString> strings;
- if (strings.empty()) {
- strings.insert(QTestFunction::Pass, QObject::tr("Pass"));
- strings.insert(QTestFunction::XFail, QObject::tr("Expected Failure"));
- strings.insert(QTestFunction::Fail, QObject::tr("Failure"));
- strings.insert(QTestFunction::XPass, QObject::tr("Expected Pass"));
- }
- return strings.value(type, QString());
-}
-
-static QString messageString(QTestFunction::MessageType type)
-{
- static QMap<QTestFunction::MessageType, QString> strings;
- if (strings.empty()) {
- strings.insert(QTestFunction::Warning, QObject::tr("Warning"));
- strings.insert(QTestFunction::QWarning, QObject::tr("Qt Warning"));
- strings.insert(QTestFunction::QDebug, QObject::tr("Qt Debug"));
- strings.insert(QTestFunction::QSystem, QObject::tr("Critical"));
- strings.insert(QTestFunction::QFatal, QObject::tr("Fatal"));
- strings.insert(QTestFunction::Skip, QObject::tr("Skipped"));
- strings.insert(QTestFunction::Info, QObject::tr("Info"));
- }
- return strings.value(type, QString());
-}
-
-static QTestFunction::IncidentType stringToIncident(const QString &str)
-{
- if (str == QLatin1String("pass"))
- return QTestFunction::Pass;
- else if (str == QLatin1String("fail"))
- return QTestFunction::Fail;
- else if (str == QLatin1String("xfail"))
- return QTestFunction::XFail;
- else if (str == QLatin1String("xpass"))
- return QTestFunction::XPass;
- return QTestFunction::Fail; // ...
-}
-
-static QTestFunction::MessageType stringToMessageType(const QString &str)
-{
- if (str == QLatin1String("warn"))
- return QTestFunction::Warning;
- else if (str == QLatin1String("system"))
- return QTestFunction::QSystem;
- else if (str == QLatin1String("qdebug"))
- return QTestFunction::QDebug;
- else if (str == QLatin1String("qwarn"))
- return QTestFunction::QWarning;
- else if (str == QLatin1String("qfatal"))
- return QTestFunction::QFatal;
- else if (str == QLatin1String("skip"))
- return QTestFunction::Skip;
- else if (str == QLatin1String("info"))
- return QTestFunction::Info;
- return QTestFunction::QSystem; // ...
-}
-
-// -----------------------------------
-QTestLibPlugin::QTestLibPlugin()
- : m_projectExplorer(0), m_outputPane(0)
-{
-}
-
-QTestLibPlugin::~QTestLibPlugin()
-{
- if (m_outputPane)
- ExtensionSystem::PluginManager::instance()->removeObject(m_outputPane);
-}
-
-bool QTestLibPlugin::init(const QStringList &arguments, QString *errorMessage)
-{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
- m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
- connect(m_projectExplorer, SIGNAL(aboutToExecuteProject(ProjectExplorer::Project *)),
- this, SLOT(projectRunHook(ProjectExplorer::Project *)));
-
- m_outputPane = new QTestOutputPane(this);
- ExtensionSystem::PluginManager::instance()->addObject(m_outputPane);
-
- return true;
-}
-
-void QTestLibPlugin::extensionsInitialized()
-{
-}
-
-void QTestLibPlugin::projectRunHook(ProjectExplorer::Project *proj)
-{
- return; //NBS TODO QTestlibplugin
- if (!proj)
- return;
-
- m_projectDirectory.clear();
- //NBS proj->setExtraApplicationRunArguments(QStringList());
- //NBS proj->setCustomApplicationOutputHandler(0);
-
- const QVariant config; //NBS = proj->projectProperty(ProjectExplorer::Constants::P_CONFIGVAR);
- if (!config.toStringList().contains(QLatin1String("qtestlib")))
- return;
-
- {
- QTemporaryFile tempFile;
- tempFile.setAutoRemove(false);
- tempFile.open();
- m_outputFile = tempFile.fileName();
- }
-
- //NBS proj->setCustomApplicationOutputHandler(this);
- //NBS proj->setExtraApplicationRunArguments(QStringList() << QLatin1String("-xml") << QLatin1String("-o") << m_outputFile);
-// const QString proFile = proj->fileName();
-// const QFileInfo fi(proFile);
-// if (QFile::exists(fi.absolutePath()))
-// m_projectDirectory = fi.absolutePath();
-}
-
-void QTestLibPlugin::clear()
-{
- m_projectExplorer->applicationOutputWindow()->clear();
-}
-
-void QTestLibPlugin::appendOutput(const QString &out)
-{
- m_projectExplorer->applicationOutputWindow()->appendOutput(out);
-}
-
-void QTestLibPlugin::processExited(int exitCode)
-{
- m_projectExplorer->applicationOutputWindow()->processExited(exitCode);
-
- QFile f(m_outputFile);
- if (!f.open(QIODevice::ReadOnly))
- return;
-
- QDomDocument doc;
- if (!doc.setContent(&f))
- return;
-
- f.close();
- f.remove();
-
- m_outputPane->clearContents();
-
- const QString testFunctionTag = QLatin1String("TestFunction");
- const QString nameAttr = QLatin1String("name");
- const QString typeAttr = QLatin1String("type");
- const QString incidentTag = QLatin1String("Incident");
- const QString fileAttr = QLatin1String("file");
- const QString lineAttr = QLatin1String("line");
- const QString messageTag = QLatin1String("Message");
- const QString descriptionItem = QLatin1String("Description");
-
- for (QDomElement testElement = doc.documentElement().firstChildElement();
- !testElement.isNull(); testElement = testElement.nextSiblingElement()) {
-
- if (testElement.tagName() != testFunctionTag)
- continue;
-
- QTestFunction *function = new QTestFunction(testElement.attribute(nameAttr));
-
- for (QDomElement e = testElement.firstChildElement();
- !e.isNull(); e = e.nextSiblingElement()) {
-
- const QString type = e.attribute(typeAttr);
-
- if (e.tagName() == incidentTag) {
- QString file = e.attribute(fileAttr);
-
- if (!file.isEmpty()
- && QFileInfo(file).isRelative()
- && !m_projectDirectory.isEmpty()) {
-
- QFileInfo fi(m_projectDirectory, file);
- if (fi.exists())
- file = fi.absoluteFilePath();
- }
-
- const QString line = e.attribute(lineAttr);
- const QString details = e.text();
-
- QTestFunction::IncidentType itype = stringToIncident(type);
- function->addIncident(itype, file, line, details);
- } else if (e.tagName() == messageTag ) {
- QTestFunction::MessageType msgType = stringToMessageType(type);
- function->addMessage(msgType, e.namedItem(descriptionItem).toElement().text());
- }
- }
-
- m_outputPane->addFunction(function);
- }
-
- m_outputPane->show();
-}
-
-// -------- QTestFunction
-void QTestFunction::addIncident(IncidentType type,
- const QString &file,
- const QString &line,
- const QString &details)
-{
- QStandardItem *status = new QStandardItem(incidentString(type));
- status->setData(QVariant::fromValue(type));
-
- switch (type) {
- case QTestFunction::Pass: status->setForeground(Qt::green); break;
- case QTestFunction::Fail: status->setForeground(Qt::red); break;
- case QTestFunction::XFail: status->setForeground(Qt::darkMagenta); break;
- case QTestFunction::XPass: status->setForeground(Qt::darkGreen); break;
- }
-
- QStandardItem *location = new QStandardItem;
- if (!file.isEmpty()) {
- location->setText(file + QLatin1Char(':') + line);
- location->setForeground(Qt::red);
-
- QTestLocation loc;
- loc.file = file;
- loc.line = line;
- location->setData(QVariant::fromValue(loc));
- }
-
- appendRow(QList<QStandardItem *>() << status << location);
-
- if (!details.isEmpty()) {
- status->setColumnCount(2);
- status->appendRow(QList<QStandardItem *>() << new QStandardItem() << new QStandardItem(details));
- }
-}
-
-void QTestFunction::addMessage(MessageType type, const QString &text)
-{
- QStandardItem *status = new QStandardItem(messageString(type));
- status->setData(QVariant::fromValue(type));
- QStandardItem *msg = new QStandardItem(text);
- appendRow(QList<QStandardItem *>() << status << msg);
-}
-
-bool QTestFunction::indexHasIncidents(const QModelIndex &function, IncidentType type)
-{
- if (!function.isValid())
- return false;
- const QAbstractItemModel *m = function.model();
- if (!m->hasChildren(function))
- return false;
-
- const int rows = m->rowCount(function);
- for (int row = 0; row < rows; ++row) {
- const QModelIndex child = m->index(row, 0, function);
-
- QVariant tag = child.data(Qt::UserRole + 1);
- if (tag.type() != QVariant::UserType
- || tag.userType() != qMetaTypeId<QTestFunction::IncidentType>())
- continue;
-
- if (tag.value<QTestFunction::IncidentType>() == type)
- return true;
- }
-
- return false;
-}
-
-// -------------- QTestOutputPane
-
-QTestOutputPane::QTestOutputPane(QTestLibPlugin *plugin)
- : QObject(plugin),
- m_plugin(plugin),
- m_widget(0),
- m_model(new QStandardItemModel(this))
-{
- clearContents();
-}
-
-void QTestOutputPane::addFunction(QTestFunction *function)
-{
- m_model->appendRow(function);
-}
-
-QWidget *QTestOutputPane::outputWidget(QWidget *parent)
-{
- if (!m_widget)
- m_widget = new QTestOutputWidget(m_model, m_plugin->coreInterface(), parent);
- return m_widget;
-}
-
-QString QTestOutputPane::name() const
-{
- return tr("Test Results");
-}
-
-void QTestOutputPane::clearContents()
-{
- m_model->clear();
- m_model->setColumnCount(2);
- m_model->setHorizontalHeaderLabels(QStringList() << tr("Result") << tr("Message"));
-}
-
-void QTestOutputPane::visibilityChanged(bool visible)
-{
- Q_UNUSED(visible)
-}
-
-void QTestOutputPane::show()
-{
- if (m_widget)
- m_widget->expand();
- emit showPage();
-}
-
-// -------- QTestOutputFilter
-bool QTestOutputFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
- if (sourceParent.isValid()) {
- return true;
- }
-
- QModelIndex idx = sourceModel()->index(sourceRow, 0);
- if (QTestFunction::indexHasIncidents(idx, m_filter))
- return true;
- else
- return false;
-}
-
-// ------- QTestOutputWidget
-
-
-QTestOutputWidget::QTestOutputWidget(QStandardItemModel *model, QWidget *parent)
- : QWidget(parent),
- m_model(model),
- m_resultsView(new QTreeView(this)),
- m_filterCombo(new QComboBox(this)),
- m_filterModel(new QTestOutputFilter(this))
-{
- m_resultsView->setModel(model);
- m_resultsView->setEditTriggers(QAbstractItemView::NoEditTriggers);
- m_resultsView->header()->setStretchLastSection(true);
- connect(m_resultsView, SIGNAL(activated(const QModelIndex &)),
- this, SLOT(gotoLocation(QModelIndex)));
-
- m_filterCombo->addItem(tr("All Incidents"));
- m_filterCombo->addItem(incidentString(QTestFunction::Fail), QVariant::fromValue(QTestFunction::Fail));
- m_filterCombo->addItem(incidentString(QTestFunction::Pass), QVariant::fromValue(QTestFunction::Pass));
- m_filterCombo->addItem(incidentString(QTestFunction::XFail), QVariant::fromValue(QTestFunction::XFail));
- m_filterCombo->addItem(incidentString(QTestFunction::XPass), QVariant::fromValue(QTestFunction::XPass));
- connect(m_filterCombo, SIGNAL(activated(int)),
- this, SLOT(activateComboFilter(int)));
-
- QHBoxLayout *filterLayout = new QHBoxLayout;
- filterLayout->addWidget(new QLabel(tr("Show Only:"), this));
- filterLayout->addWidget(m_filterCombo);
- filterLayout->addStretch();
-
- QVBoxLayout *layout = new QVBoxLayout(this);
- layout->addLayout(filterLayout);
- layout->addWidget(m_resultsView);
-
- m_filterModel->setDynamicSortFilter(true);
- m_filterModel->setSourceModel(m_model);
-}
-
-void QTestOutputWidget::expand()
-{
- /*
- const QAbstractItemModel *m = m_resultsView->model();
- for (int r = 0, count = m->rowCount(); r < count; ++r) {
- m_resultsView->expand(m->index(r, 0));
- }
- */
- m_resultsView->expandAll();
- m_resultsView->header()->resizeSections(QHeaderView::ResizeToContents);
-}
-
-void QTestOutputWidget::activateComboFilter(int index)
-{
- QVariant tag = m_filterCombo->itemData(index);
- if (!tag.isValid()) {
- if (m_resultsView->model() != m_model)
- m_resultsView->setModel(m_model);
- } else {
-
- QTestFunction::IncidentType incident = tag.value<QTestFunction::IncidentType>();
- m_filterModel->setIncidentFilter(incident);
-
- if (m_resultsView->model() != m_filterModel)
- m_resultsView->setModel(m_filterModel);
- }
- expand();
-}
-
-void QTestOutputWidget::gotoLocation(QModelIndex index)
-{
- if (!index.isValid())
- return;
-
- if (m_resultsView->model() == m_filterModel)
- index = m_filterModel->mapToSource(index);
-
- if (!index.isValid())
- return;
-
- const QAbstractItemModel *m = index.model();
-
- QModelIndex parent = index.parent();
- if (!parent.isValid())
- return;
-
- QModelIndex functionIndex = parent;
- QModelIndex failureIndex = index;
-
- QModelIndex grandParent = parent.parent();
- if (grandParent.isValid()) {
- functionIndex = grandParent;
- failureIndex = parent;
- }
-
- if (!functionIndex.isValid())
- return;
-
- QModelIndex locationIndex = m->index(failureIndex.row(), 1, functionIndex);
- if (!locationIndex.isValid())
- return;
-
- QVariant tag = locationIndex.data(Qt::UserRole + 1);
- if (tag.type() != QVariant::UserType
- || tag.userType() != qMetaTypeId<QTestLocation>())
- return;
-
- QTestLocation loc = tag.value<QTestLocation>();
-
- Core::ICore::instance()->editorManager()->openEditor(loc.file);
- Core::EditorInterface *edtIface = Core::ICore::instance()->editorManager()->currentEditor();
- if (!edtIface)
- return;
- TextEditor::ITextEditor *editor =
- qobject_cast<TextEditor::ITextEditor*>(edtIface->qObject());
- if (!editor)
- return;
-
- editor->gotoLine(loc.line.toInt());
-}
-
-Q_EXPORT_PLUGIN(QTestLibPlugin)
diff --git a/src/plugins/qtestlib/qtestlibplugin.h b/src/plugins/qtestlib/qtestlibplugin.h
deleted file mode 100644
index a8288bed43d7795e161830ec3c83e34ba33df998..0000000000000000000000000000000000000000
--- a/src/plugins/qtestlib/qtestlibplugin.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#ifndef QTESTLIBPLUGIN_H
-#define QTESTLIBPLUGIN_H
-
-#include <coreplugin/ioutputpane.h>
-#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/projectexplorer.h>
-
-#include <QtGui/QPixmap>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItem>
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-class QComboBox;
-class QStandardItemModel;
-class QTextEdit;
-class QTreeView;
-QT_END_NAMESPACE
-
-namespace QTestLib {
-namespace Internal {
-
-class QTestLibPlugin;
-class QTestOutputWidget;
-
-struct QTestLocation
-{
- QString file;
- QString line;
-};
-
-class QTestFunction : public QStandardItem
-{
-public:
- enum IncidentType {
- Pass,
- XFail,
- Fail,
- XPass
- };
-
- enum MessageType {
- Warning,
- QWarning,
- QDebug,
- QSystem,
- QFatal,
- Skip,
- Info
- };
-
- inline QTestFunction(const QString &name)
- : QStandardItem(name) {
- setColumnCount(2);
- // ### hardcoding colors sucks...
- setForeground(Qt::darkBlue);
- }
-
- void addIncident(IncidentType type,
- const QString &file = QString(),
- const QString &line = QString(),
- const QString &details = QString());
-
- void addMessage(MessageType type, const QString &text);
-
- static bool indexHasIncidents(const QModelIndex &function, IncidentType type);
-};
-
-class QTestOutputPane : public Core::IOutputPane
-{
- Q_OBJECT
-
-public:
- QTestOutputPane(QTestLibPlugin *plugin);
-
- void addFunction(QTestFunction *function);
-
- virtual QWidget *outputWidget(QWidget *parent);
- QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
- virtual QString name() const;
-
- virtual void clearContents();
- virtual void visibilityChanged(bool visible);
-
- void show();
-
- // FIXME:
- virtual int priorityInStatusBar() const { return 0;}
- virtual void setFocus() {}
- virtual bool hasFocus() { return false;}
- virtual bool canFocus() { return false;}
-
-signals:
- void showPage();
-
-private:
- QTestLibPlugin *m_plugin;
- QTestOutputWidget *m_widget;
- QStandardItemModel *m_model;
-};
-
-class QTestOutputFilter : public QSortFilterProxyModel
-{
-public:
- inline QTestOutputFilter(QObject *parent)
- : QSortFilterProxyModel(parent), m_filter(QTestFunction::Fail)
- {}
-
- inline void setIncidentFilter(QTestFunction::IncidentType incident) {
- m_filter = incident;
- filterChanged();
- }
-
-protected:
- virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
-
-private:
- QTestFunction::IncidentType m_filter;
-};
-
-class QTestOutputWidget : public QWidget
-{
- Q_OBJECT
-
-public:
- QTestOutputWidget(QStandardItemModel *model, QWidget *parent);
-
- void expand();
-
-private Q_SLOTS:
- void activateComboFilter(int index);
- void gotoLocation(QModelIndex index);
-
-private:
- QStandardItemModel *m_model;
- QTreeView *m_resultsView;
- QComboBox *m_filterCombo;
- QTestOutputFilter *m_filterModel;
-};
-
-class QTestLibPlugin : public QObject
-{
- Q_OBJECT
-
-public:
- QTestLibPlugin();
- virtual ~QTestLibPlugin();
-
- bool init(const QStringList &args, QString *errorMessage);
- void extensionsInitialized();
-
- // IApplicationOutput
- virtual void clear();
- virtual void appendOutput(const QString &out);
- virtual void processExited(int exitCode);
-
-private slots:
- void projectRunHook(ProjectExplorer::Project *project);
-
-private:
- ProjectExplorer::ProjectExplorerPlugin *m_projectExplorer;
- QString m_outputFile;
- QString m_projectDirectory;
- QTestOutputPane *m_outputPane;
-};
-
-} // namespace Internal
-} // namespace QTestLibPlugin
-
-Q_DECLARE_METATYPE(QTestLib::Internal::QTestLocation)
-Q_DECLARE_METATYPE(QTestLib::Internal::QTestFunction::IncidentType)
-Q_DECLARE_METATYPE(QTestLib::Internal::QTestFunction::MessageType)
-
-#endif // QTESTLIBPLUGIN_H
diff --git a/src/plugins/regexp/RegExp.pluginspec.in b/src/plugins/regexp/RegExp.pluginspec.in
deleted file mode 100644
index d729c03715bb95ce1010fa6a1966325bd6f6cbf3..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/RegExp.pluginspec.in
+++ /dev/null
@@ -1,18 +0,0 @@
-<plugin name=\"RegExp\" 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>
- <description>Regular Expression test widget.</description>
- <url>http://qt.nokia.com</url>
- <dependencyList>
- <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
- </dependencyList>
-</plugin>
diff --git a/src/plugins/regexp/regexp.pro b/src/plugins/regexp/regexp.pro
deleted file mode 100644
index 98e20b317e8c070c25cedf885a2160fe4dec8967..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/regexp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = lib
-TARGET = RegExp
-
-include(../../qtcreatorplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
-
-QT += xml
-
-HEADERS += regexpwindow.h regexpplugin.h settings.h
-SOURCES += regexpwindow.cpp regexpplugin.cpp settings.cpp
diff --git a/src/plugins/regexp/regexpplugin.cpp b/src/plugins/regexp/regexpplugin.cpp
deleted file mode 100644
index d21d755f1622ffb6992d9e9b20015707d2ca958a..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/regexpplugin.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#include "regexpplugin.h"
-
-#include "regexpwindow.h"
-#include "settings.h"
-
-#include <coreplugin/baseview.h>
-#include <coreplugin/icore.h>
-
-#include <QtCore/QtPlugin>
-
-using namespace RegExp::Internal;
-
-RegExpPlugin::RegExpPlugin()
-{
-}
-
-RegExpPlugin::~RegExpPlugin()
-{
- if (m_regexpWindow)
- m_regexpWindow->settings().toQSettings(Core::ICore::instance()->settings());
-}
-
-void RegExpPlugin::extensionsInitialized()
-{
-}
-
-bool RegExpPlugin::initialize(const QStringList &arguments, QString *errorMessage)
-{
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
- Core::ICore *core = Core::ICore::instance();
- m_regexpWindow = new RegExpWindow;
- Settings settings;
- settings.fromQSettings(core->settings());
- m_regexpWindow->setSettings(settings);
- addAutoReleasedObject(new Core::BaseView("TextEditor.RegExpWindow",
- m_regexpWindow,
- Core::Contect("RegExpPlugin"),
- plugId,
- Qt::RightDockWidgetArea));
- return true;
-}
-
-Q_EXPORT_PLUGIN(RegExpPlugin)
diff --git a/src/plugins/regexp/regexpplugin.h b/src/plugins/regexp/regexpplugin.h
deleted file mode 100644
index 157b947dc37038cacd0b87fdd9d06365e0f18675..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/regexpplugin.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#ifndef REGEXPPLUGIN_H
-#define REGEXPPLUGIN_H
-
-#include <extensionsystem/iplugin.h>
-
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-
-namespace RegExp {
-namespace Internal {
-
-class RegExpWindow;
-
-class RegExpPlugin : public ExtensionSystem::IPlugin
-{
- Q_OBJECT
-
-public:
- RegExpPlugin();
- virtual ~RegExpPlugin();
-
- bool initialize(const QStringList &arguments, QString *errorMessage);
- void extensionsInitialized();
-
-private:
- QPointer<RegExpWindow> m_regexpWindow;
-};
-
-} // namespace Internal
-} // namespace RegExp
-
-#endif // REGEXPPLUGIN_H
diff --git a/src/plugins/regexp/regexpwindow.cpp b/src/plugins/regexp/regexpwindow.cpp
deleted file mode 100644
index 1c67d29c935bad94c57735761364929f5ed9599b..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/regexpwindow.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#include "regexpwindow.h"
-#include "settings.h"
-
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QLabel>
-#include <QtGui/QLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QInputDialog>
-
-using namespace RegExp::Internal;
-
-RegExpWindow::RegExpWindow(QWidget *parent) :
- QWidget(parent),
- patternLabel(new QLabel(tr("&Pattern:"))),
- escapedPatternLabel(new QLabel(tr("&Escaped pattern:"))),
- syntaxLabel(new QLabel(tr("&Pattern syntax:"))),
- textLabel(new QLabel(tr("&Text:"))),
- patternComboBox (new QComboBox),
- escapedPatternLineEdit(new QLineEdit),
- textComboBox(new QComboBox),
- caseSensitiveCheckBox(new QCheckBox(tr("Case &sensitive"))),
- minimalCheckBox(new QCheckBox(tr("&Minimal"))),
- syntaxComboBox(new QComboBox),
- indexLabel(new QLabel(tr("Index of match:"))),
- matchedLengthLabel(new QLabel(tr("Matched length:"))),
- indexEdit(new QLineEdit),
- matchedLengthEdit(new QLineEdit)
-{
- QVBoxLayout *vboxLayout = new QVBoxLayout(this);
- QGridLayout *mainLayout = new QGridLayout;
-
- patternComboBox->setEditable(true);
- patternComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
- patternLabel->setBuddy(patternComboBox);
-
- mainLayout->addWidget(patternLabel, 0, 0);
- mainLayout->addWidget(patternComboBox, 0, 1);
-
- escapedPatternLineEdit->setReadOnly(true);
- QPalette palette = escapedPatternLineEdit->palette();
- palette.setBrush(QPalette::Base, palette.brush(QPalette::Disabled, QPalette::Base));
- escapedPatternLineEdit->setPalette(palette);
-
- escapedPatternLabel->setBuddy(escapedPatternLineEdit);
-
- mainLayout->addWidget(escapedPatternLabel, 1, 0);
- mainLayout->addWidget(escapedPatternLineEdit, 1, 1);
-
- syntaxComboBox->addItem(tr("Regular Expression v1"), QRegExp::RegExp);
- syntaxComboBox->addItem(tr("Regular Expression v2"), QRegExp::RegExp2);
- syntaxComboBox->addItem(tr("Wildcard"), QRegExp::Wildcard);
- syntaxComboBox->addItem(tr("Fixed String"), QRegExp::FixedString);
-
- syntaxLabel->setBuddy(syntaxComboBox);
-
- mainLayout->addWidget(syntaxLabel, 2, 0);
- mainLayout->addWidget(syntaxComboBox, 2, 1);
-
- QHBoxLayout *checkBoxLayout = new QHBoxLayout;
-
- caseSensitiveCheckBox->setChecked(true);
-
- checkBoxLayout->addWidget(caseSensitiveCheckBox);
- checkBoxLayout->addWidget(minimalCheckBox);
- checkBoxLayout->addStretch(1);
-
- mainLayout->addLayout(checkBoxLayout, 3, 0, 1, 2);
-
- textComboBox->setEditable(true);
- textComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
- textLabel->setBuddy(textComboBox);
-
- mainLayout->addWidget(textLabel, 4, 0);
- mainLayout->addWidget(textComboBox, 4, 1);
-
- indexEdit->setReadOnly(true);
-
- mainLayout->addWidget(indexLabel, 5, 0);
- mainLayout->addWidget(indexEdit, 5, 1);
-
- matchedLengthEdit->setReadOnly(true);
-
- mainLayout->addWidget(matchedLengthLabel, 6, 0);
- mainLayout->addWidget(matchedLengthEdit, 6, 1);
-
- vboxLayout->addLayout(mainLayout);
- vboxLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
-
- for (int i = 0; i < MaxCaptures; ++i) {
- captureLabels[i] = new QLabel(tr("Capture %1:").arg(i));
- captureEdits[i] = new QLineEdit;
- captureEdits[i]->setReadOnly(true);
- }
- captureLabels[0]->setText(tr("Match:"));
-
- for (int j = 0; j < MaxCaptures; ++j) {
- mainLayout->addWidget(captureLabels[j], 7 + j, 0);
- mainLayout->addWidget(captureEdits[j], 7 + j, 1);
- }
-
- connect(patternComboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(refresh()));
- connect(textComboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(refresh()));
- connect(caseSensitiveCheckBox, SIGNAL(toggled(bool)), this, SLOT(refresh()));
- connect(minimalCheckBox, SIGNAL(toggled(bool)), this, SLOT(refresh()));
- connect(syntaxComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(refresh()));
-
- setWindowTitle(tr("Regular Expression"));
- refresh();
-}
-
-static const char escapedBackSlash[] = "\\\\";
-static const char escapedDoubleQuote[] = "\\\"";
-
-static QString escapePattern(const QString &pattern)
-{
- QString escaped = pattern;
- escaped.replace(QString(QLatin1Char('\\')) , QLatin1String(escapedBackSlash));
- const QChar doubleQuote(QLatin1Char('"'));
- escaped.replace(doubleQuote, QString(QLatin1String(escapedDoubleQuote)));
- escaped.prepend(doubleQuote);
- escaped.append(doubleQuote);
- return escaped;
-}
-
-static QString unescapePattern(QString escaped)
-{
- // remove quotes
- const QChar doubleQuote(QLatin1Char('"'));
- if (escaped.endsWith(doubleQuote))
- escaped.truncate(escaped.size() - 1);
- if (escaped.startsWith(doubleQuote))
- escaped.remove(0, 1);
-
- const int size = escaped.size();
- if (!size)
- return QString();
-
- // parse out escapes. Do not just replace.
- QString pattern;
- const QChar backSlash = QLatin1Char('\\');
- bool escapeSeen = false;
- for (int i = 0; i < size; i++) {
- const QChar c = escaped.at(i);
- if (c == backSlash && !escapeSeen)
- escapeSeen = true;
- else {
- pattern.push_back(c);
- escapeSeen = false;
- }
- }
- return pattern;
-}
-
-void RegExpWindow::refresh()
-{
- setUpdatesEnabled(false);
-
- const QString pattern = patternComboBox->currentText();
- const QString text = textComboBox->currentText();
-
- escapedPatternLineEdit->setText(escapePattern(pattern));
-
- QRegExp rx(pattern);
- const Qt::CaseSensitivity cs = caseSensitiveCheckBox->isChecked() ? Qt::CaseSensitive : Qt::CaseInsensitive;
- rx.setCaseSensitivity(cs);
- rx.setMinimal(minimalCheckBox->isChecked());
- const QRegExp::PatternSyntax syntax = QRegExp::PatternSyntax(
- syntaxComboBox->itemData(syntaxComboBox->currentIndex()).toInt());
- rx.setPatternSyntax(syntax);
-
- QPalette palette = patternComboBox->palette();
- if (rx.isValid()) {
- palette.setColor(QPalette::Text,
- textComboBox->palette().color(QPalette::Text));
- } else {
- palette.setColor(QPalette::Text, Qt::red);
- }
- patternComboBox->setPalette(palette);
-
- indexEdit->setText(QString::number(rx.indexIn(text)));
- matchedLengthEdit->setText(QString::number(rx.matchedLength()));
- for (int i = 0; i < MaxCaptures; ++i) {
- const bool enabled = i <= rx.numCaptures();
- captureLabels[i]->setEnabled(enabled);
- captureEdits[i]->setEnabled(enabled);
- captureEdits[i]->setText(rx.cap(i));
- }
-
- setUpdatesEnabled(true);
-}
-
-static void saveTextCombo(const QComboBox *cb, QString ¤t, QStringList &items)
-{
- current = cb->currentText();
- items.clear();
- if (const int count = cb->count())
- for (int i = 0;i < count; i++) {
- const QString text = cb->itemText(i);
- if (items.indexOf(text) == -1)
- items += text;
- }
-}
-
-Settings RegExpWindow::settings() const
-{
- Settings rc;
- rc.m_patternSyntax = static_cast<QRegExp::PatternSyntax>(syntaxComboBox->itemData(syntaxComboBox->currentIndex()).toInt());
- rc.m_minimal = minimalCheckBox->checkState() == Qt::Checked;
- rc.m_caseSensitive = caseSensitiveCheckBox->checkState() == Qt::Checked;
- saveTextCombo(patternComboBox, rc.m_currentPattern, rc.m_patterns);
- saveTextCombo(textComboBox, rc.m_currentMatch, rc.m_matches);
- return rc;
-}
-
-static void restoreTextCombo(const QString ¤t, const QStringList &items, QComboBox *cb)
-{
- cb->clear();
- cb->addItems(items);
- cb->lineEdit()->setText(current);
-}
-
-void RegExpWindow::setSettings(const Settings &s)
-{
- const int patternIndex = syntaxComboBox->findData(QVariant(s.m_patternSyntax));
- syntaxComboBox->setCurrentIndex(patternIndex);
- minimalCheckBox->setCheckState(s.m_minimal ? Qt::Checked : Qt::Unchecked);
- caseSensitiveCheckBox->setCheckState(s.m_caseSensitive ? Qt::Checked : Qt::Unchecked);
- restoreTextCombo(s.m_currentPattern, s.m_patterns, patternComboBox);
- restoreTextCombo(s.m_currentMatch, s.m_matches, textComboBox);
-}
-
-void RegExpWindow::contextMenuEvent(QContextMenuEvent *event)
-{
- QMenu menu(this);
-
- QAction *enterQuotedAction = menu.addAction(tr("Enter Pattern from Code..."));
- connect(enterQuotedAction, SIGNAL(triggered()), this, SLOT(enterEscaped()));
- menu.addSeparator();
-
- QAction *clearPatternsAction = menu.addAction(tr("Clear Patterns"));
- connect(clearPatternsAction, SIGNAL(triggered()), patternComboBox, SLOT(clear()));
-
- QAction *clearTextsAction = menu.addAction(tr("Clear Text"));
- connect(clearTextsAction, SIGNAL(triggered()), textComboBox, SLOT(clear()));
-
- event->accept();
- menu.exec(event->globalPos());
-}
-
-void RegExpWindow::enterEscaped()
-{
- const QString escapedPattern = QInputDialog::getText (this, tr("Enter Pattern from Code"), tr("Pattern"));
- if ( escapedPattern.isEmpty())
- return;
- patternComboBox->lineEdit()->setText(unescapePattern(escapedPattern));
-
-}
diff --git a/src/plugins/regexp/regexpwindow.h b/src/plugins/regexp/regexpwindow.h
deleted file mode 100644
index bb147f89c8473319a2b373557a9bcf106962301f..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/regexpwindow.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#ifndef REGEXPWINDOW_H
-#define REGEXPWINDOW_H
-
-#include <QtGui/QWidget>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-class QComboBox;
-class QCheckBox;
-class QLineEdit;
-QT_END_NAMESPACE
-
-namespace RegExp {
-namespace Internal {
-
-struct Settings;
-
-class RegExpWindow : public QWidget
-{
- Q_OBJECT
-
-public:
- RegExpWindow(QWidget *parent = 0);
-
- Settings settings() const;
- void setSettings(const Settings &s);
-
-protected:
- void contextMenuEvent(QContextMenuEvent *);
-
-private slots:
- void refresh();
- void enterEscaped();
-
-private:
- QLabel *patternLabel;
- QLabel *escapedPatternLabel;
- QLabel *syntaxLabel;
- QLabel *textLabel;
- QComboBox *patternComboBox;
- QLineEdit *escapedPatternLineEdit;
- QComboBox *textComboBox;
- QCheckBox *caseSensitiveCheckBox;
- QCheckBox *minimalCheckBox;
- QComboBox *syntaxComboBox;
-
- QLabel *indexLabel;
- QLabel *matchedLengthLabel;
- QLineEdit *indexEdit;
- QLineEdit *matchedLengthEdit;
-
- enum { MaxCaptures = 6 };
- QLabel *captureLabels[MaxCaptures];
- QLineEdit *captureEdits[MaxCaptures];
-};
-
-} // namespace Internal
-} // namespace RegExp
-
-#endif // REGEXPWINDOW_H
diff --git a/src/plugins/regexp/settings.cpp b/src/plugins/regexp/settings.cpp
deleted file mode 100644
index ec18991cbc891ae1c1dac7d465da2ce6b0adbad3..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/settings.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#include "settings.h"
-
-#include <QtCore/QSettings>
-
-static const char syntaxKey[] = "Syntax";
-static const char minimalKey[] = "Minimal";
-static const char caseSensitiveKey[] = "CaseSensitive";
-static const char patternKey[] = "Patterns";
-static const char currentPatternKey[] = "CurrentPattern";
-static const char matchKey[] = "Matches";
-static const char currentMatchKey[] = "CurrentMatch";
-static const char patternDefault[] = "[A-Za-z_]+([A-Za-z_0-9]*)";
-static const char matchDefault[] = "(10 + delta4) * 32";
-static const char settingsGroup[] = "RegExp";
-
-namespace RegExp {
-namespace Internal {
-
-Settings::Settings() :
- m_patternSyntax(QRegExp::RegExp),
- m_minimal(false),
- m_caseSensitive(true),
- m_patterns(QLatin1String(patternDefault)),
- m_currentPattern(m_patterns.front()),
- m_matches(QLatin1String(matchDefault)),
- m_currentMatch(m_matches.front())
-{
-}
-
-void Settings::clear()
-{
- *this = Settings();
-}
-
-void Settings::fromQSettings(QSettings *s)
-{
- clear();
- s->beginGroup(QLatin1String(settingsGroup));
- m_patternSyntax = static_cast<QRegExp::PatternSyntax>(s->value(QLatin1String(syntaxKey), m_patternSyntax).toInt());
- m_minimal = s->value(QLatin1String(minimalKey), m_minimal).toBool();
- m_caseSensitive = s->value(QLatin1String(caseSensitiveKey), m_caseSensitive).toBool();
- m_patterns = s->value(QLatin1String(patternKey), m_patterns).toStringList();
- m_currentPattern = s->value(QLatin1String(currentPatternKey), m_currentPattern).toString();
- m_matches = s->value(QLatin1String(matchKey), m_matches).toStringList();
- m_currentMatch = s->value(QLatin1String(currentMatchKey), m_currentMatch).toString();
- s->endGroup();
-}
-
-void Settings::toQSettings(QSettings *s) const
-{
- s->beginGroup(QLatin1String(settingsGroup));
- s->setValue(QLatin1String(syntaxKey), m_patternSyntax);
- s->setValue(QLatin1String(minimalKey), m_minimal);
- s->setValue(QLatin1String(caseSensitiveKey), m_caseSensitive);
- s->setValue(QLatin1String(patternKey), m_patterns);
- s->setValue(QLatin1String(currentPatternKey), m_currentPattern);
- s->setValue(QLatin1String(matchKey), m_matches);
- s->setValue(QLatin1String(currentMatchKey), m_currentMatch);
- s->endGroup();
-}
-
-} // namespace Internal
-} // namespace Settings;
diff --git a/src/plugins/regexp/settings.h b/src/plugins/regexp/settings.h
deleted file mode 100644
index f2eec7242b6f6fa976f7f1ec291b90789c8d74df..0000000000000000000000000000000000000000
--- a/src/plugins/regexp/settings.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-**
-** 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 qt-info@nokia.com.
-**
-**************************************************************************/
-
-#ifndef REGEXP_SETTINGS_H
-#define REGEXP_SETTINGS_H
-
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
-
-QT_BEGIN_NAMESPACE
-class QSettings;
-QT_END_NAMESPACE
-
-namespace RegExp {
-namespace Internal {
-
-// Settings of the Regexp plugin.
-// Provides methods to serialize into QSettings.
-
-struct Settings {
- Settings();
- void clear();
- void fromQSettings(QSettings *s);
- void toQSettings(QSettings *s) const;
-
- QRegExp::PatternSyntax m_patternSyntax;
- bool m_minimal;
- bool m_caseSensitive;
-
- QStringList m_patterns;
- QString m_currentPattern;
- QStringList m_matches;
- QString m_currentMatch;
-};
-
-} // namespace Internal
-} // namespace RegExp
-
-#endif // REGEXP_SETTINGS_H