From 41e865f008927b462c4ccc5ef0b70ac1a11434e2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 16 Nov 2010 10:28:18 +0100 Subject: [PATCH] Rename SignsisParser to S60CreatePackageParser Reviewed-by: Pawel Polanski --- src/plugins/qt4projectmanager/qt-s60/qt-s60.pri | 4 +- ...ignsisparser.cpp => s60createpackageparser.cpp} | 8 ++-- .../qt-s60/s60createpackageparser.h | 56 ++++++++++++++++++++++ .../qt-s60/s60createpackagestep.cpp | 4 +- .../qt4projectmanager/qt-s60/signsisparser.h | 27 ----------- 5 files changed, 64 insertions(+), 35 deletions(-) rename src/plugins/qt4projectmanager/qt-s60/{signsisparser.cpp => s60createpackageparser.cpp} (91%) create mode 100644 src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h delete mode 100644 src/plugins/qt4projectmanager/qt-s60/signsisparser.h diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri index b31d1cc49f..92318932b7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri @@ -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 diff --git a/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp similarity index 91% rename from src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp rename to src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp index 752c730c63..b093042554 100644 --- a/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.cpp @@ -28,7 +28,7 @@ **************************************************************************/ -#include "signsisparser.h" +#include "s60createpackageparser.h" #include @@ -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); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h new file mode 100644 index 0000000000..0d13495140 --- /dev/null +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackageparser.h @@ -0,0 +1,56 @@ +/************************************************************************** +** +** 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 + +#include + +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 diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 369343fdbb..17c6a3b2f7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -35,7 +35,7 @@ #include "qt4project.h" #include "abldparser.h" #include "sbsv2parser.h" -#include "signsisparser.h" +#include "s60createpackageparser.h" #include "passphraseforkeydialog.h" #include @@ -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))); diff --git a/src/plugins/qt4projectmanager/qt-s60/signsisparser.h b/src/plugins/qt4projectmanager/qt-s60/signsisparser.h deleted file mode 100644 index 85529a5d02..0000000000 --- a/src/plugins/qt4projectmanager/qt-s60/signsisparser.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef SIGNSISPARSER_H -#define SIGNSISPARSER_H - -#include - -#include - -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 -- 2.11.0