diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-02-28 15:05:40 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-02-28 16:10:47 +0100 |
commit | 3adb533ad747cf34ecbd18cd80c3a0f8fdf34e4b (patch) | |
tree | 416eaa668b4232fbba6ca3683b70163bd1873998 /src/plugins/bazaar | |
parent | f9bb4c59dc75c32e4162d02141eaf1602fbda4c8 (diff) | |
download | qt-creator-3adb533ad747cf34ecbd18cd80c3a0f8fdf34e4b.tar.gz |
Bazaar: Cleanups
Clean up whitespaces and coding style issues.
Diffstat (limited to 'src/plugins/bazaar')
-rw-r--r-- | src/plugins/bazaar/bazaarclient.cpp | 13 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 30 | ||||
-rw-r--r-- | src/plugins/bazaar/clonewizardpage.cpp | 12 | ||||
-rw-r--r-- | src/plugins/bazaar/pullorpushdialog.cpp | 15 |
4 files changed, 33 insertions, 37 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index 30b0119e60..263397fc9d 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -113,12 +113,15 @@ QString BazaarClient::findTopLevelForFile(const QFileInfo &file) const QString BazaarClient::vcsEditorKind(VCSCommand cmd) const { switch(cmd) { - case AnnotateCommand : return QLatin1String(Constants::ANNOTATELOG); - case DiffCommand : return QLatin1String(Constants::DIFFLOG); - case LogCommand : return QLatin1String(Constants::FILELOG); - default : return QLatin1String(""); + case AnnotateCommand: + return QLatin1String(Constants::ANNOTATELOG); + case DiffCommand: + return QLatin1String(Constants::DIFFLOG); + case LogCommand: + return QLatin1String(Constants::FILELOG); + default: + return QString(); } - return QLatin1String(""); } QStringList BazaarClient::cloneArguments(const QString &srcLocation, diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index ff3d044e59..2ec5e7b80e 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -147,7 +147,7 @@ BazaarPlugin::~BazaarPlugin() m_instance = 0; } -bool BazaarPlugin::initialize(const QStringList &/*arguments*/, QString */*error_message*/) +bool BazaarPlugin::initialize(const QStringList &/*arguments*/, QString * /*error_message*/) { typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory; @@ -290,29 +290,29 @@ void BazaarPlugin::createFileActions(const Core::Context &context) void BazaarPlugin::addCurrentFile() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasFile(), return) - m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); + QTC_ASSERT(state.hasFile(), return); + m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); } void BazaarPlugin::annotateCurrentFile() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasFile(), return) - m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile()); + QTC_ASSERT(state.hasFile(), return); + m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile()); } void BazaarPlugin::diffCurrentFile() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasFile(), return) - m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); + QTC_ASSERT(state.hasFile(), return); + m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } void BazaarPlugin::logCurrentFile() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasFile(), return) - m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true); + QTC_ASSERT(state.hasFile(), return); + m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true); } void BazaarPlugin::revertCurrentFile() @@ -333,8 +333,8 @@ void BazaarPlugin::revertCurrentFile() void BazaarPlugin::statusCurrentFile() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasFile(), return) - m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile()); + QTC_ASSERT(state.hasFile(), return); + m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile()); } void BazaarPlugin::createDirectoryActions(const Core::Context &context) @@ -375,15 +375,15 @@ void BazaarPlugin::createDirectoryActions(const Core::Context &context) void BazaarPlugin::diffRepository() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasTopLevel(), return) - m_client->diff(state.topLevel()); + QTC_ASSERT(state.hasTopLevel(), return); + m_client->diff(state.topLevel()); } void BazaarPlugin::logRepository() { const VCSBase::VCSBasePluginState state = currentState(); - QTC_ASSERT(state.hasTopLevel(), return) - m_client->log(state.topLevel()); + QTC_ASSERT(state.hasTopLevel(), return); + m_client->log(state.topLevel()); } void BazaarPlugin::revertAll() diff --git a/src/plugins/bazaar/clonewizardpage.cpp b/src/plugins/bazaar/clonewizardpage.cpp index e828bc340a..39727e5e35 100644 --- a/src/plugins/bazaar/clonewizardpage.cpp +++ b/src/plugins/bazaar/clonewizardpage.cpp @@ -60,11 +60,9 @@ QString CloneWizardPage::directoryFromRepository(const QString &repository) cons QString repo = repository.trimmed(); if (repo.startsWith(QLatin1String("lp:"))) return repo.mid(3); - else { - const QChar slash = QLatin1Char('/'); - if (repo.endsWith(slash)) - repo.truncate(repo.size() - 1); - // Take the basename or the repository url - return repo.mid(repo.lastIndexOf(slash) + 1); - } + const QChar slash = QLatin1Char('/'); + if (repo.endsWith(slash)) + repo.truncate(repo.size() - 1); + // Take the basename or the repository url + return repo.mid(repo.lastIndexOf(slash) + 1); } diff --git a/src/plugins/bazaar/pullorpushdialog.cpp b/src/plugins/bazaar/pullorpushdialog.cpp index 75b90dbbef..7bb0204b21 100644 --- a/src/plugins/bazaar/pullorpushdialog.cpp +++ b/src/plugins/bazaar/pullorpushdialog.cpp @@ -44,14 +44,11 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) : { m_ui->setupUi(this); m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::Directory); - if (m_mode == PullMode) - { + if (m_mode == PullMode) { this->setWindowTitle(tr("Pull source")); m_ui->useExistingDirCheckBox->setVisible(false); m_ui->createPrefixCheckBox->setVisible(false); - } - else - { + } else { this->setWindowTitle(tr("Push destination")); m_ui->localCheckBox->setVisible(false); } @@ -67,18 +64,16 @@ QString PullOrPushDialog::branchLocation() const { if (m_ui->defaultButton->isChecked()) return QString(); - else if (m_ui->localButton->isChecked()) + if (m_ui->localButton->isChecked()) return m_ui->localPathChooser->path(); - else - return m_ui->urlLineEdit->text(); + return m_ui->urlLineEdit->text(); } bool PullOrPushDialog::isRememberOptionEnabled() const { if (m_ui->defaultButton->isChecked()) return false; - else - return m_ui->rememberCheckBox->isChecked(); + return m_ui->rememberCheckBox->isChecked(); } bool PullOrPushDialog::isOverwriteOptionEnabled() const |