Commit 41e865f0 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Rename SignsisParser to S60CreatePackageParser

Reviewed-by: Pawel Polanski
parent 29580019
......@@ -18,7 +18,7 @@ SOURCES += $$PWD/s60devices.cpp \
$$PWD/winscwparser.cpp \
$$PWD/s60createpackagestep.cpp \
$$PWD/s60deploystep.cpp \
$$PWD/signsisparser.cpp \
$$PWD/s60createpackageparser.cpp \
$$PWD/passphraseforkeydialog.cpp \
$$PWD/s60deployconfiguration.cpp \
$$PWD/s60deployconfigurationwidget.cpp
......@@ -39,7 +39,7 @@ HEADERS += $$PWD/s60devices.h \
$$PWD/winscwparser.h \
$$PWD/s60createpackagestep.h \
$$PWD/s60deploystep.h \
$$PWD/signsisparser.h \
$$PWD/s60createpackageparser.h \
$$PWD/passphraseforkeydialog.h \
$$PWD/s60deployconfiguration.h \
$$PWD/s60deployconfigurationwidget.h
......
......@@ -28,7 +28,7 @@
**************************************************************************/
#include "signsisparser.h"
#include "s60createpackageparser.h"
#include <projectexplorer/projectexplorerconstants.h>
......@@ -36,13 +36,13 @@ using namespace Qt4ProjectManager;
using namespace ProjectExplorer;
using namespace ProjectExplorer::Constants;
SignsisParser::SignsisParser()
S60CreatePackageParser::S60CreatePackageParser()
{
m_signSis.setPattern("^(error):([A-Z\\d]+):(.+)$");
m_signSis.setMinimal(true);
}
void SignsisParser::stdOutput(const QString &line)
void S60CreatePackageParser::stdOutput(const QString &line)
{
QString lne = line.trimmed();
......@@ -62,7 +62,7 @@ void SignsisParser::stdOutput(const QString &line)
IOutputParser::stdOutput(line);
}
void SignsisParser::stdError(const QString &line)
void S60CreatePackageParser::stdError(const QString &line)
{
stdOutput(line);
IOutputParser::stdError(line);
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (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 http://qt.nokia.com/contact.
**
**************************************************************************/
#ifndef S60CREATEPACKAGEPARSER_H
#define S60CREATEPACKAGEPARSER_H
#include <projectexplorer/ioutputparser.h>
#include <QtCore/QRegExp>
namespace Qt4ProjectManager {
class S60CreatePackageParser : public ProjectExplorer::IOutputParser
{
Q_OBJECT
public:
S60CreatePackageParser();
virtual void stdOutput(const QString & line);
virtual void stdError(const QString & line);
private:
QRegExp m_signSis;
};
} // namespace Qt4ProjectExplorer
#endif // S60CREATEPACKAGEPARSER_H
......@@ -35,7 +35,7 @@
#include "qt4project.h"
#include "abldparser.h"
#include "sbsv2parser.h"
#include "signsisparser.h"
#include "s60createpackageparser.h"
#include "passphraseforkeydialog.h"
#include <projectexplorer/buildconfiguration.h>
......@@ -203,7 +203,7 @@ bool S60CreatePackageStep::init()
else
m_outputParserChain = new Qt4ProjectManager::AbldParser;
m_outputParserChain->appendOutputParser(new ProjectExplorer::GnuMakeParser);
m_outputParserChain->appendOutputParser(new Qt4ProjectManager::SignsisParser);
m_outputParserChain->appendOutputParser(new Qt4ProjectManager::S60CreatePackageParser);
connect(m_outputParserChain, SIGNAL(addOutput(QString, ProjectExplorer::BuildStep::OutputFormat)),
this, SLOT(outputAdded(QString, ProjectExplorer::BuildStep::OutputFormat)));
......
#ifndef SIGNSISPARSER_H
#define SIGNSISPARSER_H
#include <projectexplorer/ioutputparser.h>
#include <QtCore/QRegExp>
namespace Qt4ProjectManager {
class SignsisParser : public ProjectExplorer::IOutputParser
{
Q_OBJECT
public:
SignsisParser();
virtual void stdOutput(const QString & line);
virtual void stdError(const QString & line);
private:
QRegExp m_signSis;
};
} // namespace Qt4ProjectExplorer
#endif // SIGNSISPARSER_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment