summaryrefslogtreecommitdiff
path: root/src/plugins/bazaar
diff options
context:
space:
mode:
authorcerf <delorme.hugues@gmail.com>2011-09-21 11:43:58 +0200
committerhjk <qthjk@ovi.com>2011-09-21 11:45:15 +0200
commit425261d69a499d0aa14cbd04a8d5f8615532b845 (patch)
treea8b59dda9633889403848083040999e981708030 /src/plugins/bazaar
parent93d77eef1025d5a44eb16aeac6f3f0cec5ba717a (diff)
downloadqt-creator-425261d69a499d0aa14cbd04a8d5f8615532b845.tar.gz
Bazaar: fix whitespaces
Merge-request: 2208 Reviewed-by: hjk <qtc-committer@nokia.com> Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250 Reviewed-on: http://codereview.qt-project.org/5302 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/bazaar')
-rw-r--r--src/plugins/bazaar/bazaarclient.cpp2
-rw-r--r--src/plugins/bazaar/bazaarclient.h2
-rw-r--r--src/plugins/bazaar/bazaarcontrol.h3
-rw-r--r--src/plugins/bazaar/bazaareditor.h2
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp4
-rw-r--r--src/plugins/bazaar/bazaarsettings.cpp2
-rw-r--r--src/plugins/bazaar/bazaarsettings.h2
-rw-r--r--src/plugins/bazaar/cloneoptionspanel.h3
-rw-r--r--src/plugins/bazaar/clonewizard.cpp4
-rw-r--r--src/plugins/bazaar/clonewizard.h1
-rw-r--r--src/plugins/bazaar/commiteditor.cpp2
-rw-r--r--src/plugins/bazaar/commiteditor.h1
-rw-r--r--src/plugins/bazaar/pullorpushdialog.h1
13 files changed, 19 insertions, 10 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index d38bc9d3de..e175a999c4 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -287,7 +287,7 @@ public:
}
private:
- BazaarClient* m_client;
+ BazaarClient *m_client;
const BazaarCommandParameters m_params;
};
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 6523e464b6..ea13633661 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -45,6 +45,7 @@ class BazaarSettings;
class BazaarClient : public VCSBase::VCSBaseClient
{
Q_OBJECT
+
public:
BazaarClient(BazaarSettings *settings);
@@ -71,6 +72,7 @@ protected:
const QStringList &files,
const QStringList &extraOptions);
StatusItem parseStatusLine(const QString &line) const;
+
private:
friend class CloneWizard;
};
diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h
index f07580067e..7105f47fb3 100644
--- a/src/plugins/bazaar/bazaarcontrol.h
+++ b/src/plugins/bazaar/bazaarcontrol.h
@@ -49,6 +49,7 @@ class BazaarClient;
class BazaarControl: public Core::IVersionControl
{
Q_OBJECT
+
public:
explicit BazaarControl(BazaarClient *bazaarClient);
@@ -75,7 +76,7 @@ public slots:
// To be connected to the VCSTask's success signal to emit the repository/
// files changed signals according to the variant's type:
// String -> repository, StringList -> files
- void changed(const QVariant&);
+ void changed(const QVariant &);
void emitConfigurationChanged();
private:
diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h
index f8c943d921..92a61407ab 100644
--- a/src/plugins/bazaar/bazaareditor.h
+++ b/src/plugins/bazaar/bazaareditor.h
@@ -43,6 +43,7 @@ namespace Internal {
class BazaarEditor : public VCSBase::VCSBaseEditorWidget
{
Q_OBJECT
+
public:
explicit BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent);
@@ -59,4 +60,5 @@ private:
} // namespace Internal
} // namespace Bazaar
+
#endif // BAZAAREDITOR_H
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index d1354c3550..d61b0d2a55 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -449,7 +449,7 @@ void BazaarPlugin::createRepositoryActions(const Core::Context &context)
m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command);
- QAction* createRepositoryAction = new QAction(tr("Create Repository..."), this);
+ QAction *createRepositoryAction = new QAction(tr("Create Repository..."), this);
command = m_actionManager->registerAction(createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context);
connect(createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository()));
m_bazaarContainer->addAction(command);
@@ -654,7 +654,7 @@ bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submit
*iFile = parts.last();
}
- const BazaarCommitWidget* commitWidget = commitEditor->commitWidget();
+ const BazaarCommitWidget *commitWidget = commitEditor->commitWidget();
QStringList extraOptions;
// Author
if (!commitWidget->committer().isEmpty())
diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp
index 1b2ab233b5..a7dffd5de6 100644
--- a/src/plugins/bazaar/bazaarsettings.cpp
+++ b/src/plugins/bazaar/bazaarsettings.cpp
@@ -58,7 +58,7 @@ BazaarSettings::BazaarSettings()
declareKey(logFormatKey, QLatin1String("long"));
}
-bool BazaarSettings::sameUserId(const BazaarSettings& other) const
+bool BazaarSettings::sameUserId(const BazaarSettings &other) const
{
return stringValue(userNameKey) == other.stringValue(userNameKey) &&
stringValue(userEmailKey) == other.stringValue(userEmailKey);
diff --git a/src/plugins/bazaar/bazaarsettings.h b/src/plugins/bazaar/bazaarsettings.h
index 8ac01d13b4..024f341953 100644
--- a/src/plugins/bazaar/bazaarsettings.h
+++ b/src/plugins/bazaar/bazaarsettings.h
@@ -49,7 +49,7 @@ public:
static const QLatin1String logFormatKey;
BazaarSettings();
- bool sameUserId(const BazaarSettings& other) const;
+ bool sameUserId(const BazaarSettings &other) const;
};
} // namespace Internal
diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h
index 843a59c78c..1f03ed3e83 100644
--- a/src/plugins/bazaar/cloneoptionspanel.h
+++ b/src/plugins/bazaar/cloneoptionspanel.h
@@ -39,7 +39,7 @@ namespace Bazaar {
namespace Internal {
namespace Ui {
- class CloneOptionsPanel;
+class CloneOptionsPanel;
}
class CloneOptionsPanel : public QWidget
@@ -58,6 +58,7 @@ public:
bool isHardLinkOptionEnabled() const;
bool isNoTreeOptionEnabled() const;
QString revision() const;
+
private:
Ui::CloneOptionsPanel *m_ui;
};
diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp
index fc900f8d6a..a551d94f92 100644
--- a/src/plugins/bazaar/clonewizard.cpp
+++ b/src/plugins/bazaar/clonewizard.cpp
@@ -68,9 +68,9 @@ QString CloneWizard::displayName() const
return tr("Bazaar Clone (Or Branch)");
}
-QList<QWizardPage*> CloneWizard::createParameterPages(const QString &path)
+QList<QWizardPage *> CloneWizard::createParameterPages(const QString &path)
{
- QList<QWizardPage*> wizardPageList;
+ QList<QWizardPage *> wizardPageList;
const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl();
if (!vc->isConfigured())
wizardPageList.append(new VCSBase::VcsConfigurationPage(vc));
diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h
index d9f7a3d497..342b71058d 100644
--- a/src/plugins/bazaar/clonewizard.h
+++ b/src/plugins/bazaar/clonewizard.h
@@ -43,6 +43,7 @@ namespace Internal {
class CloneWizard : public VCSBase::BaseCheckoutWizard
{
Q_OBJECT
+
public:
CloneWizard(QObject *parent = 0);
diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp
index 0cfc688e58..7acc3dfd88 100644
--- a/src/plugins/bazaar/commiteditor.cpp
+++ b/src/plugins/bazaar/commiteditor.cpp
@@ -51,7 +51,7 @@ CommitEditor::CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *paramet
const BazaarCommitWidget *CommitEditor::commitWidget() const
{
- CommitEditor* nonConstThis = const_cast<CommitEditor*>(this);
+ CommitEditor *nonConstThis = const_cast<CommitEditor *>(this);
return static_cast<const BazaarCommitWidget *>(nonConstThis->widget());
}
diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h
index 2d40d5518a..d7185b2e48 100644
--- a/src/plugins/bazaar/commiteditor.h
+++ b/src/plugins/bazaar/commiteditor.h
@@ -49,6 +49,7 @@ class BazaarCommitWidget;
class CommitEditor : public VCSBase::VCSBaseSubmitEditor
{
Q_OBJECT
+
public:
explicit CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
QWidget *parent);
diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h
index 5265e3c148..1d0b185560 100644
--- a/src/plugins/bazaar/pullorpushdialog.h
+++ b/src/plugins/bazaar/pullorpushdialog.h
@@ -45,6 +45,7 @@ class PullOrPushDialog;
class PullOrPushDialog : public QDialog
{
Q_OBJECT
+
public:
enum Mode {
PullMode,