feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Bazaar plugin : corrected whitespaces and indentation

Browse Source 
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
cerf
2011-03-11 15:32:11 +01:00
committed by Tobias Hunger
parent c414c1a3f2
commit 53ba19a102
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/bazaar/bazaareditor.cpp
View File

@@ -51,12 +51,12 @@ using namespace Bazaar::Internal;
using namespace Bazaar; using namespace Bazaar;
BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent)
: VCSBase::VCSBaseEditorWidget(type, parent), : VCSBase::VCSBaseEditorWidget(type, parent),
m_exactIdentifier12(QLatin1String(Constants::CHANGEIDEXACT12)), m_exactIdentifier12(QLatin1String(Constants::CHANGEIDEXACT12)),
m_exactIdentifier40(QLatin1String(Constants::CHANGEIDEXACT40)), m_exactIdentifier40(QLatin1String(Constants::CHANGEIDEXACT40)),
m_changesetIdentifier12(QLatin1String(Constants::CHANGESETID12)), m_changesetIdentifier12(QLatin1String(Constants::CHANGESETID12)),
m_changesetIdentifier40(QLatin1String(Constants::CHANGESETID40)), m_changesetIdentifier40(QLatin1String(Constants::CHANGESETID40)),
m_diffIdentifier(QLatin1String(Constants::DIFFIDENTIFIER)) m_diffIdentifier(QLatin1String(Constants::DIFFIDENTIFIER))
{ {
setAnnotateRevisionTextFormat(tr("Annotate %1")); setAnnotateRevisionTextFormat(tr("Annotate %1"));
setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1")); setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1"));
@@ -104,7 +104,7 @@ VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(co
QString BazaarEditor::fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const QString BazaarEditor::fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const
{ {
const QString filechangeId(QLatin1String("+++ b/")); const QString filechangeId(QLatin1String("+++ b/"));
QTextBlock::iterator iterator; QTextBlock::iterator iterator;
for (iterator = diffFileSpec.begin(); !(iterator.atEnd()); iterator++) { for (iterator = diffFileSpec.begin(); !(iterator.atEnd()); iterator++) {
QTextFragment fragment = iterator.fragment(); QTextFragment fragment = iterator.fragment();

2
src/plugins/bazaar/optionspage.cpp
View File

@@ -46,7 +46,7 @@ using namespace Bazaar::Internal;
using namespace Bazaar; using namespace Bazaar;
OptionsPageWidget::OptionsPageWidget(QWidget *parent) : OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
QWidget(parent) QWidget(parent)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);