Commit d4a4ca50 authored by Hugues Delorme's avatar Hugues Delorme Committed by Tobias Hunger

Bazaar: whitespace and indentation fixes

Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 73138f63
......@@ -50,6 +50,7 @@ private:
QRegExp m_changeset;
};
} //namespace Internal
}// namespace Bazaar
} // namespace Internal
} // namespace Bazaar
#endif // ANNOTATIONHIGHLIGHTER_H
......@@ -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"
......@@ -77,7 +77,7 @@ private:
friend class CloneWizard;
};
} //namespace Internal
} // namespace Internal
} // namespace Bazaar
#endif // BAZAARCLIENT_H
......@@ -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)
......
......@@ -83,7 +83,7 @@ private:
BazaarClient *m_bazaarClient;
};
} //namespace Internal
} //namespace Bazaar
} // namespace Internal
} // namespace Bazaar
#endif // BAZAARCONTROL_H
......@@ -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;
......
......@@ -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;
}
......
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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);
}
......
......@@ -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));
}
......
......@@ -60,7 +60,7 @@ private:
const QIcon m_icon;
};
} //namespace Internal
} //namespace Bazaar
} // namespace Internal
} // namespace Bazaar
#endif // CLONEWIZARD_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
......@@ -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"));
}
......
......@@ -67,4 +67,5 @@ private:
}
}
#endif // COMMITEDITOR_H
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
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