diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-21 17:46:00 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-05-21 17:46:00 +0200 |
commit | 5364f5c152a2cdbcdb3abb1b80b658474e081411 (patch) | |
tree | 3306f8665c8ce1149cbf65a75acac00599752d29 /src/plugins/subversion/subversionsettings.cpp | |
parent | 91c4b0305c0d36da4d959d1be744ee61863b4642 (diff) | |
download | qt-creator-5364f5c152a2cdbcdb3abb1b80b658474e081411.tar.gz |
VCS: Show message box on timeouts/Add SSH prompt.
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
Diffstat (limited to 'src/plugins/subversion/subversionsettings.cpp')
-rw-r--r-- | src/plugins/subversion/subversionsettings.cpp | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 3a38c7a618..91796f08cd 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -30,20 +30,19 @@ #include "subversionsettings.h" #include <QtCore/QSettings> -#include <QtCore/QTextStream> -static const char *groupC = "Subversion"; -static const char *commandKeyC = "Command"; -static const char *userKeyC = "User"; -static const char *passwordKeyC = "Password"; -static const char *authenticationKeyC = "Authentication"; +static const char groupC[] = "Subversion"; +static const char commandKeyC[] = "Command"; +static const char userKeyC[] = "User"; +static const char passwordKeyC[] = "Password"; +static const char authenticationKeyC[] = "Authentication"; -static const char *userNameOptionC = "--username"; -static const char *passwordOptionC = "--password"; -static const char *promptToSubmitKeyC = "PromptForSubmit"; -static const char *timeOutKeyC = "TimeOut"; -static const char *spaceIgnorantAnnotationKeyC = "SpaceIgnorantAnnotation"; -static const char *logCountKeyC = "LogCount"; +static const char userNameOptionC[] = "--username"; +static const char passwordOptionC[] = "--password"; +static const char promptToSubmitKeyC[] = "PromptForSubmit"; +static const char timeOutKeyC[] = "TimeOut"; +static const char spaceIgnorantAnnotationKeyC[] = "SpaceIgnorantAnnotation"; +static const char logCountKeyC[] = "LogCount"; enum { defaultTimeOutS = 30, defaultLogCount = 1000 }; @@ -128,23 +127,3 @@ QStringList SubversionSettings::addOptions(const QStringList &args) const rc.append(args); return rc; } - -// Format arguments for log windows hiding passwords, etc. -QString SubversionSettings::formatArguments(const QStringList &args) -{ - QString rc; - QTextStream str(&rc); - const int size = args.size(); - // Skip authentication options - for (int i = 0; i < size; i++) { - const QString &arg = args.at(i); - if (i) - str << ' '; - str << arg; - if (arg == QLatin1String(userNameOptionC) || arg == QLatin1String(passwordOptionC)) { - str << " ********"; - i++; - } - } - return rc; -} |