From 2cf99100703adebb48837e848c0fa72baecf3e4f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 29 Sep 2010 12:16:37 +0200 Subject: [PATCH] Fixup formating of mr2178 Merge-request: 2178 Reviewed-by: Tobias Hunger --- src/plugins/coreplugin/iversioncontrol.h | 2 +- src/plugins/coreplugin/vcsmanager.cpp | 13 +++++------ src/plugins/cvs/cvscontrol.cpp | 2 +- src/plugins/git/gitclient.cpp | 30 +++++++++++++++---------- src/plugins/git/gitclient.h | 2 +- src/plugins/git/gitversioncontrol.cpp | 6 ++--- src/plugins/mercurial/mercurialclient.cpp | 5 +++-- src/plugins/perforce/perforceversioncontrol.cpp | 4 ++-- src/plugins/subversion/subversioncontrol.cpp | 4 ++-- src/plugins/subversion/subversionplugin.cpp | 7 +++--- 10 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index e00be8f69d..d0dd868b1a 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -121,7 +121,7 @@ public: /*! * Called to clone/checkout the version control system in a directory. */ - virtual bool vcsCheckout(const QString &directory,const QByteArray &url) = 0; + virtual bool vcsCheckout(const QString &directory, const QByteArray &url) = 0; /*! * Called to get the version control repository root. diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index ac7e18fb3a..da42a17bad 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -167,14 +167,14 @@ bool VCSManager::promptToDelete(const QString &fileName) return true; } -IVersionControl* VCSManager::checkout(const QString &versionControlType, +IVersionControl *VCSManager::checkout(const QString &versionControlType, const QString &directory, const QByteArray &url) { - foreach (IVersionControl * versionControl, allVersionControls()) { - if (versionControl->displayName() == versionControlType && - versionControl->supportsOperation(Core::IVersionControl::CheckoutOperation)) { - if (versionControl->vcsCheckout(directory,url)) { + foreach (IVersionControl *versionControl, allVersionControls()) { + if (versionControl->displayName() == versionControlType + && versionControl->supportsOperation(Core::IVersionControl::CheckoutOperation)) { + if (versionControl->vcsCheckout(directory, url)) { m_d->m_cachedMatches.insert(directory, versionControl); return versionControl; } @@ -187,9 +187,8 @@ IVersionControl* VCSManager::checkout(const QString &versionControlType, bool VCSManager::findVersionControl(const QString &versionControlType) { foreach (IVersionControl * versionControl, allVersionControls()) { - if (versionControl->displayName() == versionControlType) { + if (versionControl->displayName() == versionControlType) return true; - } } return false; } diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 7fd757a4f8..3ba45ffb29 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -101,7 +101,7 @@ QString CVSControl::vcsGetRepositoryURL(const QString &) return QString(); } -bool CVSControl::vcsCheckout(const QString &/*directory*/, const QByteArray &/*url*/) +bool CVSControl::vcsCheckout(const QString &, const QByteArray &) { return false; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 47b74c8e4a..9837b7c35a 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1926,9 +1926,9 @@ QString GitClient::readConfigValue(const QString &workingDirectory, const QStrin bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) { QDir workingDirectory(directory); - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt - |VCSBase::VCSBasePlugin::ShowStdOutInLogWindow - |VCSBase::VCSBasePlugin::ShowSuccessMessage; + const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt | + VCSBase::VCSBasePlugin::ShowStdOutInLogWindow| + VCSBase::VCSBasePlugin::ShowSuccessMessage; if (workingDirectory.exists()) { if (!synchronousInit(workingDirectory.path())) @@ -1936,23 +1936,28 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) QStringList arguments(QLatin1String("remote")); arguments << QLatin1String("add") << QLatin1String("origin") << url; - if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true)) - return false; + if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true)) + return false; arguments.clear(); arguments << QLatin1String("fetch"); - const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(),arguments,flags); + const Utils::SynchronousProcessResponse resp = + synchronousGit(workingDirectory.path(), arguments, flags); if (resp.result != Utils::SynchronousProcessResponse::Finished) return false; arguments.clear(); - arguments << QLatin1String("config") << QLatin1String("branch.master.remote") << QLatin1String("origin"); - if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true)) + arguments << QLatin1String("config") + << QLatin1String("branch.master.remote") + << QLatin1String("origin"); + if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true)) return false; arguments.clear(); - arguments << QLatin1String("config") << QLatin1String("branch.master.merge") << QLatin1String("refs/heads/master"); - if (!fullySynchronousGit(workingDirectory.path(),arguments,0,0,true)) + arguments << QLatin1String("config") + << QLatin1String("branch.master.merge") + << QLatin1String("refs/heads/master"); + if (!fullySynchronousGit(workingDirectory.path(), arguments, 0, 0, true)) return false; return true; @@ -1960,7 +1965,8 @@ bool GitClient::cloneRepository(const QString &directory,const QByteArray &url) QStringList arguments(QLatin1String("clone")); arguments << url << workingDirectory.dirName(); workingDirectory.cdUp(); - const Utils::SynchronousProcessResponse resp = synchronousGit(workingDirectory.path(),arguments,flags); + const Utils::SynchronousProcessResponse resp = + synchronousGit(workingDirectory.path(), arguments, flags); return resp.result == Utils::SynchronousProcessResponse::Finished; } } @@ -1972,7 +1978,7 @@ QString GitClient::vcsGetRepositoryURL(const QString &directory) arguments << QLatin1String("remote.origin.url"); - if (fullySynchronousGit(directory,arguments,&outputText,0,false)) { + if (fullySynchronousGit(directory, arguments, &outputText, 0, false)) { return commandOutputFromLocal8Bit(outputText); } return QString(); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 5ece27c939..828a4e0909 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -158,7 +158,7 @@ public: unsigned gitVersion(bool silent, QString *errorMessage = 0); QString gitVersionString(bool silent, QString *errorMessage = 0); - bool cloneRepository(const QString &directory,const QByteArray &url); + bool cloneRepository(const QString &directory, const QByteArray &url); QString vcsGetRepositoryURL(const QString &directory); bool synchronousFetch(const QString &workingDirectory); bool synchronousPull(const QString &workingDirectory); diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 862bd04dd0..ad6cc63c2d 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -126,13 +126,13 @@ bool GitVersionControl::vcsCreateRepository(const QString &directory) return gitClient()->synchronousInit(directory); } -bool GitVersionControl::vcsCheckout(const QString &directory,const QByteArray &url) -{ +bool GitVersionControl::vcsCheckout(const QString &directory, const QByteArray &url) +{ return gitClient()->cloneRepository(directory,url); } QString GitVersionControl::vcsGetRepositoryURL(const QString &directory) -{ +{ return gitClient()->vcsGetRepositoryURL(directory); } diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 8f06d4d553..68db76e290 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -501,8 +501,9 @@ bool MercurialClient::clone(const QString &directory, const QString &url) { QDir workingDirectory(directory); QByteArray output; - const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt|VCSBase::VCSBasePlugin::ShowStdOutInLogWindow - |VCSBase::VCSBasePlugin::ShowSuccessMessage; + const unsigned flags = VCSBase::VCSBasePlugin::SshPasswordPrompt | + VCSBase::VCSBasePlugin::ShowStdOutInLogWindow | + VCSBase::VCSBasePlugin::ShowSuccessMessage; if (workingDirectory.exists()) { // Let's make first init diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp index 6ea6fb6346..8e755a960a 100644 --- a/src/plugins/perforce/perforceversioncontrol.cpp +++ b/src/plugins/perforce/perforceversioncontrol.cpp @@ -130,12 +130,12 @@ bool PerforceVersionControl::vcsAnnotate(const QString &file, int line) return true; } -bool PerforceVersionControl::vcsCheckout(const QString &/*directory*/,const QByteArray&/*url*/) +bool PerforceVersionControl::vcsCheckout(const QString &,const QByteArray &) { return false; } -QString PerforceVersionControl::vcsGetRepositoryURL(const QString &/*directory*/) +QString PerforceVersionControl::vcsGetRepositoryURL(const QString &) { return QString(); } diff --git a/src/plugins/subversion/subversioncontrol.cpp b/src/plugins/subversion/subversioncontrol.cpp index e4e1256f9e..597546ee25 100644 --- a/src/plugins/subversion/subversioncontrol.cpp +++ b/src/plugins/subversion/subversioncontrol.cpp @@ -91,9 +91,9 @@ bool SubversionControl::vcsMove(const QString &from, const QString &to) return m_plugin->vcsMove(fromInfo.absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath()); } -bool SubversionControl::vcsCheckout(const QString &directory,const QByteArray &url) +bool SubversionControl::vcsCheckout(const QString &directory, const QByteArray &url) { - return m_plugin->vcsCheckout(directory,url); + return m_plugin->vcsCheckout(directory, url); } QString SubversionControl::vcsGetRepositoryURL(const QString &directory) diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index e22933b25e..5e47b9d07a 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -1243,13 +1243,14 @@ bool SubversionPlugin::vcsCheckout(const QString &directory, const QByteArray &u // be a bug in subversion, so this might get fixed in the future. tempUrl.setUserInfo(""); args << tempUrl.toEncoded() << directory; - const SubversionResponse response = runSvn(directory, username, password, args, m_settings.longTimeOutMS(), - VCSBase::VCSBasePlugin::SshPasswordPrompt); + const SubversionResponse response = runSvn(directory, username, password, args, + m_settings.longTimeOutMS(), + VCSBase::VCSBasePlugin::SshPasswordPrompt); return !response.error; } else { args << url << directory; const SubversionResponse response = runSvn(directory, args, m_settings.longTimeOutMS(), - VCSBase::VCSBasePlugin::SshPasswordPrompt); + VCSBase::VCSBasePlugin::SshPasswordPrompt); return !response.error; } } -- 2.11.0