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

Cleanup CLI includes across all components

Browse source 
* Remove unused include files
* Move includes out of widely shared headers (reduced rebuild time)
* Consolidate code for Analyze command
This commit is contained in:
Jonathan White 2021-02-20 08:41:47 -05:00
parent dc496fd1d9
commit be3e77d721
33 changed files with 79 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cli/keepassxc-cli.cpp
View file

@ -15,20 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cstdlib>
#include <memory>
#include <QCommandLineParser>
#include <QCoreApplication>
#include <QDir>
#include <QScopedPointer>
#include <QFileInfo>
#include <QStringList>
#include "cli/TextStream.h"
#include <cli/Command.h>
#include "Command.h"
#include "DatabaseCommand.h"
#include "Open.h"
#include "TextStream.h"
#include "Utils.h"
#include "config-keepassx.h"
#include "core/Bootstrap.h"
@ -165,10 +159,9 @@ void enterInteractiveMode(const QStringList& arguments)
break;
}
cmd->currentDatabase = currentDatabase;
cmd->currentDatabase.swap(currentDatabase);
cmd->execute(args);
currentDatabase = cmd->currentDatabase;
cmd->currentDatabase.reset();
currentDatabase.swap(cmd->currentDatabase);
}
if (currentDatabase) {
@ -179,7 +172,7 @@ void enterInteractiveMode(const QStringList& arguments)
int main(int argc, char** argv)
{
if (!Crypto::init()) {
qFatal("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString()));
qWarning("Fatal error while testing the cryptographic functions:\n%s", qPrintable(Crypto::errorString()));
return EXIT_FAILURE;
}