summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hindenburg <[email protected]>2017-06-19 10:26:56 -0400
committerKurt Hindenburg <[email protected]>2017-06-19 10:26:56 -0400
commit9ba7594e58cbf8b71bd92ab6a374227db326faf2 (patch)
tree2f0ed15a9af215e06ba1a63cdaaafc2816aac02f
parente0b951a8f298df75af7af0656270478163586fe0 (diff)
uncrustify using kf5 config
-rw-r--r--src/ShellCommand.cpp39
1 files changed, 25 insertions, 14 deletions
diff --git a/src/ShellCommand.cpp b/src/ShellCommand.cpp
index 63848d4..e6a1b47 100644
--- a/src/ShellCommand.cpp
+++ b/src/ShellCommand.cpp
@@ -25,67 +25,78 @@
using Konsole::ShellCommand;
-ShellCommand::ShellCommand(const QString& aCommand)
+ShellCommand::ShellCommand(const QString &aCommand)
{
_arguments = KShell::splitArgs(aCommand);
}
-ShellCommand::ShellCommand(const QString& aCommand, const QStringList& aArguments)
+
+ShellCommand::ShellCommand(const QString &aCommand, const QStringList &aArguments)
{
_arguments = aArguments;
- if (!_arguments.isEmpty())
+ if (!_arguments.isEmpty()) {
_arguments[0] = aCommand;
+ }
}
+
QString ShellCommand::fullCommand() const
{
QStringList quotedArgs(_arguments);
for (int i = 0; i < quotedArgs.count(); i++) {
QString arg = quotedArgs.at(i);
bool hasSpace = false;
- for (int j = 0; j < arg.count(); j++)
- if (arg[j].isSpace())
+ for (int j = 0; j < arg.count(); j++) {
+ if (arg[j].isSpace()) {
hasSpace = true;
- if (hasSpace)
+ }
+ }
+ if (hasSpace) {
quotedArgs[i] = QLatin1Char('\"') + arg + QLatin1Char('\"');
+ }
}
return quotedArgs.join(QLatin1Char(' '));
}
+
QString ShellCommand::command() const
{
- if (!_arguments.isEmpty())
+ if (!_arguments.isEmpty()) {
return _arguments[0];
- else
+ } else {
return QString();
+ }
}
+
QStringList ShellCommand::arguments() const
{
return _arguments;
}
-QStringList ShellCommand::expand(const QStringList& items)
+
+QStringList ShellCommand::expand(const QStringList &items)
{
QStringList result;
result.reserve(items.size());
- foreach(const QString & item , items) {
+ foreach (const QString &item, items) {
result << expand(item);
}
return result;
}
-QString ShellCommand::expand(const QString& text)
+
+QString ShellCommand::expand(const QString &text)
{
QString result = text;
expandEnv(result);
return result;
}
-bool ShellCommand::isValidEnvCharacter(const QChar& ch)
+bool ShellCommand::isValidEnvCharacter(const QChar &ch)
{
const ushort code = ch.unicode();
return isValidLeadingEnvCharacter(ch) || ('0' <= code && code <= '9');
}
-bool ShellCommand::isValidLeadingEnvCharacter(const QChar& ch)
+bool ShellCommand::isValidLeadingEnvCharacter(const QChar &ch)
{
const ushort code = ch.unicode();
return (code == '_') || ('A' <= code && code <= 'Z');
@@ -97,7 +108,7 @@ bool ShellCommand::isValidLeadingEnvCharacter(const QChar& ch)
* Expand environment variables in text. Escaped '$' characters are ignored.
* Return true if any variables were expanded
*/
-bool ShellCommand::expandEnv(QString& text)
+bool ShellCommand::expandEnv(QString &text)
{
const QLatin1Char dollarChar('$');
const QLatin1Char backslashChar('\\');