Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-31 08:10:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix cli commands, translations and codestyle

Browse source
This commit is contained in:
thez3ro 2018-02-06 01:17:36 +01:00
parent 6723f4215a
commit 1bfbb9242c
No known key found for this signature in database
GPG key ID: F628F9E41DD7C073
30 changed files with 70 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cli/Merge.cpp
View file

@ -26,15 +26,15 @@
Merge::Merge()
{
this->name = QString("merge");
this->description = QObject::tr("Merge two databases.");
name = QString("merge");
description = QObject::tr("Merge two databases.");
}
Merge::~Merge()
{
}
int Merge::execute(QStringList arguments)
int Merge::execute(const QStringList& arguments)
{
QTextStream out(stdout);