Commit 425261d6 authored by cerf's avatar cerf Committed by hjk

Bazaar: fix whitespaces

Merge-request: 2208
Reviewed-by: default avatarhjk <qtc-committer@nokia.com>

Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250
Reviewed-on: http://codereview.qt-project.org/5302Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 93d77eef
......@@ -287,7 +287,7 @@ public:
}
private:
BazaarClient* m_client;
BazaarClient *m_client;
const BazaarCommandParameters m_params;
};
......
......@@ -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;
};
......
......@@ -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:
......
......@@ -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
......@@ -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())
......
......@@ -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);
......
......@@ -49,7 +49,7 @@ public:
static const QLatin1String logFormatKey;
BazaarSettings();
bool sameUserId(const BazaarSettings& other) const;
bool sameUserId(const BazaarSettings &other) const;
};
} // namespace Internal
......
......@@ -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;
};
......
......@@ -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));
......
......@@ -43,6 +43,7 @@ namespace Internal {
class CloneWizard : public VCSBase::BaseCheckoutWizard
{
Q_OBJECT
public:
CloneWizard(QObject *parent = 0);
......
......@@ -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());
}
......
......@@ -49,6 +49,7 @@ class BazaarCommitWidget;
class CommitEditor : public VCSBase::VCSBaseSubmitEditor
{
Q_OBJECT
public:
explicit CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters,
QWidget *parent);
......
......@@ -45,6 +45,7 @@ class PullOrPushDialog;
class PullOrPushDialog : public QDialog
{
Q_OBJECT
public:
enum Mode {
PullMode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment