Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/controller/application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ Application::Application(int& argc, char** argv, const QString& name) :
}

registerMetatypes();
setupLogging();

#ifdef Q_OS_MAC
menuBar = std::make_unique<QMenuBar>();
Expand Down
6 changes: 6 additions & 0 deletions src/controller/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

#include "application.hpp"
#include "inputoutputmode.hpp"
#include "logging.hpp"
#include "writeresponse.hpp"

using namespace pcsc_cpp;
Expand All @@ -53,6 +54,11 @@ QVariantMap makeErrorObject(const QString& errorCode, const QString& errorMessag

} // namespace

Controller::Controller(CommandWithArguments&& cmd) : command(std::move(cmd))
{
setupLogging();
}

void Controller::run() noexcept
try {
// If a command is passed, the application is in command-line mode, else in stdin/stdout mode.
Expand Down
2 changes: 1 addition & 1 deletion src/controller/controller.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Controller : public QObject
Q_OBJECT

public:
explicit Controller(CommandWithArguments&& cmd) : command(std::move(cmd)) { }
explicit Controller(CommandWithArguments&& cmd);

const QVariantMap& result() const { return _result; }

Expand Down
Loading