Bazaar: whitespace and indentation fixes

Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

19 files changed, 56 insertions, 49 deletions

diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h
index a1780786fb..a85349679e 100644
--- a/src/plugins/bazaar/annotationhighlighter.h
+++ b/src/plugins/bazaar/annotationhighlighter.h
@@ -50,6 +50,7 @@ private:
     QRegExp m_changeset;
 };
 
-} //namespace Internal
-}// namespace Bazaar
+} // namespace Internal
+} // namespace Bazaar
+
 #endif // ANNOTATIONHIGHLIGHTER_H
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 1e4f8f93e7..90a1545f2e 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -231,7 +231,7 @@ public:
         const QStringList formatArguments = VCSBaseEditorParameterWidget::arguments();
         if (!formatArguments.isEmpty()) {
             const QString a = QLatin1String("--diff-options=")
-                              + formatArguments.join(QString(QLatin1Char(' ')));
+                    + formatArguments.join(QString(QLatin1Char(' ')));
             args.append(a);
         }
         return args;
@@ -248,7 +248,7 @@ private:
 };
 
 VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createDiffEditor(
-    const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
+        const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
 {
     const BazaarCommandParameters parameters(workingDir, files, extraOptions);
     return new BazaarDiffParameterWidget(this, parameters);
@@ -292,13 +292,13 @@ private:
 };
 
 VCSBase::VCSBaseEditorParameterWidget *BazaarClient::createLogEditor(
-    const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
+        const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
 {
     const BazaarCommandParameters parameters(workingDir, files, extraOptions);
     return new BazaarLogParameterWidget(this, parameters);
 }
 
-} //namespace Internal
+} // namespace Internal
 } // namespace Bazaar
 
 #include "bazaarclient.moc"
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 832757fd31..d309becd29 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -77,7 +77,7 @@ private:
     friend class CloneWizard;
 };
 
-} //namespace Internal
+} // namespace Internal
 } // namespace Bazaar
 
 #endif // BAZAARCLIENT_H
diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp
index ee49cfad1a..0a2a36d448 100644
--- a/src/plugins/bazaar/bazaarcontrol.cpp
+++ b/src/plugins/bazaar/bazaarcontrol.cpp
@@ -44,7 +44,7 @@
 using namespace Bazaar::Internal;
 
 BazaarControl::BazaarControl(BazaarClient *client)
-    :   m_bazaarClient(client)
+    : m_bazaarClient(client)
 {
 }
 
@@ -120,8 +120,8 @@ bool BazaarControl::vcsMove(const QString &from, const QString &to)
     const QFileInfo fromInfo(from);
     const QFileInfo toInfo(to);
     return m_bazaarClient->synchronousMove(fromInfo.absolutePath(),
-                                         fromInfo.absoluteFilePath(),
-                                         toInfo.absoluteFilePath());
+                                           fromInfo.absoluteFilePath(),
+                                           toInfo.absoluteFilePath());
 }
 
 bool BazaarControl::vcsCreateRepository(const QString &directory)
diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h
index 7a4593689b..067fb259c3 100644
--- a/src/plugins/bazaar/bazaarcontrol.h
+++ b/src/plugins/bazaar/bazaarcontrol.h
@@ -83,7 +83,7 @@ private:
     BazaarClient *m_bazaarClient;
 };
 
-} //namespace Internal
-} //namespace Bazaar
+} // namespace Internal
+} // namespace Bazaar
 
 #endif // BAZAARCONTROL_H
diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp
index 56f222c099..fbc3ba73f8 100644
--- a/src/plugins/bazaar/bazaareditor.cpp
+++ b/src/plugins/bazaar/bazaareditor.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QDebug>
 
-# define BZR_CHANGE_PATTERN "[0-9]+"
+#define BZR_CHANGE_PATTERN "[0-9]+"
 
 using namespace Bazaar::Internal;
 using namespace Bazaar;
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 9779a93648..3e8f31818a 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -120,16 +120,16 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitEditorParameters = {
 
 BazaarPlugin *BazaarPlugin::m_instance = 0;
 
-BazaarPlugin::BazaarPlugin() :
-    VCSBase::VCSBasePlugin(QLatin1String(Constants::COMMIT_ID)),
-    m_optionsPage(0),
-    m_client(0),
-    m_core(0),
-    m_commandLocator(0),
-    m_changeLog(0),
-    m_addAction(0),
-    m_deleteAction(0),
-    m_menuAction(0)
+BazaarPlugin::BazaarPlugin()
+    : VCSBase::VCSBasePlugin(QLatin1String(Constants::COMMIT_ID)),
+      m_optionsPage(0),
+      m_client(0),
+      m_core(0),
+      m_commandLocator(0),
+      m_changeLog(0),
+      m_addAction(0),
+      m_deleteAction(0),
+      m_menuAction(0)
 {
     m_instance = this;
 }
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
index a117dd8724..3827c202f0 100644
--- a/src/plugins/bazaar/bazaarplugin.h
+++ b/src/plugins/bazaar/bazaarplugin.h
@@ -68,7 +68,7 @@ class VCSBaseSubmitEditor;
 }
 
 namespace Locator {
-    class CommandLocator;
+class CommandLocator;
 }
 
 namespace Bazaar {
@@ -166,7 +166,7 @@ private:
     QString m_submitRepository;
 };
 
-} //namespace Internal
-} //namespace Bazaar
+} // namespace Internal
+} // namespace Bazaar
 
 #endif // BAZAARPLUGIN_H
diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp
index 90342c7e6e..0c6d79086b 100644
--- a/src/plugins/bazaar/bazaarsettings.cpp
+++ b/src/plugins/bazaar/bazaarsettings.cpp
@@ -60,8 +60,8 @@ BazaarSettings::BazaarSettings()
 
 bool BazaarSettings::sameUserId(const BazaarSettings &other) const
 {
-    return stringValue(userNameKey) == other.stringValue(userNameKey) &&
-            stringValue(userEmailKey) == other.stringValue(userEmailKey);
+    return stringValue(userNameKey) == other.stringValue(userNameKey)
+            && stringValue(userEmailKey) == other.stringValue(userEmailKey);
 }
 
 } // namespace Internal
diff --git a/src/plugins/bazaar/branchinfo.cpp b/src/plugins/bazaar/branchinfo.cpp
index 9eb1b8d9d3..565c05e7dc 100644
--- a/src/plugins/bazaar/branchinfo.cpp
+++ b/src/plugins/bazaar/branchinfo.cpp
@@ -35,11 +35,11 @@
 namespace Bazaar {
 namespace Internal {
 
-BranchInfo::BranchInfo(const QString &branchLoc, bool isBound) :
-    branchLocation(branchLoc),
-    isBoundToBranch(isBound)
+BranchInfo::BranchInfo(const QString &branchLoc, bool isBound)
+    : branchLocation(branchLoc),
+      isBoundToBranch(isBound)
 {
 }
 
-} //namespace Internal
+} // namespace Internal
 } // namespace Bazaar
diff --git a/src/plugins/bazaar/cloneoptionspanel.cpp b/src/plugins/bazaar/cloneoptionspanel.cpp
index 8613ecf0d8..febcecd8ba 100644
--- a/src/plugins/bazaar/cloneoptionspanel.cpp
+++ b/src/plugins/bazaar/cloneoptionspanel.cpp
@@ -38,9 +38,9 @@
 namespace Bazaar {
 namespace Internal {
 
-CloneOptionsPanel::CloneOptionsPanel(QWidget *parent) :
-    QWidget(parent),
-    m_ui(new Ui::CloneOptionsPanel)
+CloneOptionsPanel::CloneOptionsPanel(QWidget *parent)
+    : QWidget(parent),
+      m_ui(new Ui::CloneOptionsPanel)
 {
     m_ui->setupUi(this);
 }
diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp
index 72717c64c4..2bf8b0b7a2 100644
--- a/src/plugins/bazaar/clonewizard.cpp
+++ b/src/plugins/bazaar/clonewizard.cpp
@@ -47,8 +47,8 @@
 using namespace Bazaar::Internal;
 
 CloneWizard::CloneWizard(QObject *parent)
-        :   VCSBase::BaseCheckoutWizard(parent),
-        m_icon(QIcon(QLatin1String(":/bazaar/images/bazaar.png")))
+    : VCSBase::BaseCheckoutWizard(parent),
+      m_icon(QIcon(QLatin1String(":/bazaar/images/bazaar.png")))
 {
     setId(QLatin1String(VCSBase::Constants::VCS_ID_BAZAAR));
 }
diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h
index 1b472ebc6e..87effe06f1 100644
--- a/src/plugins/bazaar/clonewizard.h
+++ b/src/plugins/bazaar/clonewizard.h
@@ -60,7 +60,7 @@ private:
     const QIcon m_icon;
 };
 
-} //namespace Internal
-} //namespace Bazaar
+} // namespace Internal
+} // namespace Bazaar
 
 #endif // CLONEWIZARD_H
diff --git a/src/plugins/bazaar/clonewizardpage.h b/src/plugins/bazaar/clonewizardpage.h
index 2e44216bbe..6e082e110b 100644
--- a/src/plugins/bazaar/clonewizardpage.h
+++ b/src/plugins/bazaar/clonewizardpage.h
@@ -42,16 +42,19 @@ class CloneOptionsPanel;
 class CloneWizardPage : public VCSBase::BaseCheckoutWizardPage
 {
     Q_OBJECT
+
 public:
     CloneWizardPage(QWidget *parent = 0);
     const CloneOptionsPanel *cloneOptionsPanel() const;
+
 protected:
     QString directoryFromRepository(const QString &repository) const;
+
 private:
     CloneOptionsPanel *m_optionsPanel;
 };
 
-} //namespace Internal
-} //namespace Bazaar
+} // namespace Internal
+} // namespace Bazaar
 
 #endif // CLONEWIZARDPAGE_H
diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp
index 47067b4509..20ca57df0a 100644
--- a/src/plugins/bazaar/commiteditor.cpp
+++ b/src/plugins/bazaar/commiteditor.cpp
@@ -43,8 +43,8 @@
 using namespace Bazaar::Internal;
 
 CommitEditor::CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters, QWidget *parent)
-        : VCSBase::VCSBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)),
-        m_fileModel(0)
+    : VCSBase::VCSBaseSubmitEditor(parameters, new BazaarCommitWidget(parent)),
+      m_fileModel(0)
 {
     setDisplayName(tr("Commit Editor"));
 }
diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h
index 1032ad165e..489bc4d663 100644
--- a/src/plugins/bazaar/commiteditor.h
+++ b/src/plugins/bazaar/commiteditor.h
@@ -67,4 +67,5 @@ private:
 
 }
 }
+
 #endif // COMMITEDITOR_H
diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp
index 7a1cc745c3..e5ced3ec0f 100644
--- a/src/plugins/bazaar/optionspage.cpp
+++ b/src/plugins/bazaar/optionspage.cpp
@@ -44,8 +44,8 @@
 using namespace Bazaar::Internal;
 using namespace Bazaar;
 
-OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
-    QWidget(parent)
+OptionsPageWidget::OptionsPageWidget(QWidget *parent)
+    : QWidget(parent)
 {
     m_ui.setupUi(this);
     m_ui.commandChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
diff --git a/src/plugins/bazaar/pullorpushdialog.cpp b/src/plugins/bazaar/pullorpushdialog.cpp
index 8b6fd6dd85..4db02fdc21 100644
--- a/src/plugins/bazaar/pullorpushdialog.cpp
+++ b/src/plugins/bazaar/pullorpushdialog.cpp
@@ -36,10 +36,10 @@
 
 using namespace Bazaar::Internal;
 
-PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) :
-    QDialog(parent),
-    m_mode(mode),
-    m_ui(new Ui::PullOrPushDialog)
+PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent)
+    : QDialog(parent),
+      m_mode(mode),
+      m_ui(new Ui::PullOrPushDialog)
 {
     m_ui->setupUi(this);
     m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::Directory);
diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h
index 93f4c94214..f0f0367469 100644
--- a/src/plugins/bazaar/pullorpushdialog.h
+++ b/src/plugins/bazaar/pullorpushdialog.h
@@ -60,8 +60,10 @@ public:
     bool isRememberOptionEnabled() const;
     bool isOverwriteOptionEnabled() const;
     QString revision() const;
+
     // Pull-specific options
     bool isLocalOptionEnabled() const;
+
     // Push-specific options
     bool isUseExistingDirectoryOptionEnabled() const;
     bool isCreatePrefixOptionEnabled() const;