X-Git-Url: https://vaikene.ee/gitweb/pswgen09.html?a=blobdiff_plain;f=src%2Fmain%2FGUI%2Fmain.cpp;h=f0e765f5f574ff10e002f0cbf68a7b6519734b7a;hb=38c2779e95311f1d9dac4a9d9469b0489b395333;hp=2a3caa05da6a076b8650df4c90fe9c131050676c;hpb=28615229f7e2667ea5632293ca13f8ffdaaa9700;p=evaf
diff --git a/src/main/GUI/main.cpp b/src/main/GUI/main.cpp
index 2a3caa0..f0e765f 100644
--- a/src/main/GUI/main.cpp
+++ b/src/main/GUI/main.cpp
@@ -29,9 +29,10 @@
#include
#include
-#include
#include
+#include
+
#include
#ifdef Q_OS_LINUX
@@ -233,7 +234,7 @@ bool Application::processCommandLine(int argc, char ** argv)
case Common::iLogger::Info:
Internal::ConsoleSeverityLevel = Common::iLogger::Debug;
break;
- case Common::iLogger::Debug:
+ default:
break;
}
}
@@ -261,7 +262,6 @@ void Application::printHelp()
" -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"
@@ -390,7 +390,7 @@ int main(int argc, char ** argv)
return 1;
// Plugin manager
- // Plugins::PluginManager pluginManager;
+ Plugins::PluginManager pluginManager;
// The main run loop
bool quit = false;
@@ -404,19 +404,19 @@ int main(int argc, char ** argv)
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);