fix cli commands, translations and codestyle

2018-02-06 01:17:36 +01:00
parent 6723f4215a
commit 1bfbb9242c
30 changed files with 70 additions and 67 deletions
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -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);