#include <Common/Globals>
#include <Common/iLogger>
-#include <Common/iEnv>
#include <Common/iApp>
+#include <Plugins/PluginManager>
+
#include <QtGui>
#ifdef Q_OS_LINUX
*
* 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;
case Common::iLogger::Info:
Internal::ConsoleSeverityLevel = Common::iLogger::Debug;
break;
- case Common::iLogger::Debug:
+ default:
break;
}
}
" -lang[uage]=xx[_CC] Specifies the language, where xx is the ISO 639\n"
" language code followed by an optional ISO 3166 country\n"
" code.\n"
- // Handled by the iEnv interface implementation
" -root[dir]=DIR Specifies the application's root directory.\n"
" -dataroot[dir]=DIR Specifies the data root directory.\n"
" -etc[dir]=DIR Specifies the configuration files directory.\n"
// Install our own message handlers
Common::iLogger::instance()->installFatalMsgHandler(Internal::fatalMsgHandler);
- qInstallMsgHandler(Internal::messageOutput);
+ qInstallMessageHandler(Internal::messageOutput);
// Process command-line arguments
if (!Application::processCommandLine(argc, argv))
return 1;
// Plugin manager
- // Plugins::PluginManager pluginManager;
+ Plugins::PluginManager pluginManager;
// The main run loop
bool quit = false;
return 1;
// Initialize the plugin manager and load plugins
- //if (!pluginManager.init())
- // return 1;
+ if (!pluginManager.init())
+ return 1;
// 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;
EVAF_INFO("%s is %s", VER_MODULE_NAME_STR, quit ? "exiting" : "restarting");
// Unload plugins and finalize the plugin manager
- // pluginManager.done();
+ pluginManager.done();
}
EVAF_INFO("%s exit with code %d", VER_MODULE_NAME_STR, rval);