feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Bazaar: Cleanups

Browse Source 
Clean up whitespaces and coding style issues.
This commit is contained in:
Tobias Hunger
2011-02-28 15:05:40 +01:00
parent f9bb4c59dc
commit 3adb533ad7
8 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/bazaar/bazaarclient.cpp
View File

@@ -113,12 +113,15 @@ QString BazaarClient::findTopLevelForFile(const QFileInfo &file) const
QString BazaarClient::vcsEditorKind(VCSCommand cmd) const QString BazaarClient::vcsEditorKind(VCSCommand cmd) const
{ {
switch(cmd) { switch(cmd) {
case AnnotateCommand : return QLatin1String(Constants::ANNOTATELOG); case AnnotateCommand:
case DiffCommand : return QLatin1String(Constants::DIFFLOG); return QLatin1String(Constants::ANNOTATELOG);
case LogCommand : return QLatin1String(Constants::FILELOG); case DiffCommand:
default : return QLatin1String(""); return QLatin1String(Constants::DIFFLOG);
case LogCommand:
return QLatin1String(Constants::FILELOG);
default:
return QString();
} }
return QLatin1String("");
} }
QStringList BazaarClient::cloneArguments(const QString &srcLocation, QStringList BazaarClient::cloneArguments(const QString &srcLocation,

30
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -147,7 +147,7 @@ BazaarPlugin::~BazaarPlugin()
m_instance = 0; 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; typedef VCSBase::VCSEditorFactory<BazaarEditor> BazaarEditorFactory;
@@ -290,29 +290,29 @@ void BazaarPlugin::createFileActions(const Core::Context &context)
void BazaarPlugin::addCurrentFile() void BazaarPlugin::addCurrentFile()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return) QTC_ASSERT(state.hasFile(), return);
m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); m_client->synchronousAdd(state.currentFileTopLevel(), state.relativeCurrentFile());
} }
void BazaarPlugin::annotateCurrentFile() void BazaarPlugin::annotateCurrentFile()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return) QTC_ASSERT(state.hasFile(), return);
m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile()); m_client->annotate(state.currentFileTopLevel(), state.relativeCurrentFile());
} }
void BazaarPlugin::diffCurrentFile() void BazaarPlugin::diffCurrentFile()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return) QTC_ASSERT(state.hasFile(), return);
m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
} }
void BazaarPlugin::logCurrentFile() void BazaarPlugin::logCurrentFile()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return) QTC_ASSERT(state.hasFile(), return);
m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true); m_client->log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true);
} }
void BazaarPlugin::revertCurrentFile() void BazaarPlugin::revertCurrentFile()
@@ -333,8 +333,8 @@ void BazaarPlugin::revertCurrentFile()
void BazaarPlugin::statusCurrentFile() void BazaarPlugin::statusCurrentFile()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return) QTC_ASSERT(state.hasFile(), return);
m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile()); m_client->status(state.currentFileTopLevel(), state.relativeCurrentFile());
} }
void BazaarPlugin::createDirectoryActions(const Core::Context &context) void BazaarPlugin::createDirectoryActions(const Core::Context &context)
@@ -375,15 +375,15 @@ void BazaarPlugin::createDirectoryActions(const Core::Context &context)
void BazaarPlugin::diffRepository() void BazaarPlugin::diffRepository()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return) QTC_ASSERT(state.hasTopLevel(), return);
m_client->diff(state.topLevel()); m_client->diff(state.topLevel());
} }
void BazaarPlugin::logRepository() void BazaarPlugin::logRepository()
{ {
const VCSBase::VCSBasePluginState state = currentState(); const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return) QTC_ASSERT(state.hasTopLevel(), return);
m_client->log(state.topLevel()); m_client->log(state.topLevel());
} }
void BazaarPlugin::revertAll() void BazaarPlugin::revertAll()

12
src/plugins/bazaar/clonewizardpage.cpp
View File

@@ -60,11 +60,9 @@ QString CloneWizardPage::directoryFromRepository(const QString &repository) cons
QString repo = repository.trimmed(); QString repo = repository.trimmed();
if (repo.startsWith(QLatin1String("lp:"))) if (repo.startsWith(QLatin1String("lp:")))
return repo.mid(3); return repo.mid(3);
else { const QChar slash = QLatin1Char('/');
const QChar slash = QLatin1Char('/'); if (repo.endsWith(slash))
if (repo.endsWith(slash)) repo.truncate(repo.size() - 1);
repo.truncate(repo.size() - 1); // Take the basename or the repository url
// Take the basename or the repository url return repo.mid(repo.lastIndexOf(slash) + 1);
return repo.mid(repo.lastIndexOf(slash) + 1);
}
} }

15
src/plugins/bazaar/pullorpushdialog.cpp
View File

@@ -44,14 +44,11 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) :
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::Directory); m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::Directory);
if (m_mode == PullMode) if (m_mode == PullMode) {
{
this->setWindowTitle(tr("Pull source")); this->setWindowTitle(tr("Pull source"));
m_ui->useExistingDirCheckBox->setVisible(false); m_ui->useExistingDirCheckBox->setVisible(false);
m_ui->createPrefixCheckBox->setVisible(false); m_ui->createPrefixCheckBox->setVisible(false);
} } else {
else
{
this->setWindowTitle(tr("Push destination")); this->setWindowTitle(tr("Push destination"));
m_ui->localCheckBox->setVisible(false); m_ui->localCheckBox->setVisible(false);
} }
@@ -67,18 +64,16 @@ QString PullOrPushDialog::branchLocation() const
{ {
if (m_ui->defaultButton->isChecked()) if (m_ui->defaultButton->isChecked())
return QString(); return QString();
else if (m_ui->localButton->isChecked()) if (m_ui->localButton->isChecked())
return m_ui->localPathChooser->path(); return m_ui->localPathChooser->path();
else return m_ui->urlLineEdit->text();
return m_ui->urlLineEdit->text();
} }
bool PullOrPushDialog::isRememberOptionEnabled() const bool PullOrPushDialog::isRememberOptionEnabled() const
{ {
if (m_ui->defaultButton->isChecked()) if (m_ui->defaultButton->isChecked())
return false; return false;
else return m_ui->rememberCheckBox->isChecked();
return m_ui->rememberCheckBox->isChecked();
} }
bool PullOrPushDialog::isOverwriteOptionEnabled() const bool PullOrPushDialog::isOverwriteOptionEnabled() const

2
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -303,7 +303,7 @@ QString MercurialClient::findTopLevelForFile(const QFileInfo &file) const
QString MercurialClient::vcsEditorKind(VCSCommand cmd) const QString MercurialClient::vcsEditorKind(VCSCommand cmd) const
{ {
switch(cmd) switch (cmd)
{ {
case AnnotateCommand : return QLatin1String(Constants::ANNOTATELOG); case AnnotateCommand : return QLatin1String(Constants::ANNOTATELOG);
case DiffCommand : return QLatin1String(Constants::DIFFLOG); case DiffCommand : return QLatin1String(Constants::DIFFLOG);

34
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -334,24 +334,24 @@ void VCSBaseClient::statusWithSignal(const QString &repositoryRoot)
QString VCSBaseClient::vcsCommandString(VCSCommand cmd) const QString VCSBaseClient::vcsCommandString(VCSCommand cmd) const
{ {
switch(cmd) { switch (cmd) {
case CreateRepositoryCommand : return QLatin1String("init"); case CreateRepositoryCommand: return QLatin1String("init");
case CloneCommand : return QLatin1String("clone"); case CloneCommand: return QLatin1String("clone");
case AddCommand : return QLatin1String("add"); case AddCommand: return QLatin1String("add");
case RemoveCommand : return QLatin1String("remove"); case RemoveCommand: return QLatin1String("remove");
case MoveCommand : return QLatin1String("rename"); case MoveCommand: return QLatin1String("rename");
case PullCommand : return QLatin1String("pull"); case PullCommand: return QLatin1String("pull");
case PushCommand : return QLatin1String("push"); case PushCommand: return QLatin1String("push");
case CommitCommand : return QLatin1String("commit"); case CommitCommand: return QLatin1String("commit");
case ImportCommand : return QLatin1String("import"); case ImportCommand: return QLatin1String("import");
case UpdateCommand : return QLatin1String("update"); case UpdateCommand: return QLatin1String("update");
case RevertCommand : return QLatin1String("revert"); case RevertCommand: return QLatin1String("revert");
case AnnotateCommand : return QLatin1String("annotate"); case AnnotateCommand: return QLatin1String("annotate");
case DiffCommand : return QLatin1String("diff"); case DiffCommand: return QLatin1String("diff");
case LogCommand : return QLatin1String("log"); case LogCommand: return QLatin1String("log");
case StatusCommand : return QLatin1String("status"); case StatusCommand: return QLatin1String("status");
} }
return QLatin1String(""); return QString();
} }
void VCSBaseClient::statusParser(const QByteArray &data) void VCSBaseClient::statusParser(const QByteArray &data)

4
src/plugins/vcsbase/vcsbaseclientsettings.cpp
View File

@@ -119,7 +119,7 @@ void VCSBaseClientSettings::setTimeoutSeconds(int s)
m_timeoutSeconds = s; m_timeoutSeconds = s;
} }
void VCSBaseClientSettings::writeSettings(QSettings *settings, const QString& group) const void VCSBaseClientSettings::writeSettings(QSettings *settings, const QString &group) const
{ {
settings->beginGroup(group); settings->beginGroup(group);
settings->setValue(QLatin1String("VCS_Path"), m_binary); settings->setValue(QLatin1String("VCS_Path"), m_binary);
@@ -131,7 +131,7 @@ void VCSBaseClientSettings::writeSettings(QSettings *settings, const QString& gr
settings->endGroup(); settings->endGroup();
} }
void VCSBaseClientSettings::readSettings(const QSettings *settings, const QString& group) void VCSBaseClientSettings::readSettings(const QSettings *settings, const QString &group)
{ {
const QString keyRoot = group + QLatin1Char('/'); const QString keyRoot = group + QLatin1Char('/');
m_binary = settings->value(keyRoot + QLatin1String("VCS_Path"), QString()).toString(); m_binary = settings->value(keyRoot + QLatin1String("VCS_Path"), QString()).toString();

4
src/plugins/vcsbase/vcsbaseclientsettings.h
View File

@@ -71,8 +71,8 @@ public:
int timeoutSeconds() const; int timeoutSeconds() const;
void setTimeoutSeconds(int s); void setTimeoutSeconds(int s);
virtual void writeSettings(QSettings *settings, const QString& group) const; virtual void writeSettings(QSettings *settings, const QString &group) const;
virtual void readSettings(const QSettings *settings, const QString& group); virtual void readSettings(const QSettings *settings, const QString &group);
virtual bool equals(const VCSBaseClientSettings &rhs) const; virtual bool equals(const VCSBaseClientSettings &rhs) const;