diff options
Diffstat (limited to 'src/cli/Merge.h')
| -rw-r--r-- | src/cli/Merge.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/cli/Merge.h b/src/cli/Merge.h index 1f138b65f..e9d19f1fc 100644 --- a/src/cli/Merge.h +++ b/src/cli/Merge.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 KeePassXC Team <team@keepassxc.org> + * Copyright (C) 2019 KeePassXC Team <team@keepassxc.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,14 +18,20 @@ #ifndef KEEPASSXC_MERGE_H #define KEEPASSXC_MERGE_H -#include "Command.h" +#include "DatabaseCommand.h" -class Merge : public Command +class Merge : public DatabaseCommand { public: Merge(); - ~Merge(); - int execute(const QStringList& arguments) override; + + int executeWithDatabase(QSharedPointer<Database> db, QSharedPointer<QCommandLineParser> parser) override; + + static const QCommandLineOption SameCredentialsOption; + static const QCommandLineOption KeyFileFromOption; + static const QCommandLineOption NoPasswordFromOption; + static const QCommandLineOption YubiKeyFromOption; + static const QCommandLineOption DryRunOption; }; #endif // KEEPASSXC_MERGE_H |