X-Git-Url: https://vaikene.ee/gitweb/pswgen09.html?a=blobdiff_plain;f=src%2Fmain%2FCLI%2Fmain.cpp;h=691db7a3f63cf6da24cc68b323c0fe13085d95e2;hb=a81a943bee20df3c7eb34bafb3e3fe878facfe4e;hp=4e8fe7e0b606115889ed12b8fdec27cd84b48bfd;hpb=0957525838e501a4609a15b8d7a765da43362025;p=evaf diff --git a/src/main/CLI/main.cpp b/src/main/CLI/main.cpp index 4e8fe7e..691db7a 100644 --- a/src/main/CLI/main.cpp +++ b/src/main/CLI/main.cpp @@ -49,7 +49,7 @@ namespace Internal { * * This function outputs messages to the console and to the log file. */ -static void messageOutput(QtMsgType type, char const * const msg) +static void messageOutput(QtMsgType type, QMessageLogContext const &, QString const & msg) { static bool inHandler = false; @@ -238,7 +238,7 @@ int main(int argc, char ** argv) // Install our onw message handlers Common::iLogger::instance()->installFatalMsgHandler(Internal::fatalMsgHandler); - qInstallMsgHandler(Internal::messageOutput); + qInstallMessageHandler(Internal::messageOutput); // Process command-line arguments if (!Application::processCommandLine(argc, argv)) @@ -281,7 +281,7 @@ int main(int argc, char ** argv) // Run the application EVAF_INFO("Running %s", VER_MODULE_NAME_STR); - rval = app.exec(); + rval = Common::iApp::instance()->exec(); quit = rval != Common::iApp::RC_Restart;