Ported to Qt5

[evaf] / src / main / CLI / main.cpp

diff --git a/src/main/CLI/main.cpp b/src/main/CLI/main.cpp
index 51d5f517adae79db24a1734e6241a7a8cb53da68..691db7a3f63cf6da24cc68b323c0fe13085d95e2 100644 (file)
--- 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;
 
@@ -178,7 +178,7 @@ bool Application::processCommandLine(int argc, char ** argv)
                     case Common::iLogger::Info:
                         consoleSeverityLevel = Common::iLogger::Debug;
                         break;
-                    case Common::iLogger::Debug:
+                    default:
                         break;
                 }
             }
@@ -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;