Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Kleopatra
Commits
a6099532
Commit
a6099532
authored
Mar 09, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor optimization
parent
d8820bcf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
src/crypto/signencryptfilescontroller.cpp
src/crypto/signencryptfilescontroller.cpp
+4
-4
src/kleopatraapplication.cpp
src/kleopatraapplication.cpp
+1
-1
src/smartcard/openpgpcard.cpp
src/smartcard/openpgpcard.cpp
+1
-1
src/view/pgpcardwidget.cpp
src/view/pgpcardwidget.cpp
+1
-1
No files found.
src/crypto/signencryptfilescontroller.cpp
View file @
a6099532
...
...
@@ -300,10 +300,10 @@ static QMap <int, QString> buildOutputNames(const QStringList &files, const bool
firstFile
.
baseName
());
const
auto
ad
=
getDefaultAd
();
baseNamePgp
=
baseName
+
Q
StringLiteral
(
"."
)
+
ad
->
extensions
(
GpgME
::
OpenPGP
).
first
()
+
Q
StringLiteral
(
"."
);
baseNameCms
=
baseName
+
Q
StringLiteral
(
"."
)
+
ad
->
extensions
(
GpgME
::
CMS
).
first
()
+
Q
StringLiteral
(
"."
);
baseNamePgp
=
baseName
+
Q
Latin1Char
(
'.'
)
+
ad
->
extensions
(
GpgME
::
OpenPGP
).
first
()
+
Q
Latin1Char
(
'.'
);
baseNameCms
=
baseName
+
Q
Latin1Char
(
'.'
)
+
ad
->
extensions
(
GpgME
::
CMS
).
first
()
+
Q
Latin1Char
(
'.'
);
}
else
{
baseNameCms
=
baseNamePgp
=
files
.
first
()
+
Q
StringLiteral
(
"."
);
baseNameCms
=
baseNamePgp
=
files
.
first
()
+
Q
Latin1Char
(
'.'
);
}
const
FileOperationsPreferences
prefs
;
const
bool
ascii
=
prefs
.
addASCIIArmor
();
...
...
@@ -328,7 +328,7 @@ static QMap <int, QString> buildOutputNamesForDir(const QString &file, const QMa
// Build the default names for the wizard.
const
QFileInfo
fi
(
file
);
const
QString
baseName
=
dir
+
Q
StringLiteral
(
"/"
)
+
fi
.
fileName
()
+
QStringLiteral
(
"."
);
const
QString
baseName
=
dir
+
Q
Latin1Char
(
'/'
)
+
fi
.
fileName
()
+
QStringLiteral
(
"."
);
const
FileOperationsPreferences
prefs
;
const
bool
ascii
=
prefs
.
addASCIIArmor
();
...
...
src/kleopatraapplication.cpp
View file @
a6099532
...
...
@@ -386,7 +386,7 @@ QString KleopatraApplication::newInstance(const QCommandLineParser &parser,
cmd
->
setParentWId
(
parentId
);
cmd
->
start
();
}
return
errors
.
join
(
"
\n
"
);
return
errors
.
join
(
'
\n
'
);
}
}
...
...
src/smartcard/openpgpcard.cpp
View file @
a6099532
...
...
@@ -228,5 +228,5 @@ std::string OpenPGPCard::cardHolder() const
{
auto
list
=
QString
::
fromStdString
(
mMetaInfo
.
value
(
"DISP-NAME"
)).
split
(
"<<"
);
std
::
reverse
(
list
.
begin
(),
list
.
end
());
return
list
.
join
(
Q
StringLiteral
(
" "
)).
toStdString
();
return
list
.
join
(
Q
Latin1Char
(
' '
)).
toStdString
();
}
src/view/pgpcardwidget.cpp
View file @
a6099532
...
...
@@ -383,7 +383,7 @@ void PGPCardWidget::changeNameRequested()
}
auto
parts
=
text
.
split
(
" "
);
const
auto
lastName
=
parts
.
takeLast
();
const
auto
formatted
=
lastName
+
QStringLiteral
(
"<<"
)
+
parts
.
join
(
"<"
);
const
auto
formatted
=
lastName
+
QStringLiteral
(
"<<"
)
+
parts
.
join
(
'<'
);
ReaderStatus
::
mutableInstance
()
->
startSimpleTransaction
(
QStringLiteral
(
"SCD SETATTR DISP-NAME %1"
).
arg
(
formatted
).
toUtf8
().
constData
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment